From 6e721c4ceedf73e8486d900f4fe10ffc14cc605b Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Tue, 7 Mar 2017 21:59:30 +0300
Subject: [PATCH] Further fixes for Android tests on TeamCity

Added support repository to download_android_sdk.xml
Changed the build tools version in testProject to 23.0.1

(trial) Remove platform 22
---
 download_android_sdk.xml                                        | 2 ++
 .../resources/testProject/AndroidProject/Android/build.gradle   | 2 +-
 .../test/resources/testProject/AndroidProject/Lib/build.gradle  | 2 +-
 .../test/resources/testProject/AndroidProject/Test/build.gradle | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/download_android_sdk.xml b/download_android_sdk.xml
index bd9ed93626e..08fd93a74ed 100644
--- a/download_android_sdk.xml
+++ b/download_android_sdk.xml
@@ -36,6 +36,8 @@
         <download_android_platform android.versioncode="23_r01" android.sdk.version="23" android.full.version="6.0" />
         <download_android_platform_new android.versioncode="25_r01" android.sdk.version="25" android.full.version="7.1.1" />
 
+        <download_support_repository android.repo.version="44" android.repo.last="25.2.0"/>
+
         <download_platform_tools android.platform.tools.version="25.0.3" />
         <download_tools android.tools.version="24.3.4" />
         <download_build_tools android.build.tools.version="23.0.1" android.build.tools.full.version="6.0" />
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle
index 977cc33c3f8..37d0068055e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    buildToolsVersion "23.0.1"
 
     sourceSets {
         main.java.srcDirs += 'src/main/java2'
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle
index 9681aaded71..c86803f9617 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle
index bc16e72497b..376f4457b82 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    buildToolsVersion "23.0.1"
 
     sourceSets {
         main.kotlin.srcDirs += 'root/kotlin'