Merge pull request #485 from iamstolis/microtime-dependency

Update of microtime dependency (so that npm install works on Node 4 and 5)
cujojs · Apr 14, 2016 · f9fa814 · f9fa814
2 parents ade6393 + 9cbecad
commit f9fa814
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,22 @@ language: node_js
 node_js:
   - '0.10'
   - '0.12'
+  - '4'
+  - '5'
 sudo: false
 script: npm run ci
 branches:
   only:
     - dev
     - master
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
 env:
   global:
     - SAUCE_USERNAME="cujojs-when"
     - SAUCE_ACCESS_KEY="e5d3d1a5-bc49-4607-8a7e-702a512c7f60"
+    - CXX=g++-4.8
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "exorcist": "~0.4",
     "jshint": "~2",
     "json5": "~0.2",
-    "microtime": "~0",
+    "microtime": "~2",
     "optimist": "~0.6",
     "poly": "^0.6.1",
     "promises-aplus-tests": "~2",