summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuardiola31337 <pablo.guardiola@mapbox.com>2017-10-26 13:10:15 -0700
committerGuardiola31337 <pablo.guardiola@mapbox.com>2017-10-26 13:10:15 -0700
commit787f2a2b44c45bfabe003db0b04f8445189dc8a4 (patch)
treea489a4597b03fc8feca72f37755b30864f66acda
parentbd06e2f6fa3ca3367b831caeb52ecb6da3f199fd (diff)
downloadqtlocation-mapboxgl-upstream/release-android-v5.2.0-beta.3.tar.gz
[android] release v5.2.0-beta.3upstream/release-android-v5.2.0-beta.3
-rw-r--r--circle.yml2
-rw-r--r--platform/android/CHANGELOG.md6
-rw-r--r--platform/android/MapboxGLAndroidSDK/gradle.properties2
3 files changed, 8 insertions, 2 deletions
diff --git a/circle.yml b/circle.yml
index e651323428..6d85182e5c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -320,7 +320,7 @@ jobs:
- deploy:
name: Publish to Maven
command: |
- if [ "${CIRCLE_BRANCH}" == "release-agua" ]; then make run-android-upload-archives ; fi
+ if [ "${CIRCLE_BRANCH}" == "release-android-v5.2.0-beta.3" ]; then make run-android-upload-archives ; fi
# ------------------------------------------------------------------------------
diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md
index 2072f0c128..ac7fb1beb1 100644
--- a/platform/android/CHANGELOG.md
+++ b/platform/android/CHANGELOG.md
@@ -6,6 +6,12 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to
* TBA
+## 5.2.0-beta.3 - October 26, 2017
+
+- Reorganize dependencies [#10268](https://github.com/mapbox/mapbox-gl-native/pull/10268)
+- Blacklist VAO usage on adreno 3xx [#10291](https://github.com/mapbox/mapbox-gl-native/pull/10291)
+- On stop null check [#10259](https://github.com/mapbox/mapbox-gl-native/pull/10259)
+
## 5.2.0-beta.2 - October 19, 2017
- Wire up MapZoomButtonController with camera change events [#10221](https://github.com/mapbox/mapbox-gl-native/pull/10221)
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index a3dab0eff6..b55c093657 100644
--- a/platform/android/MapboxGLAndroidSDK/gradle.properties
+++ b/platform/android/MapboxGLAndroidSDK/gradle.properties
@@ -1,5 +1,5 @@
GROUP=com.mapbox.mapboxsdk
-VERSION_NAME=5.2.0-SNAPSHOT
+VERSION_NAME=5.2.0-beta.3
POM_DESCRIPTION=Mapbox GL Android SDK
POM_URL=https://github.com/mapbox/mapbox-gl-native