diff --git a/compiler/android-tests/android-module/build.gradle b/compiler/android-tests/android-module/build.gradle index 81d244ad1c1..91bbd497f93 100644 --- a/compiler/android-tests/android-module/build.gradle +++ b/compiler/android-tests/android-module/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:4.1.1' } } apply plugin: 'com.android.application' @@ -17,7 +17,7 @@ repositories { android { compileSdkVersion 26 - buildToolsVersion "28.0.3" + buildToolsVersion "29.0.3" defaultConfig { applicationId "org.jetbrains.kotlin.android.tests" diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt index d11d15d3c30..28c8dd9799a 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt @@ -321,8 +321,8 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager CodegenTestCase.createTestFilesFromFile(file, expectedText, false, TargetBackend.JVM) companion object { - const val GRADLE_VERSION = "5.6.4" // update GRADLE_SHA_256 on change - const val GRADLE_SHA_256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d" + const val GRADLE_VERSION = "6.8.1" // update GRADLE_SHA_256 on change + const val GRADLE_SHA_256 = "fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd" const val testClassPackage = "org.jetbrains.kotlin.android.tests" const val testClassName = "CodegenTestCaseOnAndroid" const val baseTestClassPackage = "org.jetbrains.kotlin.android.tests" diff --git a/dependencies/android-sdk/build.gradle.kts b/dependencies/android-sdk/build.gradle.kts index ae84734bb74..9503c4bc95e 100644 --- a/dependencies/android-sdk/build.gradle.kts +++ b/dependencies/android-sdk/build.gradle.kts @@ -119,6 +119,7 @@ unzipSdkTask("android_m2repository", "r44", "extras/android", "") unzipSdkTask("platform-tools", "r28.0.1", "", toolsOsDarwin) unzipSdkTask("sdk-tools-$toolsOsDarwin", "4333796"/*26.1.1*/, "", "") unzipSdkTask("build-tools", "r28.0.3", "build-tools/28.0.3", toolsOs, buildTools, 1) +unzipSdkTask("build-tools", "r29.0.3", "build-tools/29.0.3", toolsOs, buildTools, 1) unzipSdkTask("emulator-$toolsOsDarwin", "5264690", "", "", prepareTask = prepareEmulator) unzipSdkTask("armeabi-v7a", "19", "system-images/android-19/default","r05", prepareTask = prepareEmulator) if (!kotlinBuildProperties.isTeamcityBuild) {