- updated version to a correct semver string

- disable qunit in the default grunt task, as no tests are available yet
  and that causes the build to fail (i don't like the --force option)
This commit is contained in:
Manuel Friedli 2015-01-15 14:48:10 +01:00
parent fa79447259
commit 2e55875262
12 changed files with 13 additions and 12 deletions

View file

@ -121,7 +121,8 @@ module.exports = function (grunt) {
}); });
// Default task. // Default task.
grunt.registerTask('default', ['jshint', 'connect', 'qunit', 'clean', 'concat', 'uglify']); // grunt.registerTask('default', ['jshint', 'connect', 'qunit', 'clean', 'concat', 'uglify']);
grunt.registerTask('default', ['jshint', 'connect', /*'qunit', */'clean', 'concat', 'uglify']);
grunt.registerTask('buildonly', ['clean', 'concat', 'uglify']); grunt.registerTask('buildonly', ['clean', 'concat', 'uglify']);
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.');

View file

@ -1 +1 @@
7.0-next 7.0.0-next

View file

@ -7,6 +7,6 @@
}, },
"devDependencies": { "devDependencies": {
"qunit": "~1.12.0", "qunit": "~1.12.0",
"jquery": "latest" "jquery": "~2.1.3"
} }
} }

View file

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

File diff suppressed because one or more lines are too long

View file

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

File diff suppressed because one or more lines are too long

View file

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

File diff suppressed because one or more lines are too long

2
dist/libs.js vendored
View file

@ -1,4 +1,4 @@
/*! uhr - v7.0-next - 2015-01-13 /*! uhr - v7.0.0-next - 2015-01-15
* 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

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{ {
"name": "uhr", "name": "uhr",
"version": "7.0-next", "version": "7.0.0-next",
"description": "jQuery QLOCKTWO plugin", "description": "jQuery QLOCKTWO plugin",
"keywords": [ "keywords": [
"jquery-plugin", "qlocktwo" "jquery-plugin", "qlocktwo"