Merge pull request #924 from aj-dev/master

Upgrade to angular 1.5 and latest phantomjs
SC5 · Apr 29, 2016 · 30782b2 · 30782b2
2 parents 382d202 + ea969bd
commit 30782b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -2,10 +2,10 @@
   "name": "styleguide",
   "version": "0.1.0",
   "dependencies": {
-    "angular": "1.3.0",
-    "angular-animate": "1.3.0",
+    "angular": "1.5.5",
+    "angular-animate": "1.5.5",
     "angular-highlightjs": "0.3.0",
-    "angular-mocks": "1.3.0",
+    "angular-mocks": "1.5.5",
     "angular-bootstrap-colorpicker": "3.0.8",
     "angular-local-storage": "0.1.0",
     "ui-router": "0.2.13",
@@ -18,6 +18,6 @@
   },
   "devDependencies": {},
   "resolutions": {
-    "angular": "1.3.0"
+    "angular": "1.5.5"
   }
 }
diff --git a/package.json b/package.json
@@ -104,10 +104,11 @@
     "karma-coverage": "~0.5.3",
     "karma-mocha": "~0.2.1",
     "karma-mocha-reporter": "~1.1.2",
-    "karma-phantomjs-launcher": "~0.2.0",
+    "karma-phantomjs-launcher": "~1.0.0",
     "karma-sinon-chai": "~1.1.0",
     "main-bower-files": "~2.9.0",
     "node-localcache": "^0.1.3",
+    "phantomjs-prebuilt": "2.1.7",
     "proxyquire": "~1.7.3",
     "requirefrom": "~0.2.0",
     "sinon": "~1.17.2",