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

Commit

Permalink
[node] add support for Node.js v4.1.x and update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
mikemorris committed Sep 24, 2015
1 parent 74ef39e commit bf7ecaf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
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=iojs-v3
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=iojs-v3
env: FLAVOR=node NODE_VERSION=4
- os: osx
osx_image: xcode7
compiler: clang
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"dependencies": {
"nan": "^2.0.9",
"node-pre-gyp": "^0.6.9"
"node-pre-gyp": "^0.6.11"
},
"bundledDependencies": [
"node-pre-gyp"
Expand Down
3 changes: 2 additions & 1 deletion platform/node/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Adds support for rendering v8 styles.
- No longer loads resources before a render request is made. ([`55d25a8`](https://github.com/mapbox/mapbox-gl-native/commit/55d25a80a77c06ef5e66acc0d8518867b03fe8a4))
- Adds io.js v3.x support. ([#2261](https://github.com/mapbox/mapbox-gl-native/pull/2261))
- Adds Node.js v4.1.x support.

# 1.1.3

Expand All @@ -22,7 +23,7 @@
# 1.1.2

- Check libuv version semver-ishly, fixes segfaults in Node.js 0.12.x
and iojs.
and io.js.
- Fixes segfault, throws JavaScript error instead when attempting to
render without first loading a style.
- Bumps mbgl submodule to v0.4.0
Expand Down

0 comments on commit bf7ecaf

Please sign in to comment.