Skip to content

Commit 6e721c4

Browse files
h0tk3yAlexeyTsvetkov
authored andcommitted
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
1 parent 227a1d5 commit 6e721c4

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

download_android_sdk.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
<download_android_platform android.versioncode="23_r01" android.sdk.version="23" android.full.version="6.0" />
3737
<download_android_platform_new android.versioncode="25_r01" android.sdk.version="25" android.full.version="7.1.1" />
3838

39+
<download_support_repository android.repo.version="44" android.repo.last="25.2.0"/>
40+
3941
<download_platform_tools android.platform.tools.version="25.0.3" />
4042
<download_tools android.tools.version="24.3.4" />
4143
<download_build_tools android.build.tools.version="23.0.1" android.build.tools.full.version="6.0" />

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99

1010
android {
1111
compileSdkVersion 22
12-
buildToolsVersion "21.1.2"
12+
buildToolsVersion "23.0.1"
1313

1414
sourceSets {
1515
main.java.srcDirs += 'src/main/java2'

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010

1111
android {
1212
compileSdkVersion 22
13-
buildToolsVersion "21.1.2"
13+
buildToolsVersion "23.0.1"
1414

1515
defaultConfig {
1616
minSdkVersion 7

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
33

44
android {
55
compileSdkVersion 22
6-
buildToolsVersion "21.1.2"
6+
buildToolsVersion "23.0.1"
77

88
sourceSets {
99
main.kotlin.srcDirs += 'root/kotlin'

0 commit comments

Comments
 (0)