summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2017-12-06 16:40:36 +0100
committerTobrun <tobrun@mapbox.com>2017-12-06 17:38:32 +0100
commit86fdb2682d95c3fe644c66c2b27b6e89ce3f6d81 (patch)
treecc9b2f3245ebf09e4898a86a3d2c1c4f28248770
parentc311e69e0ef61f5203fa6cf632d5ec73b1e181da (diff)
downloadqtlocation-mapboxgl-86fdb2682d95c3fe644c66c2b27b6e89ce3f6d81.tar.gz
[android] - build boba snapshots from master
-rw-r--r--circle.yml2
-rw-r--r--platform/android/MapboxGLAndroidSDK/gradle.properties2
-rw-r--r--platform/android/dependencies.gradle4
3 files changed, 4 insertions, 4 deletions
diff --git a/circle.yml b/circle.yml
index 36d16c68d6..6f9b3af05e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -375,7 +375,7 @@ jobs:
- deploy:
name: Publish to Maven
command: |
- if [ "${CIRCLE_BRANCH}" == "release-agua" ]; then make run-android-upload-archives ; fi
+ if [ "${CIRCLE_BRANCH}" == "master" ]; then make run-android-upload-archives ; fi
# ------------------------------------------------------------------------------
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index 7b357bb75c..f00eb1d77f 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=6.0.0-SNAPSHOT
POM_DESCRIPTION=Mapbox GL Android SDK
POM_URL=https://github.com/mapbox/mapbox-gl-native
diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index 8d4c32045c..1265aa9fb2 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -4,8 +4,8 @@ ext {
compileSdkVersion = 25
buildToolsVersion = "25.0.2"
- versionCode = 11
- versionName = "5.0.0"
+ versionCode = 12
+ versionName = "6.0.0"
mapboxServicesVersion = "2.2.8"
supportLibVersion = "25.4.0"