From 641b5d5fa7961da066b94c2ba30079b0e1ec6651 Mon Sep 17 00:00:00 2001
From: Pavel Kargashinsky <pavel.kargashinsky@jetbrains.com>
Date: Fri, 31 Mar 2023 16:24:15 +0200
Subject: [PATCH] [Gradle][Tests][MPP] Revert inheritance from MPPBaseTest in
 AbstractConfigurationCacheIT

---
 .../kotlin/gradle/ConfigurationCacheIT.kt     | 43 ++++---------------
 1 file changed, 8 insertions(+), 35 deletions(-)

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 9c2a6804baa..836999441b3 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
@@ -61,11 +61,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 
     @MppGradlePluginTests
     @DisplayName("works with MPP publishing")
-    @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_7_4,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
     @GradleTest
     fun testMppWithMavenPublish(gradleVersion: GradleVersion) {
         project("new-mpp-lib-and-app/sample-lib", gradleVersion) {
@@ -81,11 +77,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 
     @NativeGradlePluginTests
     @DisplayName("works with native tasks in complex project")
-    @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_7_4,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
     @GradleTest
     fun testNativeTasks(gradleVersion: GradleVersion) {
         val expectedTasks = mutableListOf(
@@ -122,11 +114,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 
     @NativeGradlePluginTests
     @DisplayName("works with commonizer")
-    @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_7_4,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
     @GradleTest
     fun testCommonizer(gradleVersion: GradleVersion) {
         project("native-configuration-cache", gradleVersion) {
@@ -166,11 +154,7 @@ 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,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
     @GradleTest
     fun testInstantExecution(gradleVersion: GradleVersion) {
         project("instantExecution", gradleVersion) {
@@ -195,11 +179,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 
     @JvmGradlePluginTests
     @DisplayName("instant execution works with included build plugin")
-    @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_6_8,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
     @GradleTest
     fun testInstantExecutionWithIncludedBuildPlugin(gradleVersion: GradleVersion) {
         project("instantExecutionWithIncludedBuildPlugin", gradleVersion) {
@@ -212,11 +192,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 
     @MppGradlePluginTests
     @DisplayName("works in MPP withJava project")
-    @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_7_0,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0)
     @GradleTest
     fun testJvmWithJavaConfigurationCache(gradleVersion: GradleVersion) {
         project("mppJvmWithJava", gradleVersion) {
@@ -248,11 +224,8 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
     }
 
     @JvmGradlePluginTests
-    @DisplayName("with build scan report")
+    @DisplayName("with build build scan report")
     @GradleTest
-    @GradleTestVersions( // remove restriction after fix KT-57645
-        maxVersion = TestVersions.Gradle.MAX_SUPPORTED
-    )
     fun testBuildScanReportSmokeTestForConfigurationCache(gradleVersion: GradleVersion) {
         project("simpleProject", gradleVersion) {
             val buildOptions = defaultBuildOptions.copy(buildReport = listOf(BuildReportType.BUILD_SCAN), logLevel = LogLevel.DEBUG)
@@ -267,7 +240,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
     }
 }
 
-abstract class AbstractConfigurationCacheIT : MPPBaseTest() {
+abstract class AbstractConfigurationCacheIT : KGPBaseTest() {
     override val defaultBuildOptions =
         super.defaultBuildOptions.copy(configurationCache = true)