From 5b1ffb417a938f4e7c7d92dfbd052cf2d9b54289 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 3 Jul 2023 10:37:05 +0200 Subject: [PATCH] [Gradle] Update AGP versions for tests --- .../org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt | 3 --- .../jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt | 1 - .../kotlin/gradle/KaptIncrementalWithIsolatingApt.kt | 1 - .../kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt | 1 - .../gradle/android/ConfigurationCacheForAndroidIT.kt | 1 - .../org/jetbrains/kotlin/gradle/testbase/TestVersions.kt | 8 ++++---- .../kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt | 2 +- 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt index c8cffc8592f..91b8a573b2f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt @@ -111,7 +111,6 @@ class BuildCacheRelocationIT : KGPBaseTest() { @AndroidGradlePluginTests @DisplayName("works with Android project") - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) @GradleAndroidTest fun testRelocationAndroidProject( gradleVersion: GradleVersion, @@ -141,7 +140,6 @@ class BuildCacheRelocationIT : KGPBaseTest() { @AndroidGradlePluginTests @DisplayName("Test relocation for Android with dagger project") - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) @GradleAndroidTest fun testRelocationAndroidDagger( gradleVersion: GradleVersion, @@ -171,7 +169,6 @@ class BuildCacheRelocationIT : KGPBaseTest() { @AndroidGradlePluginTests @DisplayName("KT-48617: Kapt ignores empty directories from Android variant") - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) @GradleAndroidTest fun kaptIgnoreEmptyAndroidVariant( gradleVersion: GradleVersion, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt index 5b4e00e9705..8413b0213c6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationAvoidanceIT.kt @@ -73,7 +73,6 @@ class ConfigurationAvoidanceIT : KGPBaseTest() { @AndroidGradlePluginTests @DisplayName("Android unrelated tasks are not configured") - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) @GradleAndroidTest fun testAndroidUnrelatedTaskNotConfigured( gradleVersion: GradleVersion, 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 2a18b2231bc..44753f7834d 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 @@ -287,7 +287,6 @@ open class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() { @AndroidGradlePluginTests @DisplayName("KT-34340: origins in classpath") - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) @GradleAndroidTest @DisabledOnOs(OS.WINDOWS, disabledReason = "https://youtrack.jetbrains.com/issue/KTI-405") fun testIsolatingWithOriginsInClasspath( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt index 18c0407e3ca..71eb11293af 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt @@ -156,7 +156,6 @@ class SubpuginsIT : KGPBaseTest() { @AndroidGradlePluginTests @DisplayName("KT-39809: kapt subplugin legacy loading does not fail the build") - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) @GradleAndroidTest fun testKotlinVersionDowngradeInSupbrojectKt39809( gradleVersion: GradleVersion, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt index 07ac7cd1861..fd6178c2dcc 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ConfigurationCacheForAndroidIT.kt @@ -12,7 +12,6 @@ import org.junit.jupiter.api.DisplayName @DisplayName("Configuration cache in Android project") @AndroidGradlePluginTests -@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() { @DisplayName("works in android plus kapt project") @GradleAndroidTest 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 b30a4ce334b..109d0f32a0d 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 @@ -45,10 +45,10 @@ interface TestVersions { const val AGP_71 = "7.1.3" const val AGP_72 = "7.2.2" const val AGP_73 = "7.3.1" - const val AGP_74 = "7.4.0" + const val AGP_74 = "7.4.2" const val AGP_80 = "8.0.2" - const val AGP_81 = "8.1.0-alpha08" - const val AGP_82 = "8.2.0-alpha09" + const val AGP_81 = "8.1.0-rc01" + const val AGP_82 = "8.2.0-alpha09" // -alpha10 fails ExternalAndroidTargetIT test const val MIN_SUPPORTED = AGP_42 // KotlinAndroidPlugin.minimalSupportedAgpVersion const val MAX_SUPPORTED = AGP_80 // Update once Gradle MAX_SUPPORTED version will be bumped @@ -68,7 +68,7 @@ interface TestVersions { AGP_74(AGP.AGP_74, GradleVersion.version(Gradle.G_7_5), GradleVersion.version(Gradle.G_7_6), JavaVersion.VERSION_11), AGP_80(AGP.AGP_80, GradleVersion.version(Gradle.G_8_0), GradleVersion.version(Gradle.G_8_0), JavaVersion.VERSION_17), AGP_81(AGP.AGP_81, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_1), JavaVersion.VERSION_17), - AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_1), JavaVersion.VERSION_17), + AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_2), JavaVersion.VERSION_17), ; } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt index 8eccba1d194..f1fb52178d3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt @@ -24,7 +24,7 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) { val v7_1_0 = fromString("7.1.3") val v7_2_2 = fromString("7.2.2") val v7_3_0 = fromString("7.3.1") - val v7_4_0 = fromString("7.4.0") + val v7_4_0 = fromString("7.4.2") val testedVersions = listOf(v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_0, v7_4_0) }