diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2018-05-17 19:42:55 +0200 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2018-05-17 19:42:55 +0200 |
| commit | 384263dc9e45e7d169b27229807c3f9c337acbe6 (patch) | |
| tree | 9a2383c8de8d78ec1bf9ca08c0fd8604d44c9659 | |
| parent | 4ceb687f6c7bdb4cd768310eeae558d826dcf506 (diff) | |
| download | qtlocation-mapboxgl-upstream/release-android-v6.2.0-alpha.1.tar.gz | |
[android] - add changelog for 6.2.0-alpha.1upstream/release-android-v6.2.0-alpha.1
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | platform/android/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/gradle.properties | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml index ca9ceb6636..5d55df1089 100644 --- a/circle.yml +++ b/circle.yml @@ -422,7 +422,7 @@ jobs: - deploy: name: Publish to Maven command: | - if [ "${CIRCLE_BRANCH}" == "master" ]; then make run-android-upload-archives ; fi + if [ "${CIRCLE_BRANCH}" == "release-android-v6.2.0-alpha.1" ]; then make run-android-upload-archives ; fi # ------------------------------------------------------------------------------ diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index a25656012b..d96957a07b 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -2,8 +2,13 @@ Mapbox welcomes participation and contributions from everyone. If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started. -## 6.1.2 +## 6.2.0-alpha.1 - May 17, 2018 + - `"to-string"` expression operator converts `null` to empty string rather than to `"null"` [#11904](https://github.com/mapbox/mapbox-gl-native/pull/11904) + - Expose MapView#setOfflineRegion [#1922](https://github.com/mapbox/mapbox-gl-native/pull/11922) + - Add nullability annotations to public API for kotlin language integration [#11925](https://github.com/mapbox/mapbox-gl-native/pull/11925) + - Expose MapView created callbacks on MapFragment and SupportMapFragment [#11934](https://github.com/mapbox/mapbox-gl-native/pull/11934) + - Update mapbox-java to 3.1.0 [#11916](https://github.com/mapbox/mapbox-gl-native/pull/11916) ## 6.1.1 - May 7, 2018 - Update telemetry to 3.1.0 [#11855](https://github.com/mapbox/mapbox-gl-native/pull/11855) diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index a49ef47674..d6bf311e0c 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.mapbox.mapboxsdk -VERSION_NAME=6.2.0-SNAPSHOT +VERSION_NAME=6.2.0-alpha.1 POM_DESCRIPTION=Mapbox GL Android SDK POM_URL=https://github.com/mapbox/mapbox-gl-native |