From 070bbd51dec04ef37bf8b24b29434d04afb3204e Mon Sep 17 00:00:00 2001 From: quickavin Date: Fri, 18 Nov 2016 05:33:36 +0530 Subject: [PATCH 1/4] Updated buildtools to the current latest 25.0.0 --- collect_app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collect_app/build.gradle b/collect_app/build.gradle index 997c1938492..82edd389735 100644 --- a/collect_app/build.gradle +++ b/collect_app/build.gradle @@ -8,7 +8,7 @@ com.android.ddmlib.DdmPreferences.setTimeOut(60000) android { compileSdkVersion(22) - buildToolsVersion("23.0.3") + buildToolsVersion("25.0.0") defaultConfig { applicationId("org.odk.collect.android") From a6109e13ab03b5bde905a7c493380899e66f06e4 Mon Sep 17 00:00:00 2001 From: quickavin Date: Fri, 18 Nov 2016 13:00:25 +0530 Subject: [PATCH 2/4] Updated circle.yml to include build-tools 25.0.0 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 7dce680f10f..6171d69b2eb 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,7 @@ machine: dependencies: override: - - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-22.0.0,build-tools-23.0.2,android-21,android-22,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-22.0.0,build-tools-25.0.0,android-21,android-22,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies test: From 51eaf1de6982614cbc4d3a6b86f50cf015ca4c74 Mon Sep 17 00:00:00 2001 From: quickavin Date: Fri, 18 Nov 2016 20:26:16 +0530 Subject: [PATCH 3/4] Removed build-tools-22.0.0 --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 6171d69b2eb..9b7f6f55a49 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,7 @@ machine: dependencies: override: - - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-22.0.0,build-tools-25.0.0,android-21,android-22,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-25.0.0,android-21,android-22,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies test: From ea1af5f3f3d784fdffd47c2b572d2560bfc0858e Mon Sep 17 00:00:00 2001 From: quickavin Date: Fri, 18 Nov 2016 20:33:33 +0530 Subject: [PATCH 4/4] Removed android-19 and android-23 leaving only android-22 in the circle.yml file. --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 9b7f6f55a49..e49e227d66b 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,7 @@ machine: dependencies: override: - - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-25.0.0,android-21,android-22,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-25.0.0,android-22,extra-google-m2repository,extra-google-google_play_services,extra-android-support - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies test: