From 5beba0acc645fc41b05e826b365ebbf5a2fedeb8 Mon Sep 17 00:00:00 2001
From: Pavel Kargashinsky <pavel.kargashinsky@jetbrains.com>
Date: Mon, 27 Mar 2023 16:05:41 +0200
Subject: [PATCH] [Gradle][Tests][MPP] Move BETA-versions test logic in
 MPPBaseTest

---
 .../kotlin/gradle/testbase/MPPBaseTest.kt     | 20 +++++++++++++++++++
 .../kotlin/gradle/testbase/TestVersions.kt    |  2 --
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/MPPBaseTest.kt

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/MPPBaseTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/MPPBaseTest.kt
new file mode 100644
index 00000000000..8ac81cfc6e5
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/MPPBaseTest.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.testbase
+
+/** Beta versions of Gradle and AGP are checking in multiplatform related tests.
+ *  Bumped manually.
+ */
+const val BETA_GRADLE = TestVersions.Gradle.G_8_0
+const val BETA_AGP = TestVersions.AGP.AGP_80
+
+/**
+ * Base class for all Multiplatform Gradle plugin Kotlin integration tests.
+ */
+@AndroidTestVersions(additionalVersions = [BETA_AGP])
+@GradleTestVersions(maxVersion = BETA_GRADLE, additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED])
+abstract class MPPBaseTest : KGPBaseTest() {
+}
\ No newline at end of file
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 11e1b746dcf..92a8c9d3c2c 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
@@ -26,7 +26,6 @@ interface TestVersions {
         const val MIN_SUPPORTED = minSupportedGradleVersion
         const val MIN_SUPPORTED_KPM = G_7_0
         const val MAX_SUPPORTED = G_7_6
-        const val NEXT_RELEASE = G_8_0
     }
 
     object Kotlin {
@@ -48,7 +47,6 @@ interface TestVersions {
 
         const val MIN_SUPPORTED = AGP_42 // KotlinAndroidPlugin.minimalSupportedAgpVersion
         const val MAX_SUPPORTED = AGP_74 // Update once Gradle MAX_SUPPORTED version will be bumped
-        const val NEXT_RELEASE = AGP_80
     }
 
     enum class AgpCompatibilityMatrix(