From dca59b087650c8dd45b86a83b70cca4f6d440ac4 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 13 Jun 2022 17:11:16 +0200 Subject: [PATCH] Drop AGP_34 version usage ^KT-45747 Fixed --- .../jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt | 2 +- .../kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt | 2 +- .../kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt index 97d1d865ff9..9b9b7624c5c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt @@ -18,7 +18,7 @@ import kotlin.test.assertTrue @OtherGradlePluginTests class KotlinAndroidExtensionIT : KGPBaseTest() { override val defaultBuildOptions = super.defaultBuildOptions.copy( - androidVersion = TestVersions.AGP.AGP_34.version, + androidVersion = TestVersions.AGP.AGP_36.version, warningMode = WarningMode.Summary ) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt index a8e427edd43..2b0341988fd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt @@ -18,7 +18,7 @@ import kotlin.test.assertTrue @OtherGradlePluginTests class KotlinProjectIT : KGPBaseTest() { override val defaultBuildOptions = super.defaultBuildOptions.copy( - androidVersion = TestVersions.AGP.AGP_34.version, + androidVersion = TestVersions.AGP.AGP_36.version, ) @DisplayName("Valid model is available in Kotlin only project") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt index bd036a7438b..76f5beb34e1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt @@ -37,7 +37,6 @@ interface TestVersions { val maxSupportedGradleVersion: GradleVersion, val requiredJdkVersion: JavaVersion ) { - AGP_34("3.4.0", GradleVersion.version(Gradle.MIN_SUPPORTED), GradleVersion.version(Gradle.G_6_9), JavaVersion.VERSION_1_8), AGP_36("3.6.4", GradleVersion.version(Gradle.MIN_SUPPORTED), GradleVersion.version(Gradle.G_6_9), JavaVersion.VERSION_1_8), AGP_40("4.0.2", GradleVersion.version(Gradle.MIN_SUPPORTED), GradleVersion.version(Gradle.G_6_9), JavaVersion.VERSION_1_8), AGP_41("4.1.3", GradleVersion.version(Gradle.MIN_SUPPORTED), GradleVersion.version(Gradle.G_6_9), JavaVersion.VERSION_1_8),