manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'feature/unify-versioninfo' into 'feature/update-toolchain'

Browse source 
Feature/unify versioninfo

This will fix #21 .

See merge request !40
This commit is contained in:
Manuel Friedli 2015-01-19 01:19:54 +01:00
commit ef6d48b906
17 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Gruntfile.js
View file

@ -145,15 +145,33 @@ module.exports = function (grunt) {
port: 9000 port: 9000
} }
} }
},
version: {
VERSION: {
options: {
prefix: ''
},
src: ['VERSION']
},
bower: {
src: ['bower.json']
},
manifest: {
options: {
prefix: 'Version\\s+'
},
src: ['manifest.appcache']
}
} }
}); });
grunt.loadNpmTasks('grunt-mocha-phantomjs'); grunt.loadNpmTasks('grunt-mocha-phantomjs');
grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-version');
// Default task. // Default task.
grunt.registerTask('default', ['jshint', 'clean', 'concat', 'connect', 'mocha_phantomjs', 'uglify', 'cssmin']); grunt.registerTask('default', ['jshint', 'clean', 'version', 'concat', 'connect', 'mocha_phantomjs', 'uglify', 'cssmin']);
grunt.registerTask('buildonly', ['clean', 'concat', 'uglify', 'cssmin']); grunt.registerTask('buildonly', ['clean', 'version', 'concat', 'uglify', 'cssmin']);
grunt.registerTask('server', function () { grunt.registerTask('server', function () {
grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.'); grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.');
grunt.task.run(['serve']); grunt.task.run(['serve']);

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.0 8.0.0-dev.1

2
bower.json
View file

@ -1,6 +1,6 @@
{ {
"name": "uhr", "name": "uhr",
"version": "8.0.0-dev.0", "version": "8.0.0-dev.1",
"dependencies": { "dependencies": {
"jquery": "~2.1.3", "jquery": "~2.1.3",
"jquery-ui": "~1.11.2", "jquery-ui": "~1.11.2",

2
dist/jquery.uhr.base.js vendored
View file

@ -1,4 +1,4 @@
/*! uhr - v8.0.0-dev.0 - 2015-01-19 /*! uhr - v8.0.0-dev.1 - 2015-01-19
* http://bärneruhr.ch/ * http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
(function($) { (function($) {

2
dist/jquery.uhr.base.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/jquery.uhr.baselangs.js vendored
View file

@ -1,4 +1,4 @@
/*! uhr - v8.0.0-dev.0 - 2015-01-19 /*! uhr - v8.0.0-dev.1 - 2015-01-19
* http://bärneruhr.ch/ * http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
(function($) { (function($) {

2
dist/jquery.uhr.baselangs.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/jquery.uhr.complete.js vendored
View file

@ -1,4 +1,4 @@
/*! uhr - v8.0.0-dev.0 - 2015-01-19 /*! uhr - v8.0.0-dev.1 - 2015-01-19
* http://bärneruhr.ch/ * http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
(function($) { (function($) {

2
dist/jquery.uhr.complete.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/jquery.uhr.langs.js vendored
View file

@ -1,4 +1,4 @@
/*! uhr - v8.0.0-dev.0 - 2015-01-19 /*! uhr - v8.0.0-dev.1 - 2015-01-19
* http://bärneruhr.ch/ * http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
(function($) { (function($) {

2
dist/jquery.uhr.langs.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/jquery.uhr.main.js vendored
View file

@ -1,4 +1,4 @@
/*! uhr - v8.0.0-dev.0 - 2015-01-19 /*! uhr - v8.0.0-dev.1 - 2015-01-19
* http://bärneruhr.ch/ * http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
(function($) { (function($) {

2
dist/jquery.uhr.main.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/libs.js vendored
View file

@ -1,4 +1,4 @@
/*! uhr - v8.0.0-dev.0 - 2015-01-19 /*! uhr - v8.0.0-dev.1 - 2015-01-19
* http://bärneruhr.ch/ * http://bärneruhr.ch/
* Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */ * Copyright (c) 2015 Manuel Friedli; Licensed GPLv3 */
/*! /*!

2
dist/libs.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
manifest.appcache
View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Version <%=VERSION_PLACEHOLDER=%> # Version 8.0.0-dev.1
/ /
dist/jquery.uhr.base.min.js dist/jquery.uhr.base.min.js

3
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "uhr", "name": "uhr",
"version": "8.0.0-dev.0", "version": "8.0.0-dev.1",
"description": "jQuery QLOCKTWO plugin", "description": "jQuery QLOCKTWO plugin",
"keywords": [ "keywords": [
"jquery-plugin", "jquery-plugin",
@ -34,6 +34,7 @@
"grunt-contrib-uglify": "~0.5.0", "grunt-contrib-uglify": "~0.5.0",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
"grunt-mocha-phantomjs": "^0.6.0", "grunt-mocha-phantomjs": "^0.6.0",
"grunt-version": "^0.3.0",
"jshint-stylish": "~0.2.0", "jshint-stylish": "~0.2.0",
"load-grunt-tasks": "~0.6.0", "load-grunt-tasks": "~0.6.0",
"phantomjs": "^1.9.13", "phantomjs": "^1.9.13",