summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <mikemorris@users.noreply.github.com>2016-04-26 11:40:12 -0400
committerMike Morris <mikemorris@users.noreply.github.com>2016-04-26 11:48:02 -0400
commit64fe75b01109d38977b20c83773e6236e55905a8 (patch)
treef6afd4e590a340ffc96a0933ec50acea9d9ea35a
parent18c337c845921debb4428c7c0cabdbed9035655b (diff)
downloadqtlocation-mapboxgl-64fe75b01109d38977b20c83773e6236e55905a8.tar.gz
node-v3.1.2node-v3.1.2
-rw-r--r--Makefile3
-rw-r--r--package.json6
-rw-r--r--platform/node/CHANGELOG.md4
3 files changed, 9 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 5decd2319e..182d14b76d 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,8 @@ clean:
./platform/android/MapboxGLAndroidSDKTestApp/build \
./platform/android/MapboxGLAndroidSDK/src/main/jniLibs \
./platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs \
- ./platform/android/MapboxGLAndroidSDK/src/main/assets
+ ./platform/android/MapboxGLAndroidSDK/src/main/assets \
+ ./node_modules
distclean: clean
-rm -rf ./mason_packages
diff --git a/package.json b/package.json
index b7787d9bd0..c7d82f1e15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "mapbox-gl-native",
- "version": "3.1.1",
+ "version": "3.1.2",
"description": "Renders map tiles with Mapbox GL",
"keywords": [
"mapbox",
@@ -17,10 +17,10 @@
"node-pre-gyp": "^0.6.26"
},
"devDependencies": {
- "aws-sdk": "^2.3.2",
+ "aws-sdk": "^2.3.5",
"mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#1e0d988e187a6c9a7a74fa8d7feb9c66c2258123",
"node-gyp": "^3.3.1",
- "request": "^2.70.0",
+ "request": "^2.72.0",
"tape": "^4.5.1"
},
"engines": {
diff --git a/platform/node/CHANGELOG.md b/platform/node/CHANGELOG.md
index 6124136483..d69b9e404c 100644
--- a/platform/node/CHANGELOG.md
+++ b/platform/node/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.1.2
+
+- Fixes a race condition with animated transitions ([#4836](https://github.com/mapbox/mapbox-gl-native/pull/4836))
+
# 3.1.1
- Moves node-pre-gyp from `bundledDependencies` to `preinstall` ([#4680](https://github.com/mapbox/mapbox-gl-native/pull/4680))