From da7ceb162b8f880e959833e1a60399eb1a56e18f Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 10 Dec 2023 10:46:16 +0100 Subject: [PATCH] [Gradle] Cleanup max Gradle versions in the tests As we are running now by default with Gradle 8.2 release our IT tests - specifying this version explicitly does not make sense. --- .../org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt | 2 -- .../kotlin/gradle/android/ExternalAndroidTargetIT.kt | 1 - .../org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt | 7 +------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt index b90bcdfb238..26b5de963e5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt @@ -205,7 +205,6 @@ class SimpleKotlinGradleIT : KGPBaseTest() { @DisplayName("Proper Gradle plugin variant is used") @GradleTestVersions( - maxVersion = TestVersions.Gradle.G_8_2, additionalVersions = [ TestVersions.Gradle.G_7_0, TestVersions.Gradle.G_7_1, @@ -215,7 +214,6 @@ class SimpleKotlinGradleIT : KGPBaseTest() { TestVersions.Gradle.G_7_6, TestVersions.Gradle.G_8_0, TestVersions.Gradle.G_8_1, - TestVersions.Gradle.G_8_2, ], ) @GradleTest diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt index 153d1da6230..c7269733ffb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt @@ -19,7 +19,6 @@ import java.nio.file.Path import kotlin.io.path.readText import kotlin.test.fail -@GradleTestVersions(minVersion = TestVersions.Gradle.G_8_2) @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_82) @AndroidGradlePluginTests class ExternalAndroidTargetIT : KGPBaseTest() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt index 122de3349cb..9a077fc212b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt @@ -21,11 +21,6 @@ import kotlin.test.assertIs @MppGradlePluginTests @DisplayName("Tests for multiplatform with composite builds") -/* - Testing with maxVersion 8.2, because of significant branching introduced in KT-58157 - We can remove this, once MAX_SUPPORTED is higher or equal to 8.2 - */ -@GradleTestVersions(maxVersion = TestVersions.Gradle.G_8_2) class MppCompositeBuildIT : KGPBaseTest() { @GradleTest fun `test - sample0 - ide dependencies`(gradleVersion: GradleVersion) { @@ -437,7 +432,7 @@ class MppCompositeBuildIT : KGPBaseTest() { } @GradleTest - @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0, maxVersion = TestVersions.Gradle.G_8_2) + @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) fun `test sample7`(gradleVersion: GradleVersion) { val producer = project("mpp-composite-build/sample7-KT-59863-pluginManagement.includeBuild/producerBuild", gradleVersion) project(