Merge pull request #127 from node-xmpp/4.0

make travis run with Node.js 4.0
xmppo · Sep 9, 2015 · 58beb44 · 58beb44
2 parents 4963b95 + b3f048c
commit 58beb44
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,12 +6,13 @@ env:
   - CXX="g++-4.8"
 
 node_js:
-  - "0.8"
-  - "0.10"
-  - "0.12"
-  - "iojs"
-  - "iojs-v1"
-  - "iojs-v2"
+  - '0.8'
+  - '0.10'
+  - '0.12'
+  - 'iojs'
+  - 'iojs-v1'
+  - 'iojs-v2'
+  - '4.0'
 
 addons:
   apt:

diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
   "dependencies": {
     "bindings": "^1.2.1",
     "debug": "^2.2.0",
-    "iconv": "^2.1.5",
-    "nan": "^2.0.8"
+    "iconv": "^2.1.10",
+    "nan": "^2.0.9"
   },
   "devDependencies": {
     "vows": "^0.8.1"