diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-12-20 10:21:13 +0100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2017-12-20 10:21:13 +0100 |
| commit | 09f6a023261ecc6ba6ffc84b0ed3cec73c20ee65 (patch) | |
| tree | 15ceb2cd91216a911360ca4cff333879355c3900 | |
| parent | c70103033eece8d4c6497342c73b93294267b604 (diff) | |
| download | qtlocation-mapboxgl-upstream/release-android-v5.3.0-cn.1.tar.gz | |
[android] - release 5.3.0-cn.1upstream/release-android-v5.3.0-cn.1
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | platform/android/CHANGELOG.md | 3 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/gradle.properties | 2 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml | 5 |
4 files changed, 10 insertions, 2 deletions
diff --git a/circle.yml b/circle.yml index d76ab4a8ab..5dd1ce5cfb 100644 --- a/circle.yml +++ b/circle.yml @@ -355,7 +355,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.3.0-cn.1" ]; then make run-android-upload-archives ; fi # ------------------------------------------------------------------------------ diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index c22072e1a0..dfff6044e9 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -2,6 +2,9 @@ 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. +## 5.3.0-cn.1 - December 20, 2017 + - Enable CN endpoint [#10758](https://github.com/mapbox/mapbox-gl-native/pull/10758) + ## 5.3.0 - December 20, 2017 - Add support for TinySDF [#10706](https://github.com/mapbox/mapbox-gl-native/pull/10706) - Save restore MyLocationViewSettings [#10746](https://github.com/mapbox/mapbox-gl-native/pull/10746) diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index f1257f346e..bdbe40b0b7 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.mapbox.mapboxsdk -VERSION_NAME=5.3.0-SNAPSHOT +VERSION_NAME=5.3.0-cn.1 POM_DESCRIPTION=Mapbox GL Android SDK POM_URL=https://github.com/mapbox/mapbox-gl-native diff --git a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml index f59585bfe5..84bd5ec396 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml @@ -17,4 +17,9 @@ <service android:name="com.mapbox.services.android.telemetry.service.TelemetryService"/> </application> + <!-- Enable the CN endpoint --> + <meta-data + android:name="com.mapbox.CnEventsServer" + android:value="true"/> + </manifest> |