Permalink
Browse files

Add bump.

  • Loading branch information...
1 parent 72d3c66 commit 3ad5d0f7ed6be1067770f4de1945e03a2d303e6e @Xiphe committed Apr 14, 2014
Showing with 13 additions and 13 deletions.
  1. +9 −8 Gruntfile.coffee
  2. +1 −1 dist/jquery.phpdiffmerge.css
  3. +1 −1 dist/jquery.phpdiffmerge.js
  4. +2 −1 package.json
  5. +0 −2 readme.md
View
@@ -59,16 +59,17 @@ module.exports = (grunt) ->
singleRun: false
autoWatch: true
+ bump:
+ options:
+ files: ['package.json', 'bower.json']
+ updateConfigs: ['pkg']
+ commitFiles: ['package.json', 'bower.json', 'dist/']
+ tagName: 'v%VERSION%'
+ pushTo: 'origin'
+
grunt.registerTask 'test', ['karma:single']
grunt.registerTask 'watch', ['karma:watch']
grunt.registerTask 'build', ['less', 'cssmin', 'concat', 'uglify']
grunt.registerTask 'default', ['test', 'build']
-
-
-
-
-
-
-
-
+ grunt.registerTask 'release', (type) -> grunt.task.run ['test', "bump-only:#{type||'patch'}", 'build', 'bump-commit']
@@ -1,6 +1,6 @@
/*!
* jQuery-Merge-for-php-diff - A jQuery plugin for handling the conflicts between two documents.
-* v0.2.2 - 2014-04-14 7:49:26 AM UTC
+* v0.2.2 - 2014-04-14 8:49:45 AM UTC
* Copyright (c) 2014 Hannes Diercks <github@xiphe.net>; License: MIT
*/
.Differences .ChangeReplace td,
@@ -1,6 +1,6 @@
/*!
* jQuery-Merge-for-php-diff - A jQuery plugin for handling the conflicts between two documents.
-* v0.2.2 - 2014-04-14 7:49:26 AM UTC
+* v0.2.2 - 2014-04-14 8:49:45 AM UTC
* Copyright (c) 2014 Hannes Diercks <github@xiphe.net>; License: MIT
*/
(function($){
View
@@ -40,6 +40,7 @@
"karma-jasmine": "~0.1.5",
"karma-phantomjs-launcher": "~0.1.4",
"karma-coffee-preprocessor": "~0.2.1",
- "bower": "~1.3.2"
+ "bower": "~1.3.2",
+ "grunt-bump": "0.0.13"
}
}
View
@@ -8,8 +8,6 @@ A client side merge tool for Chris Boultons [PHP DIFF](https://github.com/chrisb
Version
-------
-0.2.2
-
THIS IS A BETA RELEASE!
I had not the time to test this very much so if you rely on this script blindly
you may get some unexpected results.

0 comments on commit 3ad5d0f

Please sign in to comment.