summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-01-23 12:50:07 +0100
committerTobrun <tobrun.van.nuland@gmail.com>2018-01-23 12:50:07 +0100
commitbc0d61d7d52231f0fc0060521d100bc7543a6643 (patch)
treec8e70535f3e1f473aeee19439d3d16f8b8d248f8
parent80789ab2c8a8538afc63141619158bdd3a332003 (diff)
downloadqtlocation-mapboxgl-upstream/release-android-v5.3.2-cn.1.tar.gz
[android] - release cn version of 5.3.2upstream/release-android-v5.3.2-cn.1
-rw-r--r--circle.yml2
-rw-r--r--platform/android/MapboxGLAndroidSDK/gradle.properties2
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml5
3 files changed, 7 insertions, 2 deletions
diff --git a/circle.yml b/circle.yml
index d76ab4a8ab..d76201e4f3 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.2-cn.1" ]; then make run-android-upload-archives ; fi
# ------------------------------------------------------------------------------
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index b4faba88cc..d762bc9b29 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.2-SNAPSHOT
+VERSION_NAME=5.3.2-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..82d8aa9fea 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>