Revert "Set minimal supported Gradle version to 6.7.1."

Temporary until 1.6.20 release branching.

This reverts commit 4c3404888a.

^KT-49733 Open

buildSrc/src/main/kotlin/tasks.kt

@@ -61,7 +61,6 @@ val kotlinGradlePluginAndItsRequired = arrayOf(
     ":kotlin-stdlib-jdk7",
     ":kotlin-stdlib-jdk8",
     ":kotlin-stdlib-js",
-    ":kotlin-stdlib-wasm",
     ":examples:annotation-processor-example",
     ":kotlin-script-runtime",
     ":kotlin-scripting-common",

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

@@ -173,6 +173,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
 }
 
 @SimpleGradlePluginTests
+@GradleTestVersions(minVersion = TestVersions.Gradle.G_6_6)
 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/GradleVersionRequired.kt

@@ -19,14 +19,13 @@ package org.jetbrains.kotlin.gradle
 import org.gradle.util.GradleVersion
 import org.jetbrains.kotlin.com.google.common.base.Objects
 import org.jetbrains.kotlin.gradle.GradleVersionRequired.Companion.OLDEST_SUPPORTED
-import org.jetbrains.kotlin.gradle.utils.minSupportedGradleVersion
 import org.junit.Assume
 
 sealed class GradleVersionRequired(val minVersion: String, val maxVersion: String?) {
     companion object {
-        const val OLDEST_SUPPORTED = minSupportedGradleVersion
+        const val OLDEST_SUPPORTED = "6.1.1"
 
-        val FOR_MPP_SUPPORT = AtLeast(OLDEST_SUPPORTED)
+        val FOR_MPP_SUPPORT = AtLeast("6.1.1")
     }
 
     class Exact(version: String) : GradleVersionRequired(version, version) {

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

@@ -11,6 +11,8 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
 import org.jetbrains.kotlin.gradle.testbase.*
 import org.junit.jupiter.api.DisplayName
 
+@JsGradlePluginTests
+@GradleTestVersions(minVersion = TestVersions.Gradle.G_6_6)
 abstract class AbstractJsConfigurationCacheIT(protected val irBackend: Boolean) : KGPBaseTest() {
     private val defaultJsOptions = BuildOptions.JsOptions(
         useIrBackend = irBackend,
@@ -89,8 +91,6 @@ abstract class AbstractJsConfigurationCacheIT(protected val irBackend: Boolean)
     }
 }
 
-@JsGradlePluginTests
 class JsConfigurationCacheIT : AbstractJsConfigurationCacheIT(irBackend = false)
 
-@JsGradlePluginTests
 class JsIrConfigurationCacheIT : AbstractJsConfigurationCacheIT(irBackend = true)

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

@@ -240,6 +240,7 @@ class JvmTargetValidationTest : KGPBaseTest() {
     }
 
     @DisplayName("Should do JVM target validation if java sources are added and configuration cache is reused")
+    @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_6)
     @GradleTest
     @ExperimentalPathApi
     internal fun shouldDoJvmTargetValidationOnNewJavaSourcesAndConfigurationCacheReuse(gradleVersion: GradleVersion) {

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

@@ -146,6 +146,9 @@ class Kapt3Android42IT : BaseGradleIT() {
         KAPT_SUCCESSFUL_REGEX.findAll(this.output).count() > 0
     }
 
+    override val defaultGradleVersion: GradleVersionRequired
+        get() = GradleVersionRequired.AtLeast("6.7.1")
+
     override fun defaultBuildOptions(): BuildOptions =
         super.defaultBuildOptions().copy(
             kaptOptions = kaptOptions(),

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

@@ -276,7 +276,8 @@ class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() {
         if (System.getProperty("os.name")?.toLowerCase()?.contains("windows") == true) return
 
         val project = Project(
-            projectName = "kaptIncrementalWithParceler"
+            projectName = "kaptIncrementalWithParceler",
+            gradleVersionRequirement = GradleVersionRequired.AtLeast("6.7.1")
         ).apply {
             setupWorkingDir()
         }

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

@@ -1022,9 +1022,6 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean)
 
 @JsGradlePluginTests
 class GeneralKotlin2JsGradlePluginIT : KGPBaseTest() {
-    // TODO: This test fails with deprecation error on Gradle <7.0
-    // Should be fixed via planned fixes in Kotlin/JS plugin: https://youtrack.jetbrains.com/issue/KFC-252
-    @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0)
     @DisplayName("js with both backends mode builds successfully")
     @GradleTest
     fun testJsBothModeWithTests(gradleVersion: GradleVersion) {

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

@@ -1169,7 +1169,8 @@ class KotlinGradleIT : BaseGradleIT() {
     @Test
     fun testKtKt35942InternalsFromMainInTestViaTransitiveDepsAndroid() = with(
         Project(
-            projectName = "kt-35942-android"
+            projectName = "kt-35942-android",
+            gradleVersionRequirement = GradleVersionRequired.AtLeast("6.7.1")
         )
     ) {
         build(

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

@@ -13,10 +13,7 @@ import java.util.zip.ZipFile
 import kotlin.test.assertNotNull
 
 class KotlinJsIrLibraryGradlePluginIT : BaseGradleIT() {
-    // TODO: This suite is failing with deprecation error on Gradle <7.0 versions
-    // Should be fixed via planned fixes in Kotlin/JS plugin: https://youtrack.jetbrains.com/issue/KFC-252
-    override val defaultGradleVersion: GradleVersionRequired
-        get() = GradleVersionRequired.AtLeast("7.0")
+    override val defaultGradleVersion = GradleVersionRequired.AtLeast("6.1")
 
     override fun defaultBuildOptions(): BuildOptions =
         super.defaultBuildOptions().copy(

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

@@ -10,6 +10,12 @@ import kotlin.test.assertTrue
 
 class KpmCompilerPluginIT : BaseGradleIT() {
 
+    /**
+     * Gradle implementation of KPM uses features of 6.4+ version
+     */
+    override val defaultGradleVersion: GradleVersionRequired
+        get() = GradleVersionRequired.AtLeast("6.4")
+
     @Test
     fun testTransientPluginOptions() {
         val project = transformProjectWithPluginsDsl("kpmTransientPluginOptions")

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

@@ -1841,12 +1841,7 @@ class NewMultiplatformIT : BaseGradleIT() {
     }
 
     @Test
-    fun testWasmJs() = with(Project(
-        "new-mpp-wasm-js",
-        // TODO: this test fails with deprecation error on Gradle <7.0
-        // Should be fixed via planned fixes in Kotlin/JS plugin: https://youtrack.jetbrains.com/issue/KFC-252
-        gradleVersionRequirement = GradleVersionRequired.AtLeast("7.0")
-    )) {
+    fun testWasmJs() = with(Project("new-mpp-wasm-js", gradleVersion)) {
         setupWorkingDir()
         gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl)
         build("build") {

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

@@ -204,7 +204,8 @@ class SubpluginsIT : BaseGradleIT() {
     fun testKotlinVersionDowngradeInSupbrojectKt39809() = with(
         Project(
             "android-dagger",
-            directoryPrefix = "kapt2"
+            directoryPrefix = "kapt2",
+            gradleVersionRequirement = GradleVersionRequired.AtLeast("6.7.1")
         )
     ) {
         setupWorkingDir()

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

@@ -9,13 +9,19 @@ import org.jetbrains.kotlin.gradle.utils.minSupportedGradleVersion
 
 interface TestVersions {
     object Gradle {
+        const val G_6_1 = "6.1.1"
+        const val G_6_2 = "6.2.2"
+        const val G_6_3 = "6.3"
+        const val G_6_4 = "6.4.1"
+        const val G_6_5 = "6.5.1"
+        const val G_6_6 = "6.6.1"
         const val G_6_7 = "6.7.1"
         const val G_6_8 = "6.8.3"
         const val G_6_9 = "6.9.1"
         const val G_7_0 = "7.0.2"
         const val G_7_1 = "7.1.1"
         const val G_7_2 = "7.2"
-        const val G_7_3 = "7.3"
+        const val G_7_3 = "7.3-rc-2"
         const val MIN_SUPPORTED = minSupportedGradleVersion
         const val MAX_SUPPORTED = G_7_0
     }

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

@@ -133,6 +133,7 @@ class GradleAndJdkArgumentsProvider : GradleArgumentsProvider() {
 
     companion object {
         private val jdkGradleCompatibilityMatrix = mapOf(
+            JavaVersion.VERSION_14 to GradleVersion.version(TestVersions.Gradle.G_6_3),
             JavaVersion.VERSION_15 to GradleVersion.version(TestVersions.Gradle.G_6_7),
             JavaVersion.VERSION_16 to GradleVersion.version(TestVersions.Gradle.G_7_0),
             JavaVersion.VERSION_17 to GradleVersion.version(TestVersions.Gradle.G_7_3)

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt

@@ -31,7 +31,7 @@ import org.gradle.util.GradleVersion
 import java.io.File
 import java.io.Serializable
 
-const val minSupportedGradleVersion = "6.7.1"
+const val minSupportedGradleVersion = "6.1.1"
 
 internal fun checkGradleCompatibility(
     withComponent: String = "the Kotlin Gradle plugin",