From b4d7dfd02cbac7c093a33fe88ed3ff3a47e484aa Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 30 Mar 2020 09:20:21 +0300 Subject: [PATCH] Advance minimal Gradle version for .gradle.kts tests to 5.0 Kotlin compiler 1.2 bundled in Gradle 4.10 and lower cannot read binaries produced by 1.4 compiler and thus cannot compile .gradle.kts scripts that depend on 1.4 Kotlin gradle plugin artifacts. --- .../jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 8 ++++---- .../org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) 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 2abf701e801..5b354ec4afb 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 @@ -462,7 +462,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : } @Test - fun testNewKotlinJsPlugin() = with(Project("kotlin-js-plugin-project", GradleVersionRequired.AtLeast("4.10.2"))) { + fun testNewKotlinJsPlugin() = with(Project("kotlin-js-plugin-project", GradleVersionRequired.AtLeast("5.0"))) { assumeFalse(irBackend) // TODO: Support IR version of kotlinx.html setupWorkingDir() gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) @@ -508,7 +508,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : } @Test - fun testYarnSetup() = with(Project("yarn-setup", GradleVersionRequired.AtLeast("4.10.2"))) { + fun testYarnSetup() = with(Project("yarn-setup", GradleVersionRequired.AtLeast("5.0"))) { setupWorkingDir() gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) gradleSettingsScript().modify(::transformBuildScriptWithPluginsDsl) @@ -539,7 +539,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : } @Test - fun testNpmDependencies() = with(Project("npm-dependencies", GradleVersionRequired.AtLeast("4.10.2"))) { + fun testNpmDependencies() = with(Project("npm-dependencies", GradleVersionRequired.AtLeast("5.0"))) { setupWorkingDir() gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) @@ -593,7 +593,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : } @Test - fun testBrowserDistribution() = with(Project("kotlin-js-browser-project", GradleVersionRequired.AtLeast("4.10.2"))) { + fun testBrowserDistribution() = with(Project("kotlin-js-browser-project", GradleVersionRequired.AtLeast("5.0"))) { setupWorkingDir() gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) gradleSettingsScript().modify(::transformBuildScriptWithPluginsDsl) 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 ec7bdb2dc38..afd48b94f30 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 @@ -894,7 +894,7 @@ class KotlinGradleIT : BaseGradleIT() { } @Test - fun testNewModelInOldJvmPlugin() = with(Project("new-model-in-old-plugin", GradleVersionRequired.AtLeast("4.10.2"))) { + fun testNewModelInOldJvmPlugin() = with(Project("new-model-in-old-plugin", GradleVersionRequired.AtLeast("5.0"))) { setupWorkingDir() gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) 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 640ec13772f..e4a91267de7 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 @@ -2184,7 +2184,7 @@ class NewMultiplatformIT : BaseGradleIT() { } @Test - fun testDependenciesDsl() = with(transformProjectWithPluginsDsl("newMppDependenciesDsl", GradleVersionRequired.AtLeast("4.10"))) { + fun testDependenciesDsl() = with(transformProjectWithPluginsDsl("newMppDependenciesDsl", GradleVersionRequired.AtLeast("5.0"))) { val originalBuildscriptContent = gradleBuildScript("app").readText() fun testDependencies() = testResolveAllConfigurations("app") {