Update to latest API 22 build tools

4 files changed, 16 insertions, 16 deletions

diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle
index 192bc2bd7a..901aa6d9d7 100644
--- a/android/java/MapboxGLAndroidSDK/build.gradle
+++ b/android/java/MapboxGLAndroidSDK/build.gradle
@@ -3,8 +3,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.1'
+        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
     }
 }
 
@@ -29,8 +29,8 @@ repositories {
 
 dependencies {
     compile 'commons-validator:commons-validator:1.4.1'
-    compile 'com.android.support:support-annotations:21.0.3'
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:support-annotations:22.0.0'
+    compile 'com.android.support:support-v4:22.0.0'
     compile 'com.squareup.okhttp:okhttp:2.2.0'
 }
 
diff --git a/android/java/MapboxGLAndroidSDK/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties
index ed8f9fb5ad..79e2dadca7 100644
--- a/android/java/MapboxGLAndroidSDK/gradle.properties
+++ b/android/java/MapboxGLAndroidSDK/gradle.properties
@@ -13,9 +13,9 @@ POM_DEVELOPER_ID=mapbox
 POM_DEVELOPER_NAME=Mapbox
 
 ANDROID_MIN_SDK=8
-ANDROID_BUILD_TARGET_SDK_VERSION=21
-ANDROID_BUILD_TOOLS_VERSION=21.1.2
-ANDROID_BUILD_SDK_VERSION=21
+ANDROID_BUILD_TARGET_SDK_VERSION=22
+ANDROID_BUILD_TOOLS_VERSION=22.0.0
+ANDROID_BUILD_SDK_VERSION=22
 
 POM_NAME=Mapbox GL Android SDK
 POM_ARTIFACT_ID=mapbox-gl-android-sdk
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
index 1aac498870..7cdd4fc916 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -3,8 +3,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.1'
+        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
     }
 }
 
@@ -30,8 +30,8 @@ gradle.projectsEvaluated {
 }
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.0"
 
     repositories {
         mavenCentral()
@@ -40,7 +40,7 @@ android {
     defaultConfig {
         applicationId "com.mapbox.mapboxgl.testapp"
         minSdkVersion 8
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 4
         versionName "0.1.3"
     }
@@ -74,9 +74,9 @@ dependencies {
     compile(project(':MapboxGLAndroidSDK')) {
         transitive = true
     }
-    compile 'com.android.support:support-annotations:21.0.0'
-    compile 'com.android.support:support-v4:21.0.3'
-    compile 'com.android.support:appcompat-v7:21.0.3'
+    compile 'com.android.support:support-annotations:22.0.0'
+    compile 'com.android.support:support-v4:22.0.0'
+    compile 'com.android.support:appcompat-v7:22.0.0'
     compile 'com.mapzen.android:lost:1.0.0'
 }
 
diff --git a/android/scripts/run-build.sh b/android/scripts/run-build.sh
index 43d58622e9..9fa15a02bf 100755
--- a/android/scripts/run-build.sh
+++ b/android/scripts/run-build.sh
@@ -6,7 +6,7 @@ set -o pipefail
 cwd=$(pwd)
 
 region="us-east-1"
-region_ami="ami-f0ed9098"
+region_ami="ami-022e0c6a"
 sleep=10
 instance_name="android-gl-build-$TRAVIS_REPO_SLUG-$TRAVIS_JOB_NUMBER"
 echo $ami_name