diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 35b492212d0..389b4375272 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -61,6 +61,7 @@ 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", diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt index 265a7e310a2..8217d6a60db 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt @@ -221,7 +221,6 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } @SimpleGradlePluginTests -@GradleTestVersions(minVersion = TestVersions.Gradle.G_6_6) abstract class AbstractConfigurationCacheIT : KGPBaseTest() { override val defaultBuildOptions = super.defaultBuildOptions.copy(configurationCache = true) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt index 35e7de7b904..8bcf6f2cc99 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt @@ -18,13 +18,14 @@ package org.jetbrains.kotlin.gradle import org.gradle.util.GradleVersion 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 = "6.1.1" + const val OLDEST_SUPPORTED = minSupportedGradleVersion - val FOR_MPP_SUPPORT = AtLeast("6.1.1") + val FOR_MPP_SUPPORT = AtLeast(OLDEST_SUPPORTED) } class Exact(version: String) : GradleVersionRequired(version, version) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt index d64847fb4f6..36aa763fdf6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JvmTargetValidationTest.kt @@ -240,7 +240,6 @@ 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) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt index 7cc29f88b04..ee8e8b717d1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt @@ -146,9 +146,6 @@ 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(), diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt index 400ad98bf21..b67c254cf4b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt @@ -276,8 +276,7 @@ class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() { if (System.getProperty("os.name")?.toLowerCase()?.contains("windows") == true) return val project = Project( - projectName = "kaptIncrementalWithParceler", - gradleVersionRequirement = GradleVersionRequired.AtLeast("6.7.1") + projectName = "kaptIncrementalWithParceler" ).apply { setupWorkingDir() } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 58956f0dec3..3d1f349614a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -1025,6 +1025,9 @@ 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) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 01fae766387..121f946df7c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -1169,8 +1169,7 @@ class KotlinGradleIT : BaseGradleIT() { @Test fun testKtKt35942InternalsFromMainInTestViaTransitiveDepsAndroid() = with( Project( - projectName = "kt-35942-android", - gradleVersionRequirement = GradleVersionRequired.AtLeast("6.7.1") + projectName = "kt-35942-android" ) ) { build( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt index c2599f47e01..2c0af0613f1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt @@ -13,7 +13,10 @@ import java.util.zip.ZipFile import kotlin.test.assertNotNull class KotlinJsIrLibraryGradlePluginIT : BaseGradleIT() { - override val defaultGradleVersion = GradleVersionRequired.AtLeast("6.1") + // 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 fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().copy( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KpmCompilerPluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KpmCompilerPluginIT.kt index d3b669edfff..c93d90cbab7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KpmCompilerPluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KpmCompilerPluginIT.kt @@ -10,12 +10,6 @@ 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") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 77d7a7cfdb7..3f342779d00 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -1841,7 +1841,12 @@ class NewMultiplatformIT : BaseGradleIT() { } @Test - fun testWasmJs() = with(Project("new-mpp-wasm-js", gradleVersion)) { + 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") + )) { setupWorkingDir() gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) build("build") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt index c16d34c1b3b..0573914f738 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt @@ -204,8 +204,7 @@ class SubpluginsIT : BaseGradleIT() { fun testKotlinVersionDowngradeInSupbrojectKt39809() = with( Project( "android-dagger", - directoryPrefix = "kapt2", - gradleVersionRequirement = GradleVersionRequired.AtLeast("6.7.1") + directoryPrefix = "kapt2" ) ) { setupWorkingDir() 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 9e4afe04e77..1fef61d30c4 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 @@ -9,19 +9,13 @@ 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-rc-2" + const val G_7_3 = "7.3" const val MIN_SUPPORTED = minSupportedGradleVersion const val MAX_SUPPORTED = G_7_0 } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt index 0d8604c454f..b1012446eb5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/arumentProviders.kt @@ -133,7 +133,6 @@ 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) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt index 52f8a092d62..fb15d959509 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/compatibiltiy.kt +++ b/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.1.1" +const val minSupportedGradleVersion = "6.7.1" internal fun checkGradleCompatibility( withComponent: String = "the Kotlin Gradle plugin",