Merge pull request #278 from OpenF2/1.4.2-wip

1.4.2 wip

Author: qrider

F2.latest.js

@@ -4,6 +4,7 @@ module.exports = function(grunt) {
 		handlebars = require('handlebars'),
 		moment = require('moment'),
 		pkg = grunt.file.readJSON('package.json'),
+		bower_pkg = grunt.file.readJSON('bower.json'),
 		semver = require('semver'),
 		path = require('path');
 
@@ -61,7 +62,7 @@ module.exports = function(grunt) {
 				files: [
 					{
 						expand: true,
-						cwd: 'docs/',
+						cwd: 'docs/dist',
 						src: ['**'],
 						dest: '../gh-pages'
 					},
@@ -424,13 +425,19 @@ module.exports = function(grunt) {
 			grunt.log.error('"' + releaseType + '" is not a valid release type (major, minor, or patch) or SemVer version');
 			return;
 		}
+		
+		var version = semver.valid(releaseType) ? releaseType : String(semver.inc(pkg.version, releaseType)).replace(/\-\w+$/, '');
 
-		pkg.version = semver.valid(releaseType) ? releaseType : String(semver.inc(pkg.version, releaseType)).replace(/\-\w+$/, '');
+		pkg.version = version;
+		bower_pkg.version = version;
+		
 		pkg._releaseDate = new Date().toJSON();
 		pkg._releaseDateFormatted = moment(pkg._releaseDate).format('D MMMM YYYY');
 
 		grunt.file.write('./package.json', JSON.stringify(pkg, null, '\t'));
+		grunt.file.write('./bower.json', JSON.stringify(bower_pkg, null, '\t'));
 		grunt.config.set('pkg', pkg);
+		
 
 		grunt.task.run('version');
 	});
@@ -473,4 +480,5 @@ module.exports = function(grunt) {
 	grunt.registerTask('test-live', ['jshint', 'express', 'express-keepalive']);
 	grunt.registerTask('travis', ['test']);
 	grunt.registerTask('default', ['test', 'js', 'docs', 'zip']);
+	grunt.registerTask('build', ['js', 'docs', 'zip', 'packages', 'nuget'])
 };

Gruntfile.js

@@ -28,8 +28,8 @@ Join the team and help contribute to F2 on GitHub. Begin by reading our [contrib
 
 * Choose a [F2.js package](http://docs.openf2.org/f2js-sdk.html#packages), including [F2.basic.js](https://raw.github.com/OpenF2/F2/master/sdk/packages/f2.basic.min.js) (7kb, minified and gzipped)
 * Grab any version of F2 [on cdnjs.com](http://cdnjs.com/libraries/F2/).
-* For .NET developers: install the [NuGet Package](https://nuget.org/packages/F2/).
-* *Bower coming soon!*
+* For .NET developers: install the [NuGet Package](https://nuget.org/packages/F2/) or `PM> Install-Package F2`
+* Bower: `bower install F2`
 
 ### Docs
 

README.md

@@ -1,32 +1,36 @@
 {
-  "name": "F2",
-  "description": "F2 is an open and free web integration framework designed to help you and other financial industry participants develop custom solutions that combine the best tools and content from multiple providers into one, privately-labeled, seamlessly integrated front-end.",
-  "keywords": ["f2","openf2","markit f2"],
-  "homepage": "http://www.openf2.org",
-  "version": "1.4.1",
-  "main": "F2.latest.js",
-  "ignore": [
-    "**/.*",
-    ".bowerrc",
-    ".gitignore",
-	".gitattributes",
-    ".jshintrc",
-    ".travis.yml",
-    "Gruntfile.js",
-    "package.json",
-    "README.md",
-    "CONTRIBUTING.md",
-    "ThirdPartyMaterial.md",
-    "LICENSE",
-    "docs",
-    "examples",
-    "sdk",
-    "tests",
-    "node_modules"
-  ],
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/OpenF2/F2.git"
-  }
-}
+	"name": "F2",
+	"description": "F2 is an open and free web integration framework that allows you to deploy apps & components both within your existing web application and cross-domain.",
+	"keywords": [
+		"f2",
+		"openf2",
+		"markit f2"
+	],
+	"homepage": "http://www.openf2.org",
+	"version": "1.4.2",
+	"main": "F2.latest.js",
+	"ignore": [
+		"**/.*",
+		".bowerrc",
+		".gitignore",
+		".gitattributes",
+		".jshintrc",
+		".travis.yml",
+		"Gruntfile.js",
+		"package.json",
+		"README.md",
+		"CONTRIBUTING.md",
+		"ThirdPartyMaterial.md",
+		"LICENSE",
+		"docs",
+		"examples",
+		"sdk",
+		"tests",
+		"node_modules"
+	],
+	"license": "Apache-2.0",
+	"repository": {
+		"type": "git",
+		"url": "git://github.com/OpenF2/F2.git"
+	}
+}

bower.json

@@ -1089,7 +1089,7 @@ if (typeof JSON !== 'object') {
 
 
 /*!
- * F2 v1.4.1 05-17-2016
+ * F2 v1.4.2 06-20-2016
  * Copyright (c) 2014 Markit On Demand, Inc. http://www.openf2.org
  *
  * "F2" is licensed under the Apache License, Version 2.0 (the "License"); 
@@ -1453,7 +1453,7 @@ F2 = (function() {
 		 * @method version
 		 * @return {string} F2 version number
 		 */
-		version: function() { return '1.4.1'; }
+		version: function() { return '1.4.2'; }
 	};
 })();
 

dist/f2.basic.js

@@ -14362,7 +14362,7 @@ global.easyXDM = easyXDM;
 })(window, document, location, window.setTimeout, decodeURIComponent, encodeURIComponent);
 
 /*!
- * F2 v1.4.1 05-17-2016
+ * F2 v1.4.2 06-20-2016
  * Copyright (c) 2014 Markit On Demand, Inc. http://www.openf2.org
  *
  * "F2" is licensed under the Apache License, Version 2.0 (the "License"); 
@@ -14726,7 +14726,7 @@ F2 = (function() {
 		 * @method version
 		 * @return {string} F2 version number
 		 */
-		version: function() { return '1.4.1'; }
+		version: function() { return '1.4.2'; }
 	};
 })();
 

dist/f2.basic.min.js

@@ -14025,7 +14025,7 @@ global.easyXDM = easyXDM;
 })(window, document, location, window.setTimeout, decodeURIComponent, encodeURIComponent);
 
 /*!
- * F2 v1.4.1 05-17-2016
+ * F2 v1.4.2 06-20-2016
  * Copyright (c) 2014 Markit On Demand, Inc. http://www.openf2.org
  *
  * "F2" is licensed under the Apache License, Version 2.0 (the "License"); 
@@ -14389,7 +14389,7 @@ F2 = (function() {
 		 * @method version
 		 * @return {string} F2 version number
 		 */
-		version: function() { return '1.4.1'; }
+		version: function() { return '1.4.2'; }
 	};
 })();