summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-01-10 14:07:47 +0100
committerTobrun <tobrun.van.nuland@gmail.com>2018-01-10 14:07:47 +0100
commit947592ecef11816527b9623eaec225e76c067b8c (patch)
tree217b1dd5c9c4fd07f3a31b23b48c6ec25bd64305
parent24bcb758232c189c2a98c5c44f963e579fa0743c (diff)
downloadqtlocation-mapboxgl-upstream/release-android-v5.3.1-cn.1.tar.gz
[android] - release v5.3.1-cn.1upstream/release-android-v5.3.1-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..d3f79cd429 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.1-cn.1" ]; then make run-android-upload-archives ; fi
# ------------------------------------------------------------------------------
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index f1257f346e..cbe3f495c1 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=v5.3.1-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>