Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Revert Node.js 4.1 pin and update dependencies #2605

Merged
merged 2 commits into from
Oct 13, 2015
Merged

Revert Node.js 4.1 pin and update dependencies #2605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7171a12
Revert "[node] pin to Node.js v4.1 until #2597 is resolved"
mikemorris Oct 13, 2015
966397d
[node] update dependencies
mikemorris Oct 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ matrix:
apt:
packages: [ 'lib32stdc++6' ]
- os: linux
env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=4.1
env: FLAVOR=node CXX=clang++-3.5 BUILDTYPE=Release NODE_VERSION=4
addons:
apt:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
Expand All @@ -79,7 +79,7 @@ matrix:
- os: osx
osx_image: xcode7
compiler: clang
env: FLAVOR=node NODE_VERSION=4.1
env: FLAVOR=node NODE_VERSION=4
- os: osx
osx_image: xcode7
compiler: clang
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
}
],
"dependencies": {
"nan": "^2.0.9",
"node-pre-gyp": "^0.6.11"
"nan": "^2.1.0",
"node-pre-gyp": "^0.6.12"
},
"bundledDependencies": [
"node-pre-gyp"
],
"devDependencies": {
"aws-sdk": "^2.1.47",
"aws-sdk": "^2.2.9",
"mapbox-gl-test-suite": "git+https://github.com/mapbox/mapbox-gl-test-suite.git#9b3df7ea2751d076abf31015e20d5f3137cd10f6",
"request": "^2.61.0",
"tape": "^4.2.0"
"request": "^2.65.0",
"tape": "^4.2.1"
},
"scripts": {
"install": "node-pre-gyp install --fallback-to-build=false || make node",
Expand Down