From f4fbc2edc602a2ca45101fbf6d67f9ccaecda091 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 3 Jul 2023 10:31:43 +0200
Subject: [PATCH] [Gradle] Update Gradle versions for tests

Added Gradle 8.2 release
---
 .../org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt  | 1 -
 .../org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt    | 3 ---
 .../org/jetbrains/kotlin/gradle/testbase/TestVersions.kt   | 7 ++++---
 3 files changed, 4 insertions(+), 7 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 94bfdcb2a98..c8cffc8592f 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
@@ -171,7 +171,6 @@ class BuildCacheRelocationIT : KGPBaseTest() {
 
     @AndroidGradlePluginTests
     @DisplayName("KT-48617: Kapt ignores empty directories from Android variant")
-    @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
     @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
     @GradleAndroidTest
     fun kaptIgnoreEmptyAndroidVariant(
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
index ccdf1ada684..0b5a324ab30 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
@@ -129,10 +129,8 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
         }
     }
 
-    // Set min Gradle version to 6.8 because of using DependencyResolutionManagement API to add repositories.
     @JvmGradlePluginTests
     @DisplayName("with instance execution")
-    @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
     @GradleTest
     fun testInstantExecution(gradleVersion: GradleVersion) {
         project("instantExecution", gradleVersion) {
@@ -157,7 +155,6 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 
     @JvmGradlePluginTests
     @DisplayName("instant execution works with included build plugin")
-    @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
     @GradleTest
     fun testInstantExecutionWithIncludedBuildPlugin(gradleVersion: GradleVersion) {
         project("instantExecutionWithIncludedBuildPlugin", gradleVersion) {
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 0c6b86b3f76..b30a4ce334b 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
@@ -15,16 +15,17 @@ interface TestVersions {
     // Gradle nightly releases retention policy is 3 months
     object Gradle {
         const val G_6_8 = "6.8.3"
-        const val G_6_9 = "6.9.2"
+        const val G_6_9 = "6.9.4"
         const val G_7_0 = "7.0.2"
         const val G_7_1 = "7.1.1"
         const val G_7_2 = "7.2"
         const val G_7_3 = "7.3.3"
         const val G_7_4 = "7.4.2"
         const val G_7_5 = "7.5.1"
-        const val G_7_6 = "7.6"
+        const val G_7_6 = "7.6.2"
         const val G_8_0 = "8.0.2"
-        const val G_8_1 = "8.1"
+        const val G_8_1 = "8.1.1"
+        const val G_8_2 = "8.2"
         const val MIN_SUPPORTED = minSupportedGradleVersion
         const val MIN_SUPPORTED_KPM = G_7_0
         const val MAX_SUPPORTED = G_8_0