From c96c50a73cb8637c28e454899ec0b97a4b89af6f Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 23 Feb 2021 17:11:58 +0100 Subject: [PATCH] Update AGP tests. Bump AGP version in some tests and ignore AGP 3.4 tests on Gradle 7. AGP 3.4 is not compatible with Gradle 7. ^KT-44949 In Progress --- .../kotlin/gradle/AbstractKotlinAndroidGradleTests.kt | 4 ++++ .../test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt | 4 ++++ .../kotlin/gradle/KaptIncrementalWithIsolatingApt.kt | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index fc2916ac6ba..fc5bd0ef765 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -455,6 +455,10 @@ open class KotlinAndroid34GradleIT : KotlinAndroid3GradleIT() { override val androidGradlePluginVersion: AGPVersion get() = AGPVersion.v3_4_1 + // AGP 3.4.1 is not working with Gradle 7+ + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.Until("6.8.4") + @Test fun testKaptUsingApOptionProvidersAsNestedInputOutput() = with(Project("AndroidProject")) { setupWorkingDir() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt index 639ecf0d5b1..4bdedd6b7dc 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt @@ -18,6 +18,10 @@ open class Kapt3Android34IT : Kapt3AndroidIT() { override val androidGradlePluginVersion: AGPVersion get() = AGPVersion.v3_4_1 + // AGP 3.4 is not working with Gradle 7+ + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.Until("6.8.4") + @Test fun testAndroidxNavigationSafeArgs() = with(Project("androidx-navigation-safe-args", directoryPrefix = "kapt2")) { // KT-30735 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt index 95df7fac4fd..c2122b2a1bb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt @@ -261,7 +261,7 @@ class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() { val project = Project("kaptIncrementalWithParceler", GradleVersionRequired.None).apply { setupWorkingDir() } - val options = defaultBuildOptions().copy(androidGradlePluginVersion = AGPVersion.v3_4_1) + val options = defaultBuildOptions().copy(androidGradlePluginVersion = AGPVersion.v3_6_0) project.build("clean", ":mylibrary:assembleDebug", options = options) { assertSuccessful() }