diff --git a/CHANGELOG.md b/CHANGELOG.md index 03781e0ec..7e0e0bba8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ CHANGELOG -------------------- +## 4.5.2 (2014-04-12) +* Updated release versioning to include bower.json and component.json + ## 4.5.1 (2014-03-27) * Fixed a bug from the last release where canPlaySource was no longer exported diff --git a/Gruntfile.js b/Gruntfile.js index 8158e6dd4..8be864b60 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -179,9 +179,28 @@ module.exports = function(grunt) { } } }, - bump: { - files: ['package.json'], - updateConfigs: ['pkg'] + version: { + options: { + pkg: 'package.json' + }, + major: { + options: { + release: 'major' + }, + src: ['package.json', 'bower.json', 'component.json'] + }, + minor: { + options: { + release: 'minor' + }, + src: ['package.json', 'bower.json', 'component.json'] + }, + patch: { + options: { + release: 'patch' + }, + src: ['package.json', 'bower.json', 'component.json'] + } }, tagrelease: { file: 'package.json', @@ -205,7 +224,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('videojs-doc-generator'); grunt.loadNpmTasks('grunt-zip'); grunt.loadNpmTasks('grunt-banner'); - grunt.loadNpmTasks('grunt-bump'); + grunt.loadNpmTasks('grunt-version'); grunt.loadNpmTasks('grunt-tagrelease'); grunt.loadNpmTasks('chg'); diff --git a/bower.json b/bower.json index 15f276b68..f2df2e93a 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,9 @@ { "name": "video.js", "description": "An HTML5 and Flash video player with a common API and skin for both.", - "version": "4.4.3", + "version": "4.5.2", "main": [ - "dist/video-js/video.js", + "dist/video-js/video.js", "dist/video-js/video-js.css" ], "keywords": [ @@ -13,4 +13,4 @@ "video", "player" ] -} \ No newline at end of file +} diff --git a/component.json b/component.json index 535c8c89b..5b25db1a4 100644 --- a/component.json +++ b/component.json @@ -1,7 +1,7 @@ { "name": "video.js", "description": "An HTML5 and Flash video player with a common API and skin for both.", - "version": "4.4.2", + "version": "4.5.2", "keywords": [ "videojs", "html5", diff --git a/contrib.json b/contrib.json index 204d5ecf5..2464cfbc0 100644 --- a/contrib.json +++ b/contrib.json @@ -278,8 +278,8 @@ "exec": "grunt chg-release:<%= type %>" }, { - "desc": "Bump the package version", - "exec": "grunt bump-only:<%= type %>" + "desc": "Bump package versions", + "exec": "grunt version:<%= type %>" }, { "desc": "Build the release", diff --git a/package.json b/package.json index 7f602999f..33951a126 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "video.js", "description": "An HTML5 and Flash video player with a common API and skin for both.", - "version": "4.5.1", + "version": "4.5.2", "copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE", "keywords": [ "videojs", @@ -54,9 +54,9 @@ "grunt-zip": "0.10.2", "grunt-banner": "~0.2.0", "chg": "~0.1.8", - "grunt-bump": "0.0.13", "grunt-tagrelease": "~0.3.3", "github": "~0.1.14", - "open": "0.0.4" + "open": "0.0.4", + "grunt-version": "~0.3.0" } }