jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-25 15:51:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Advance minimal Gradle version for .gradle.kts tests to 5.0

Browse Source 
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.
This commit is contained in:
Ilya Gorbunov
2020-03-30 09:20:21 +03:00
parent bc5605dcdc
commit b4d7dfd02c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)

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

@@ -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)

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

@@ -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") {