[Gradle] Remove leftovers in tests for old Gradle versions

The minimal supported Gradle version was bumped to 7.6.3 in KT-69719, so there's no sense in the checks for Gradle 7.0.
JetBrains · Jan 8, 2025 · d18435d · d18435d
1 parent 7da7af4
commit d18435d
Showing 1 changed file with 0 additions and 35 deletions.
diff --git a/...kotlin/org/jetbrains/kotlin/gradle/mpp/MppIncorrectCompileOnlyDependenciesValidationIT.kt b/...kotlin/org/jetbrains/kotlin/gradle/mpp/MppIncorrectCompileOnlyDependenciesValidationIT.kt
@@ -21,16 +21,13 @@ class MppIncorrectCompileOnlyDependenciesValidationIT : KGPBaseTest() {
 
     @GradleTest
     @TestMetadata(value = "mpp-compile-only-dep")
-    @GradleTestVersions(minVersion = TypesafeProjectAccessorsMinimumGradleVersion)
     fun `when typesafe project accessor is used as compileOnly dependency, and is correctly exposed as an api dependency, expect no warning`(
         gradleVersion: GradleVersion,
     ) {
         project(
             projectName = "mpp-compile-only-dep",
             gradleVersion = gradleVersion,
         ) {
-            enableVersionCatalog()
-
             subProject("demo-app").apply {
                 buildGradleKts.append(
                     """
@@ -58,16 +55,13 @@ class MppIncorrectCompileOnlyDependenciesValidationIT : KGPBaseTest() {
 
     @GradleTest
     @TestMetadata(value = "mpp-compile-only-dep")
-    @GradleTestVersions(minVersion = VersionCatalogsMinimumGradleVersion)
     fun `when version catalog dependency is used as commonMain compileOnly dependency, and is correctly exposed as an api dependency, expect no warning`(
         gradleVersion: GradleVersion,
     ) {
         project(
             projectName = "mpp-compile-only-dep",
             gradleVersion = gradleVersion,
         ) {
-            enableVersionCatalog()
-
             subProject("demo-app").apply {
                 buildGradleKts.append(
                     """
@@ -95,16 +89,13 @@ class MppIncorrectCompileOnlyDependenciesValidationIT : KGPBaseTest() {
 
     @GradleTest
     @TestMetadata(value = "mpp-compile-only-dep")
-    @GradleTestVersions(minVersion = VersionCatalogsMinimumGradleVersion)
     fun `when commonMain compileOnly dependency is correctly exposed as an api dependency using version catalog dependency, expect no warning`(
         gradleVersion: GradleVersion,
     ) {
         project(
             projectName = "mpp-compile-only-dep",
             gradleVersion = gradleVersion,
         ) {
-            enableVersionCatalog()
-
             subProject("demo-app").apply {
                 buildGradleKts.append(
                     """
@@ -132,16 +123,13 @@ class MppIncorrectCompileOnlyDependenciesValidationIT : KGPBaseTest() {
 
     @GradleTest
     @TestMetadata(value = "mpp-compile-only-dep")
-    @GradleTestVersions(minVersion = VersionCatalogsMinimumGradleVersion)
     fun `when compileOnly dependency is external, and api dependency is project with the same coords, expect warning`(
         gradleVersion: GradleVersion,
     ) {
         project(
             projectName = "mpp-compile-only-dep",
             gradleVersion = gradleVersion,
         ) {
-            enableVersionCatalog()
-
             subProject("demo-app").apply {
                 buildGradleKts.append(
                     """
@@ -167,27 +155,4 @@ class MppIncorrectCompileOnlyDependenciesValidationIT : KGPBaseTest() {
             }
         }
     }
-
-    @Suppress("ConstPropertyName")
-    companion object {
-        /** The minimum Gradle version required for typesafe project accessors. */
-        private const val TypesafeProjectAccessorsMinimumGradleVersion = "7.0"
-
-        /** The minimum Gradle version required for Version Catalogs. */
-        private const val VersionCatalogsMinimumGradleVersion = "7.0"
-
-        private fun TestProject.enableVersionCatalog() {
-            require(gradleVersion >= VersionCatalogsMinimumGradleVersion) {
-                "Version Catalogs can only be enabled in Gradle $VersionCatalogsMinimumGradleVersion or higher," +
-                        "but current Gradle version is $gradleVersion."
-            }
-            if (gradleVersion < "8.0") {
-                // VERSION_CATALOGS flag was removed in 8.0, and thereafter enabled by default
-                settingsGradleKts.append("""enableFeaturePreview("VERSION_CATALOGS")""")
-            }
-        }
-
-        private operator fun GradleVersion.compareTo(other: String): Int =
-            compareTo(GradleVersion.version(other))
-    }
 }