From b2724ad19f0ebf9db775dd091d8b24ac1ce09f95 Mon Sep 17 00:00:00 2001 From: Pavel Kargashinsky Date: Mon, 3 Apr 2023 11:30:43 +0200 Subject: [PATCH] Revert "[Gradle][Tests][MPP] Move BETA-versions test logic in MPPBaseTest" This reverts commit 5beba0acc645fc41b05e826b365ebbf5a2fedeb8. --- .../kotlin/gradle/testbase/MPPBaseTest.kt | 20 ------------------- .../kotlin/gradle/testbase/TestVersions.kt | 2 ++ 2 files changed, 2 insertions(+), 20 deletions(-) delete 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 deleted file mode 100644 index 8ac81cfc6e5..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/MPPBaseTest.kt +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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 92a8c9d3c2c..11e1b746dcf 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,6 +26,7 @@ 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 { @@ -47,6 +48,7 @@ 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(