summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-11-03 09:51:16 -0600
committerBrad Leege <bleege@gmail.com>2015-11-03 09:51:16 -0600
commitfb9df7674ce0b3ee4751d861aea4e2a9860ca3bc (patch)
tree529ab76fd517e7db1325dce49aaee64303414353
parentd0e96c5303748c2e81099adb4844355109969ad7 (diff)
downloadqtlocation-mapboxgl-fb9df7674ce0b3ee4751d861aea4e2a9860ca3bc.tar.gz
[android] #2891 - Going back to Android Build Tools 23.0.1
-rw-r--r--.travis.yml8
-rw-r--r--android/MapboxGLAndroidSDK/gradle.properties2
-rw-r--r--android/MapboxGLAndroidSDKTestApp/build.gradle2
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index a93dd0f6eb..11dc458204 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,28 +60,28 @@ matrix:
- os: linux
env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release
android:
- components: [ 'tools', 'platform-tools', 'build-tools-23.0.2', 'android-23', 'extra-android-m2repository', 'extra-android-support', 'extra-google-m2repository' ]
+ components: [ 'tools', 'platform-tools', 'build-tools-23.0.1', 'android-23', 'extra-android-m2repository', 'extra-android-support', 'extra-google-m2repository' ]
addons:
apt:
packages: [ 'lib32stdc++6' ]
- os: linux
env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Debug
android:
- components: [ 'tools', 'platform-tools', 'build-tools-23.0.2', 'android-23', 'extra-android-m2repository', 'extra-android-support', 'extra-google-m2repository' ]
+ components: [ 'tools', 'platform-tools', 'build-tools-23.0.1', 'android-23', 'extra-android-m2repository', 'extra-android-support', 'extra-google-m2repository' ]
addons:
apt:
packages: [ 'lib32stdc++6' ]
- os: linux
env: FLAVOR=android ANDROID_ABI=arm-v8 BUILDTYPE=Release
android:
- components: [ 'tools', 'platform-tools', 'build-tools-23.0.2', 'android-23', 'extra-android-m2repository', 'extra-android-support', 'extra-google-m2repository' ]
+ components: [ 'tools', 'platform-tools', 'build-tools-23.0.1', 'android-23', 'extra-android-m2repository', 'extra-android-support', 'extra-google-m2repository' ]
addons:
apt:
packages: [ 'lib32stdc++6' ]
- os: linux
env: FLAVOR=android ANDROID_ABI=x86 BUILDTYPE=Release
android:
- components: [ 'tools', 'platform-tools', 'build-tools-23.0.2', 'android-23', 'extra-android-m2repository', 'extra-android-support', 'extra-google-m2repository' ]
+ components: [ 'tools', 'platform-tools', 'build-tools-23.0.1', 'android-23', 'extra-android-m2repository', 'extra-android-support', 'extra-google-m2repository' ]
addons:
apt:
packages: [ 'lib32stdc++6' ]
diff --git a/android/MapboxGLAndroidSDK/gradle.properties b/android/MapboxGLAndroidSDK/gradle.properties
index 68ca0f4c2a..d1deec82e3 100644
--- a/android/MapboxGLAndroidSDK/gradle.properties
+++ b/android/MapboxGLAndroidSDK/gradle.properties
@@ -14,7 +14,7 @@ POM_DEVELOPER_NAME=Mapbox
ANDROID_MIN_SDK=15
ANDROID_BUILD_TARGET_SDK_VERSION=23
-ANDROID_BUILD_TOOLS_VERSION=23.0.2
+ANDROID_BUILD_TOOLS_VERSION=23.0.1
ANDROID_BUILD_SDK_VERSION=23
POM_NAME=Mapbox GL Android SDK
diff --git a/android/MapboxGLAndroidSDKTestApp/build.gradle b/android/MapboxGLAndroidSDKTestApp/build.gradle
index fbfc00376f..cde0cd4fc3 100644
--- a/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -34,7 +34,7 @@ gradle.projectsEvaluated {
android {
compileSdkVersion 23
- buildToolsVersion "23.0.2"
+ buildToolsVersion "23.0.1"
defaultConfig {
applicationId "com.mapbox.mapboxgl.testapp"