summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-01-26 11:49:26 +0100
committerTobrun <tobrun.van.nuland@gmail.com>2018-01-26 11:49:26 +0100
commit9c24617b9169709530de6fcf30d580c324abd888 (patch)
tree3fb24693e10810d925cd6fbc1a29ae6e549457bb
parent7418e802e4bde34d7e5c9a863cfc8f4632352f7b (diff)
downloadqtlocation-mapboxgl-upstream/release-android-v6.0.0-beta.1.tar.gz
[android] - release android v6.0.0-beta.1upstream/release-android-v6.0.0-beta.1
-rw-r--r--circle.yml2
-rw-r--r--platform/android/MapboxGLAndroidSDK/gradle.properties2
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/build.gradle2
3 files changed, 3 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml
index c7e1e519c7..f52abb7df9 100644
--- a/circle.yml
+++ b/circle.yml
@@ -414,7 +414,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.0.0-beta.1" ]; then make run-android-upload-archives ; fi
# ------------------------------------------------------------------------------
diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties
index f00eb1d77f..1045971bdf 100644
--- a/platform/android/MapboxGLAndroidSDK/gradle.properties
+++ b/platform/android/MapboxGLAndroidSDK/gradle.properties
@@ -1,5 +1,5 @@
GROUP=com.mapbox.mapboxsdk
-VERSION_NAME=6.0.0-SNAPSHOT
+VERSION_NAME=6.0.0-beta.1
POM_DESCRIPTION=Mapbox GL Android SDK
POM_URL=https://github.com/mapbox/mapbox-gl-native
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index 3723ae2acf..3740341e94 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -8,7 +8,7 @@ android {
applicationId "com.mapbox.mapboxsdk.testapp"
minSdkVersion androidVersions.minSdkVersion
targetSdkVersion androidVersions.targetSdkVersion
- versionCode 12
+ versionCode 13
versionName "6.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}