summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuardiola31337 <pablo.guardiola@mapbox.com>2017-10-19 14:15:11 +0200
committerGuardiola31337 <pablo.guardiola@mapbox.com>2017-10-19 14:15:11 +0200
commit2ce15532e0ffe848ff2bee38a6b480d28e29b650 (patch)
tree1b15c5a93e4c9e670fccb1ec9ee1207afb82e221
parentefcb9ee23129c6c1a863ab4908960dd46328248c (diff)
downloadqtlocation-mapboxgl-upstream/release-android-v5.2.0-beta.2.tar.gz
[android] release v5.2.0-beta.2upstream/release-android-v5.2.0-beta.2
-rw-r--r--circle.yml2
-rw-r--r--platform/android/CHANGELOG.md14
-rw-r--r--platform/android/MapboxGLAndroidSDK/gradle.properties2
3 files changed, 15 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml
index 39b00e8ed0..24a3c97a3d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -294,7 +294,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.2" ]; then make run-android-upload-archives ; fi
# ------------------------------------------------------------------------------
diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md
index 520a678b73..2072f0c128 100644
--- a/platform/android/CHANGELOG.md
+++ b/platform/android/CHANGELOG.md
@@ -6,6 +6,19 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to
* TBA
+## 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)
+- Execute callbacks only when not idle [#10220](https://github.com/mapbox/mapbox-gl-native/pull/10220)
+- Cleanup unused gradle plugins [#10211](https://github.com/mapbox/mapbox-gl-native/pull/10211)
+- add FileSource pause/resume [#9977](https://github.com/mapbox/mapbox-gl-native/pull/9977)
+- add make target for ndk-stack [#10185](https://github.com/mapbox/mapbox-gl-native/pull/10185)
+- Add interpolator examples [#10067](https://github.com/mapbox/mapbox-gl-native/pull/10067)
+- Add an UnsatisfiedLinkError safeguard [#10180](https://github.com/mapbox/mapbox-gl-native/pull/10180)
+- Hold off handling hover events untill map has been created [#10142](https://github.com/mapbox/mapbox-gl-native/pull/10142)
+- Added `MapboxMap.getCameraForGeometry()` to get a camera with zoom level and center coordinate computed to fit a shape [#10107](https://github.com/mapbox/mapbox-gl-native/pull/10107)
+- Fine tune gesture zoom & rotation [#10134](https://github.com/mapbox/mapbox-gl-native/pull/10134)
+
## 5.2.0-beta.1 - October 6, 2017
* Allow multiple listeners for camera events, deprecate old API [#10141](https://github.com/mapbox/mapbox-gl-native/pull/10141)
@@ -59,7 +72,6 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to
- build release package once during ci build [#9351](https://github.com/mapbox/mapbox-gl-native/pull/9351)
* Add support for ImageSource [#9110](https://github.com/mapbox/mapbox-gl-native/pull/9110)
* Increased the default maximum zoom level from 20 to 22. [#9835](https://github.com/mapbox/mapbox-gl-native/pull/9835)
-* Added `MapboxMap.getCameraForGeometry()` to get a camera with zoom level and center coordinate computed to fit a shape. ([#10107](https://github.com/mapbox/mapbox-gl-native/pull/10107))
### 5.1.4 - September 25, 2017
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index a3dab0eff6..e78d15d783 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.2
POM_DESCRIPTION=Mapbox GL Android SDK
POM_URL=https://github.com/mapbox/mapbox-gl-native