Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
mistic100 committed Jan 2, 2018
2 parents 4a8ed68 + 51f2a0d commit 1f54037
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ module.exports = function(grunt) {
});

grunt.registerTask('updatePackage', 'Update version in package.json', function() {
var pkg = grunt.config('pkg');
var pkg = grunt.file.readJSON('package.json');
pkg.version = grunt.option('tag');
grunt.file.write('package.json', JSON.stringify(pkg, null, 2) + '\n');
});
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dot": ">=1.0.3"
},
"devDependencies": {
"foodoc": "git://github.com/mistic100/foodoc.git#custom",
"foodoc": "^0.0.8",
"grunt": "^1.0.0",
"grunt-banner": "^0.6.0",
"grunt-contrib-clean": "^1.0.0",
Expand All @@ -31,17 +31,17 @@
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^2.0.0",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-sass": "^1.0.0",
"grunt-contrib-uglify": "^3.0.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-jscs": "^3.0.1",
"grunt-jsdoc": "^2.1.0",
"grunt-mocha-test": "^0.13.2",
"grunt-open": "^0.2.3",
"grunt-scss-lint": "^0.5.0",
"grunt-sass": "^2.0.0",
"grunt-sass-lint": "^0.2.2",
"grunt-wrap": "^0.3.0",
"jit-grunt": "^0.10.0",
"mocha": "^3.2.0",
"mocha": "^4.0.0",
"simple-cli": "^4.0.0",
"time-grunt": "^1.3.0"
},
Expand Down

0 comments on commit 1f54037

Please sign in to comment.