From bf7ecaf399ad09408dbe2244cb47fae64459244d Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 23 Sep 2015 14:27:48 -0400 Subject: [PATCH] [node] add support for Node.js v4.1.x and update changelog --- .travis.yml | 4 ++-- package.json | 2 +- platform/node/CHANGELOG.md | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9d22b51e6d..d9e0cdb179d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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' ] @@ -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 diff --git a/package.json b/package.json index 69f75a4fcf3..6575c15f138 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md index d4b0abd4997..2f66545ec8d 100644 --- a/platform/node/CHANGELOG.md +++ b/platform/node/CHANGELOG.md @@ -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 @@ -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