From 6f78ec8a70b2a18abae0c0426f72c32cccd141f9 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Sat, 15 Nov 2014 19:37:41 +1100 Subject: [PATCH] Give Travis latest build tools --- README.md | 2 +- android/java/app/build.gradle | 2 +- android/java/lib/build.gradle | 2 +- scripts/travis_before_install.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6327fcc90..9e304447a 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Install Android SDK: sudo apt-get install lib32stdc++6 lib32z1 wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz tar -xzf ./android-sdk_r23.0.2-linux.tgz - ./android-sdk-linux/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.0,android-19,android-21,extra-android-m2repository,extra-google-m2repository + ./android-sdk-linux/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository,extra-google-m2repository export ANDROID_HOME="/dir/to/android-sdk-linux" Run: diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle index 498844399..c0acf868f 100644 --- a/android/java/app/build.gradle +++ b/android/java/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "com.mapbox.mapboxgl.app" - minSdkVersion 19 + minSdkVersion 18 targetSdkVersion 21 } diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle index 5fe9f7398..9f650bb2a 100644 --- a/android/java/lib/build.gradle +++ b/android/java/lib/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "com.mapbox.mapboxgl.lib" - minSdkVersion 19 + minSdkVersion 18 targetSdkVersion 21 ndk { diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 8370eefc8..fd7d175a7 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -49,7 +49,7 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then echo "debug: installing SDK" #mapbox_time "installing SDK" \ sudo apt-get -y install lib32stdc++6 lib32z1 - echo y | ./android-sdk/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.0,android-19,android-21,extra-android-m2repository,extra-google-m2repository + echo y | ./android-sdk/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.1,android-21,extra-android-m2repository,extra-google-m2repository elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then