Merge pull request #121 from feedhenry/FH-137-buildnumber-and-shrinkwrap

Add a shrinkwrap file; remove -BUILD-NUMBER
feedhenry · Apr 10, 2015 · 4075c92 · 4075c92
2 parents d3e9a17 + 7e85239
commit 4075c92
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog - FeedHenry Javascript SDK
 
+## 2.6.1 - 2015-04-10 - Gerard Ryan
+* FH-137: Remove -BUILD-NUMBER from version
+* Add npm-shrinkwrap.json file to lock dependency versions
+
 ##2.6.0 - 2015-03-26 - Wei Li
 * FHMOBSDK-53 - Fix an issue with local params
 * FHMOBSDK-56 - Fix an issue with the sync framework.
@@ -145,7 +149,7 @@
 
 ## 2.0.7-alpha - 2014-04-25 - IR226 - Wei Li
 
-* Add support for Titanium 
+* Add support for Titanium
 
 ## 2.0.6-alpha - 2014-04-4 - IR226 - Wei Li
 
@@ -158,5 +162,3 @@
 ## 2.0.4 - IR226 - 2014-04-22 - Wei Li
 
 * 6927 - Fix uncaught security execeptions when using JS SDK inside browsers which don't allow saving data
-
-
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -141,7 +141,7 @@ module.exports = function(grunt) {
                 console.log("found current version = " + version);
                 if(process.env.TRAVIS_BUILD_NUMBER){
                   console.log("found BUILD_NUMBER in process.env " + process.env.TRAVIS_BUILD_NUMBER);
-                  version = version.replace(/BUILD\-NUMBER/g, process.env.TRAVIS_BUILD_NUMBER);
+                  version = version + '-' + process.env.TRAVIS_BUILD_NUMBER;
                 }
                 console.log("Version to inject is " + version);
                 t = data.replace("BUILD_VERSION", version);
@@ -170,7 +170,7 @@ module.exports = function(grunt) {
                 console.log("found current version = " + version);
                 if(process.env.TRAVIS_BUILD_NUMBER){
                   console.log("found BUILD_NUMBER in process.env " + process.env.TRAVIS_BUILD_NUMBER);
-                  version = version.replace(/BUILD\-NUMBER/g, process.env.TRAVIS_BUILD_NUMBER);
+                  version = version + '-' + process.env.TRAVIS_BUILD_NUMBER;
                 }
                 console.log("Version to inject is " + version);
                 t = data.replace("BUILD_VERSION", version);
@@ -240,7 +240,7 @@ module.exports = function(grunt) {
         replacements: [{
           from: '************TEMPLATES***************',                   // string replacement
           to: function(){
-            return grunt.file.read("src/appforms/src/backbone/040-view00Templates.html", {encoding: 'utf8'}).replace(/(\r\n|\n|\r)/gm,""); 
+            return grunt.file.read("src/appforms/src/backbone/040-view00Templates.html", {encoding: 'utf8'}).replace(/(\r\n|\n|\r)/gm,"");
           }
         }]
       }
@@ -296,14 +296,14 @@ module.exports = function(grunt) {
       jscov: {
         //NOTE: install node-jscoverage first from here: https://github.com/visionmedia/node-jscoverage
         command: 'jscoverage src/ src-cov/ --exclude=appforms',
-        options: { 
+        options: {
           stdout: true
         }
       },
       htmlcov: {
         //NOTE: install jsoncov2htmlcov first from here: https://github.com/plasticine/json2htmlcov
         command: 'json2htmlcov rep/coverage.json > rep/coverage.html',
-        options: {   
+        options: {
           stdout: true
         }
       }

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fh-js-sdk",
-  "version": "2.6.0+BUILD-NUMBER",
+  "version": "2.6.1",
   "description": "feedhenry js sdk",
   "main": "dist/feedhenry.js",
   "browser": {