Revert "[Gradle][Tests][MPP] Inherit mpp tests from MPPBaseTest"

This reverts commit 11e4cb12b7.

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(
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
-        minVersion = TestVersions.Gradle.G_7_4,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
     @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(
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
-        minVersion = TestVersions.Gradle.G_7_4,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
     @GradleTest
     fun testNativeTasks(gradleVersion: GradleVersion) {
         val expectedTasks = mutableListOf(
@@ -122,11 +114,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 
     @NativeGradlePluginTests
     @DisplayName("works with commonizer")
-    @GradleTestVersions(
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_4)
-        minVersion = TestVersions.Gradle.G_7_4,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
     @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(
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
-        minVersion = TestVersions.Gradle.G_6_8,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
     @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(
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8)
-        minVersion = TestVersions.Gradle.G_6_8,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
     @GradleTest
     fun testInstantExecutionWithIncludedBuildPlugin(gradleVersion: GradleVersion) {
         project("instantExecutionWithIncludedBuildPlugin", gradleVersion) {
@@ -212,11 +192,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 
     @MppGradlePluginTests
     @DisplayName("works in MPP withJava project")
-    @GradleTestVersions(
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0)
-        minVersion = TestVersions.Gradle.G_7_0,
-        maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )
     @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)
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt

@@ -31,8 +31,12 @@ import kotlin.test.assertTrue
 import kotlin.test.fail
 
 @MppGradlePluginTests
+@GradleTestVersions(
+    maxVersion = TestVersions.Gradle.NEXT_RELEASE,
+    additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
+)
 @DisplayName("Hierarchical multiplatform")
-open class HierarchicalMppIT : MPPBaseTest() {
+open class HierarchicalMppIT : KGPBaseTest() {
 
     private val String.withPrefix get() = "hierarchical-mpp-published-modules/$this"
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt

@@ -22,7 +22,7 @@ class MPPBuildReproducibilityIT : KGPBaseTest() {
     @GradleTest
     @GradleTestVersions(
         minVersion = TestVersions.Gradle.G_7_0,
-        maxVersion = BETA_GRADLE,
+        maxVersion = TestVersions.Gradle.NEXT_RELEASE,
         additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
     )
     @DisplayName("Check if consecutive builds produce same binaries: Simple Multiplatform project")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt

@@ -30,8 +30,12 @@ import kotlin.test.assertEquals
 import kotlin.test.fail
 
 @MppGradlePluginTests
+@GradleTestVersions(
+    maxVersion = TestVersions.Gradle.NEXT_RELEASE,
+    additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
+)
 @DisplayName("Multiplatform IDE dependency resolution")
-class MppIdeDependencyResolutionIT : MPPBaseTest() {
+class MppIdeDependencyResolutionIT : KGPBaseTest() {
     @GradleTest
     fun testCommonizedPlatformDependencyResolution(gradleVersion: GradleVersion) {
         with(project("commonizeHierarchically", gradleVersion)) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt

@@ -26,7 +26,9 @@ import kotlin.test.*
 
 @DisplayName("kotlin-android with mpp")
 @AndroidGradlePluginTests
-class KotlinAndroidMppIT : MPPBaseTest() {
+@AndroidTestVersions(additionalVersions = [TestVersions.AGP.NEXT_RELEASE])
+@GradleTestVersions(maxVersion = TestVersions.Gradle.NEXT_RELEASE, additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED])
+class KotlinAndroidMppIT : KGPBaseTest() {
     @DisplayName("KT-50736: whenEvaluated waits for AGP being applied later")
     @GradleAndroidTest
     fun testAfterEvaluateOrdering(
@@ -540,6 +542,7 @@ class KotlinAndroidMppIT : MPPBaseTest() {
         }
     }
 
+    // AGP max version is limited due to https://youtrack.jetbrains.com/issue/KT-51940/HMPP-resolves-configurations-during-configuration
     @DisplayName("android app can depend on mpp lib")
     @GradleAndroidTest
     fun testAndroidWithNewMppApp(
@@ -818,11 +821,8 @@ class KotlinAndroidMppIT : MPPBaseTest() {
      */
     @DisplayName("KT-49798: com.android.build.api.attributes.AgpVersionAttr is not published")
     @GradleAndroidTest
-    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [BETA_AGP])
+    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71)
-    @GradleTestVersions(
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^
-        minVersion = TestVersions.Gradle.G_7_2, maxVersion = BETA_GRADLE,
-        additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
-    )// due AGP version limit ^
     fun testKT49798AgpVersionAttrNotPublished(
         gradleVersion: GradleVersion,
         agpVersion: String,
@@ -855,9 +855,9 @@ class KotlinAndroidMppIT : MPPBaseTest() {
 
     @DisplayName("produced artifacts are consumable by projects with various AGP versions")
     @GradleAndroidTest
-    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [BETA_AGP])
+    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [TestVersions.AGP.NEXT_RELEASE])
     @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_7_2, maxVersion = BETA_GRADLE,
+        minVersion = TestVersions.Gradle.G_7_2, maxVersion = TestVersions.Gradle.NEXT_RELEASE,
         additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
     ) // due AGP version limit ^
     fun testAndroidMultiplatformPublicationAGPCompatibility(
@@ -926,9 +926,9 @@ class KotlinAndroidMppIT : MPPBaseTest() {
 
     @DisplayName("KT-49877, KT-35916: associate compilation dependencies are passed correctly to android test compilations")
     @GradleAndroidTest
-    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [BETA_AGP])
+    @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [TestVersions.AGP.NEXT_RELEASE])
     @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_7_2, maxVersion = BETA_GRADLE,
+        minVersion = TestVersions.Gradle.G_7_2, maxVersion = TestVersions.Gradle.NEXT_RELEASE,
         additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
     ) // due AGP version limit ^
     fun testAssociateCompilationDependenciesArePassedToAndroidTestCompilations(

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt

@@ -17,10 +17,10 @@ class MultiplatformAndroidSourceSetLayoutV2IT : KGPBaseTest() {
 
     @GradleAndroidTest
     @DisplayName("test Android project with flavors")
-    @AndroidTestVersions(minVersion = "7.0.4", additionalVersions = [BETA_AGP])
+    @AndroidTestVersions(minVersion = "7.0.4", additionalVersions = [TestVersions.AGP.NEXT_RELEASE])
     @GradleTestVersions(
         minVersion = TestVersions.Gradle.G_7_0,
-        maxVersion = BETA_GRADLE,
+        maxVersion = TestVersions.Gradle.NEXT_RELEASE,
         additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
     ) // due AGP version limit ^
     fun testProjectWithFlavors(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AggregatingKotlinTestReportIT.kt

@@ -15,7 +15,7 @@ import org.junit.jupiter.api.DisplayName
 
 @MppGradlePluginTests
 @DisplayName("Tests for aggregating kotlin test reports")
-class AggregatingKotlinTestReportIT : MPPBaseTest() {
+class AggregatingKotlinTestReportIT : KGPBaseTest() {
     @DisplayName("KT-54506: `allTests` is not false positively up-to-date after failure")
     @GradleTest
     fun testFailedTestsAreNotUpToDate(gradleVersion: GradleVersion) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt

@@ -10,8 +10,12 @@ import org.jetbrains.kotlin.gradle.testbase.*
 import org.junit.jupiter.api.DisplayName
 
 @MppGradlePluginTests
+@GradleTestVersions(
+    maxVersion = TestVersions.Gradle.NEXT_RELEASE,
+    additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
+)
 @DisplayName("Broken task configuration avoidance doesn't lead to build failures at least with simple setups")
-class BrokenLazyConfigurationIT : MPPBaseTest() {
+class BrokenLazyConfigurationIT : KGPBaseTest() {
     @GradleTest
     @DisplayName("works in JVM")
     fun testBrokenTcaInJvm(gradleVersion: GradleVersion) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt

@@ -16,8 +16,12 @@ import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.condition.OS
 
 @MppGradlePluginTests
+@GradleTestVersions(
+    maxVersion = TestVersions.Gradle.NEXT_RELEASE,
+    additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
+)
 @DisplayName("Tests for multiplatform with composite builds")
-class MppCompositeBuildIT : MPPBaseTest() {
+class MppCompositeBuildIT : KGPBaseTest() {
     @GradleTest
     fun `test - sample0 - ide dependencies`(gradleVersion: GradleVersion) {
         val producer = project("mpp-composite-build/sample0/producerBuild", gradleVersion)

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt

@@ -14,7 +14,11 @@ import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 @MppGradlePluginTests
-class MppDiagnosticsIt : MPPBaseTest() {
+@GradleTestVersions(
+    maxVersion = TestVersions.Gradle.NEXT_RELEASE,
+    additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
+)
+class MppDiagnosticsIt : KGPBaseTest() {
     @GradleTest
     fun testDeprecatedProperties(gradleVersion: GradleVersion) {
         project("mppDeprecatedProperties", gradleVersion) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt

@@ -15,8 +15,12 @@ import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.fail
 
 @MppGradlePluginTests
+@GradleTestVersions(
+    maxVersion = TestVersions.Gradle.NEXT_RELEASE,
+    additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
+)
 @DisplayName("Tests for multiplatform | shared native compilations")
-class MppSharedNativeCompileIT : MPPBaseTest() {
+class MppSharedNativeCompileIT : KGPBaseTest() {
     /**
      * https://youtrack.jetbrains.com/issue/KT-56205/Shared-Native-Compilation-False-positive-w-Could-not-find-warnings-on-metadata-klibs
      * metadata klib should not contain any dependsOn= in their klib manifest.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt

@@ -12,10 +12,10 @@ import org.junit.jupiter.api.DisplayName
 
 @MppGradlePluginTests
 @DisplayName("Tests for multiplatform testing")
-class MppTestsIT : MPPBaseTest() {
+class MppTestsIT : KGPBaseTest() {
     @DisplayName("KT-54634: MPP testing logic is compatible with API changes in Gradle 7.6")
     @GradleTestVersions(
-        maxVersion = BETA_GRADLE,
+        maxVersion = TestVersions.Gradle.NEXT_RELEASE,
         additionalVersions = [TestVersions.Gradle.G_7_5, TestVersions.Gradle.G_7_6]
     )
     @GradleTest

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt

@@ -9,7 +9,11 @@ import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.gradle.testbase.*
 
 @MppGradlePluginTests
-class CinteropIT : MPPBaseTest() {
+@GradleTestVersions(
+    maxVersion = TestVersions.Gradle.NEXT_RELEASE,
+    additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]
+)
+class CinteropIT : KGPBaseTest() {
 
     @GradleTest
     fun `rerun cinterop after a header changing`(gradleVersion: GradleVersion) {