From 1d9129f6883c0f90e80d536d7fffc1682b085872 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Fri, 16 Feb 2024 18:25:47 +0100 Subject: [PATCH] [Gradle] Bump max Gradle version in tests to 8.6 ^KT-64378 Verification Pending --- .../build.gradle.kts | 2 +- .../jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt | 2 ++ .../kotlin/gradle/testbase/TestVersions.kt | 13 ++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index b1b7c8ddda4..bed930da880 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -224,7 +224,7 @@ fun Test.includeTestsWithPattern(include: Boolean, patterns: (MutableSet } fun Test.advanceGradleVersion() { - val gradleVersionForTests = "8.5" + val gradleVersionForTests = "8.6" systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests) } 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 6ebf1511ada..53558a6a2c4 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 @@ -217,6 +217,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() { TestVersions.Gradle.G_8_2, TestVersions.Gradle.G_8_3, TestVersions.Gradle.G_8_4, + TestVersions.Gradle.G_8_5, ], ) @GradleTest @@ -224,6 +225,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() { project("kotlinProject", gradleVersion) { build("help") { val expectedVariant = when (gradleVersion) { + GradleVersion.version(TestVersions.Gradle.G_8_6) -> "gradle85" GradleVersion.version(TestVersions.Gradle.G_8_5) -> "gradle85" GradleVersion.version(TestVersions.Gradle.G_8_4) -> "gradle82" GradleVersion.version(TestVersions.Gradle.G_8_3) -> "gradle82" 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 8123210ea86..ccf6747ff83 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 @@ -29,11 +29,10 @@ interface TestVersions { const val G_8_3 = "8.3" const val G_8_4 = "8.4" const val G_8_5 = "8.5" - const val G_8_6 = "8.6-rc-2" - + const val G_8_6 = "8.6" + const val MIN_SUPPORTED = minSupportedGradleVersion - const val MIN_SUPPORTED_KPM = G_7_0 - const val MAX_SUPPORTED = G_8_5 + const val MAX_SUPPORTED = G_8_6 } object Kotlin { @@ -63,7 +62,7 @@ interface TestVersions { val version: String, val minSupportedGradleVersion: GradleVersion, val maxSupportedGradleVersion: GradleVersion, - val requiredJdkVersion: JavaVersion + val requiredJdkVersion: JavaVersion, ) { AGP_71(AGP.AGP_71, GradleVersion.version(Gradle.G_7_2), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11), AGP_72(AGP.AGP_72, GradleVersion.version(Gradle.G_7_3), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11), @@ -72,8 +71,8 @@ interface TestVersions { 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_4), JavaVersion.VERSION_17), AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_2), GradleVersion.version(Gradle.G_8_4), JavaVersion.VERSION_17), - AGP_83(AGP.AGP_83, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_5), JavaVersion.VERSION_17), - AGP_84(AGP.AGP_84, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_5), JavaVersion.VERSION_17), + AGP_83(AGP.AGP_83, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_6), JavaVersion.VERSION_17), + AGP_84(AGP.AGP_84, GradleVersion.version(Gradle.G_8_4), GradleVersion.version(Gradle.G_8_6), JavaVersion.VERSION_17), ; }