Skip to content

Commit

Permalink
Add bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
Xiphe committed Apr 14, 2014
1 parent 72d3c66 commit 3ad5d0f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
17 changes: 9 additions & 8 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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']
2 changes: 1 addition & 1 deletion dist/jquery.phpdiffmerge.css
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.phpdiffmerge.js
Original file line number Diff line number Diff line change
@@ -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($){
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 0 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 3ad5d0f

Please sign in to comment.