Merge pull request #206 from ascripcaru/dev

Update dependencies and added node 5 on travis
danielgtaylor · Dec 18, 2015 · d47cea8 · d47cea8
2 parents 6c8d8b4 + 8acb8b8
commit d47cea8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ node_js:
     - "0.12"
     - "3"
     - "4"
+    - "5"
 addons:
   apt:
     sources:

diff --git a/package.json b/package.json
@@ -35,22 +35,22 @@
     "markdown"
   ],
   "dependencies": {
-    "aglio-theme-olio": "^1.2.0",
-    "chokidar": "^1.0.1",
-    "cli-color": "^1.0.0",
-    "pretty-error": "^1.1.2",
-    "protagonist": "1.1.1",
-    "serve-static": "^1.9.3",
-    "socket.io": "^1.3.5",
-    "yargs": "^3.0.2"
+    "aglio-theme-olio": "^1.6.2",
+    "chokidar": "^1.4.1",
+    "cli-color": "^1.1.0",
+    "pretty-error": "^1.2.0",
+    "protagonist": "^1.2.2",
+    "serve-static": "^1.10.0",
+    "socket.io": "^1.3.7",
+    "yargs": "^3.31.0"
   },
   "devDependencies": {
-    "async": "^1.0.0",
-    "coffeelint": "^1.5.6",
-    "grunt": "~0.4.1",
+    "async": "^1.5.0",
+    "coffeelint": "^1.14.2",
+    "grunt": "~0.4.5",
     "grunt-coffeelint": "0.0.13",
     "grunt-contrib-coffee": "^0.13.0",
     "grunt-mocha-cov": "^0.4.0",
-    "sinon": "^1.10.3"
+    "sinon": "^1.17.2"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ node_js: @@
         - "0.12"
         - "3"
         - "4"
+        - "5"
     addons:
       apt:
         sources:
@@ Expand Down @@