Merge branch 'feature/remove-bower' into 'develop'

Feature/remove bower



See merge request !49

.bowerrc

@@ -1,3 +0,0 @@
-{
-    "directory": "bower_components"
-}

.gitlab-ci.yml

@@ -16,7 +16,6 @@ build_job:
   stage: build
   script:
     - npm install
-    - $NPMPATH/bower install
     - $NPMPATH/grunt
   tags:
     - javascript
@@ -34,7 +33,6 @@ cleanup_build_job:
   stage: cleanup_build
   script:
     - rm -rf node_modules
-    - rm -rf bower_components
     - rm -rf dist
   when: on_failure
 
@@ -74,5 +72,4 @@ cleanup_job:
   stage: cleanup
   script:
     - rm -rf node_modules
-    - rm -rf bower_components
   when: always

Gruntfile.js

@@ -25,10 +25,10 @@ module.exports = function (grunt) {
             },
             libs: {
                 src: [
-                    'bower_components/jquery/dist/jquery.js',
-                    'bower_components/jquery-ui/ui/core.js',
-                    'bower_components/jquery-ui/ui/widget.js',
-                    'bower_components/jquery-cookie/jquery.cookie.js'
+                    'node_modules/jquery/dist/jquery.js',
+                    'node_modules/jquery-ui/ui/core.js',
+                    'node_modules/jquery-ui/ui/widget.js',
+                    'node_modules/jquery.cookie/jquery.cookie.js'
                 ],
                 dest: 'dist/libs.js'
             },

VERSION

@@ -1 +1 @@
-8.0.3
+8.0.4-dev.0

bower.json

@@ -1,13 +0,0 @@
-{
-    "name": "uhr",
-    "version": "8.0.4-dev.0",
-    "dependencies": {
-        "jquery": "~2.1.3",
-        "jquery-ui": "~1.11.2",
-        "jquery-cookie": "~1.4.1"
-    },
-    "devDependencies": {
-        "mocha": "~2.3.3",
-        "chai": "~3.3.0"
-    }
-}

dist/jquery.uhr.base.js

@@ -1,4 +1,4 @@
-/*! uhr - v8.0.3 - 2016-06-27
+/*! uhr - v8.0.4-dev.0 - 2016-06-27
 * http://bärneruhr.ch/
 * Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
 (function($) {

dist/jquery.uhr.baselangs.js

@@ -1,4 +1,4 @@
-/*! uhr - v8.0.3 - 2016-06-27
+/*! uhr - v8.0.4-dev.0 - 2016-06-27
 * http://bärneruhr.ch/
 * Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
 (function($) {

dist/jquery.uhr.complete.js

@@ -1,4 +1,4 @@
-/*! uhr - v8.0.3 - 2016-06-27
+/*! uhr - v8.0.4-dev.0 - 2016-06-27
 * http://bärneruhr.ch/
 * Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
 (function($) {

dist/jquery.uhr.langs.js

@@ -1,4 +1,4 @@
-/*! uhr - v8.0.3 - 2016-06-27
+/*! uhr - v8.0.4-dev.0 - 2016-06-27
 * http://bärneruhr.ch/
 * Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
 (function($) {

dist/jquery.uhr.main.js

@@ -1,4 +1,4 @@
-/*! uhr - v8.0.3 - 2016-06-27
+/*! uhr - v8.0.4-dev.0 - 2016-06-27
 * http://bärneruhr.ch/
 * Copyright (c) 2016 Manuel Friedli; Licensed GPL-3.0 */
 (function($) {

manifest.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Version 8.0.3
+# Version 8.0.4-dev.0
 
 /
 dist/jquery.uhr.base.min.js

package.json

@@ -22,8 +22,12 @@
     }
   ],
   "license": "GPL-3.0",
+  "dependencies": {
+    "jquery": "~2.1.3",
+    "jquery-ui": "github:jquery/jquery-ui#1.11.4",
+    "jquery.cookie": "~1.4.1"
+  },
   "devDependencies": {
-    "bower": "^1.5.3",
     "grunt": "~0.4.5",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "~0.6.0",
@@ -39,6 +43,8 @@
     "jshint-stylish": "~2.0.1",
     "load-grunt-tasks": "~3.3.0",
     "phantomjs": "^1.9.18",
-    "time-grunt": "~1.2.1"
+    "time-grunt": "~1.2.1",
+    "mocha": "~2.3.3",
+    "chai": "~3.3.0"
   }
 }