From 14ac7e5cbfb8f7461774b330b65e38f49e34b290 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Fri, 19 May 2017 07:50:30 +0200
Subject: [PATCH 1/2] [android] - bump tools and support lib version for
 SNAPSHOT dependencies

---
 platform/android/MapboxGLAndroidSDK/build.gradle | 4 +---
 platform/android/dependencies.gradle             | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index fca36237c3c..5e19e94f5de 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -6,9 +6,7 @@ dependencies {
     compile rootProject.ext.dep.supportDesign
     compile rootProject.ext.dep.timber
     compile rootProject.ext.dep.okhttp3
-    compile(rootProject.ext.dep.lost) {
-        exclude module: 'support-compat'
-    }
+    compile rootProject.ext.dep.lost
 
     // Mapbox Android Services (GeoJSON support)
     compile(rootProject.ext.dep.mapboxJavaGeoJSON) {
diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index bbf1fb075d7..982f87eae7b 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -2,13 +2,13 @@ ext {
     minSdkVersion = 15
     targetSdkVersion = 25
     compileSdkVersion = 25
-    buildToolsVersion = "25.0.2"
+    buildToolsVersion = "25.0.3"
 
     versionCode = 11
     versionName = "5.0.0"
 
     mapboxServicesVersion = "2.2.0-SNAPSHOT"
-    supportLibVersion = "25.1.0"
+    supportLibVersion = "25.3.1"
     wearableVersion = '2.0.0'
     espressoVersion = '2.2.2'
     testRunnerVersion = '0.5'

From 63372cd44a759ab25ec0924323f02a06db10e905 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Fri, 19 May 2017 07:57:45 +0200
Subject: [PATCH 2/2] revert unsupported Circle CI build tools version

---
 platform/android/dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index 982f87eae7b..eb717ba6004 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -2,7 +2,7 @@ ext {
     minSdkVersion = 15
     targetSdkVersion = 25
     compileSdkVersion = 25
-    buildToolsVersion = "25.0.3"
+    buildToolsVersion = "25.0.2"
 
     versionCode = 11
     versionName = "5.0.0"