From 0258e71bd5abc74fcecb6ebf9beac0718bd3b0f4 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Fri, 19 Jan 2024 20:09:11 +0100
Subject: [PATCH] [Gradle] Set max Gradle version in tests to 8.4

^KT-62639 Verification Pending
---
 .../build.gradle.kts                                      | 2 +-
 .../kotlin/gradle/MacosCapableConfigurationCacheIT.kt     | 1 -
 .../org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt   | 2 ++
 .../jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt    | 8 +++++++-
 .../org/jetbrains/kotlin/gradle/testbase/TestVersions.kt  | 2 +-
 5 files changed, 11 insertions(+), 4 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 d17e9d7860c..f0403463ecc 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -218,7 +218,7 @@ fun Test.includeTestsWithPattern(include: Boolean, patterns: (MutableSet<String>
 }
 
 fun Test.advanceGradleVersion() {
-    val gradleVersionForTests = "8.3"
+    val gradleVersionForTests = "8.4"
     systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MacosCapableConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MacosCapableConfigurationCacheIT.kt
index 52897575a2c..e6db5789f51 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MacosCapableConfigurationCacheIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MacosCapableConfigurationCacheIT.kt
@@ -21,7 +21,6 @@ class MacosCapableConfigurationCacheIT : AbstractConfigurationCacheIT() {
     @DisplayName("works with native tasks in complex project")
     @GradleTestVersions(
         minVersion = TestVersions.Gradle.G_7_4,
-        maxVersion = TestVersions.Gradle.G_8_4,
     )
     @GradleTest
     fun testNativeTasks(gradleVersion: GradleVersion) {
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 8e8161c1c1e..abd6f8da0a7 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
@@ -215,6 +215,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
             TestVersions.Gradle.G_8_0,
             TestVersions.Gradle.G_8_1,
             TestVersions.Gradle.G_8_2,
+            TestVersions.Gradle.G_8_3
         ],
     )
     @GradleTest
@@ -222,6 +223,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
         project("kotlinProject", gradleVersion) {
             build("help") {
                 val expectedVariant = when (gradleVersion) {
+                    GradleVersion.version(TestVersions.Gradle.G_8_4) -> "gradle82"
                     GradleVersion.version(TestVersions.Gradle.G_8_3) -> "gradle82"
                     GradleVersion.version(TestVersions.Gradle.G_8_2) -> "gradle82"
                     GradleVersion.version(TestVersions.Gradle.G_8_1) -> "gradle81"
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 ad0c6fb18f2..2c2e6e4df33 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
@@ -193,7 +193,13 @@ class MppCompositeBuildIT : KGPBaseTest() {
 
     @GradleTest
     fun `test - sample1 - assemble and execute - included build using older version of Kotlin`(gradleVersion: GradleVersion) {
-        project("mpp-composite-build/sample1", gradleVersion) {
+        project(
+            "mpp-composite-build/sample1",
+            gradleVersion,
+            buildOptions = defaultBuildOptions.suppressDeprecationWarningsOn(
+                reason = "KGP 1.7.21 produces deprecation warnings with Gradle 8.4"
+            ) { gradleVersion >= GradleVersion.version(TestVersions.Gradle.G_8_4) }
+        ) {
             projectPath.resolve("included-build").addDefaultBuildFiles()
             buildGradleKts.replaceText("<kgp_version>", KOTLIN_VERSION)
             projectPath.resolve("included-build/build.gradle.kts").replaceText("<kgp_version>", "1.7.21")
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 e333497fae2..e848e3c2591 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
@@ -33,7 +33,7 @@ interface TestVersions {
         
         const val MIN_SUPPORTED = minSupportedGradleVersion
         const val MIN_SUPPORTED_KPM = G_7_0
-        const val MAX_SUPPORTED = G_8_3
+        const val MAX_SUPPORTED = G_8_4
     }
 
     object Kotlin {