Browse Source

Use Kotlin 1.4.0 in Gradle tests

pull/113/head
Alexey Tsvetkov 4 years ago committed by Alexey Tsvetkov
parent
commit
3e74b43cc6
  1. 4
      gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProject.kt
  2. 2
      gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt
  3. 2
      gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle
  4. 2
      gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle
  5. 2
      gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle

4
gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProject.kt

@ -21,7 +21,9 @@ data class TestProject(
if (orig.name.endsWith(".gradle") || orig.name.endsWith(".gradle.kts")) { if (orig.name.endsWith(".gradle") || orig.name.endsWith(".gradle.kts")) {
val origContent = orig.readText() val origContent = orig.readText()
val newContent = origContent.replace("COMPOSE_VERSION_PLACEHOLDER", TestProperties.composeVersion) val newContent = origContent
.replace("COMPOSE_VERSION_PLACEHOLDER", TestProperties.composeVersion)
.replace("KOTLIN_VERSION_PLACEHOLDER", TestProperties.kotlinVersion)
target.writeText(newContent) target.writeText(newContent)
} else { } else {
orig.copyTo(target) orig.copyTo(target)

2
gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt

@ -1,6 +1,8 @@
package org.jetbrains.compose.test package org.jetbrains.compose.test
object TestProperties { object TestProperties {
val kotlinVersion: String = "1.4.0"
val composeVersion: String val composeVersion: String
get() = System.getProperty("compose.plugin.version")!! get() = System.getProperty("compose.plugin.version")!!

2
gradle-plugins/compose/src/test/test-projects/application/jvm/settings.gradle

@ -1,6 +1,6 @@
pluginManagement { pluginManagement {
plugins { plugins {
id 'org.jetbrains.kotlin.jvm' version '1.4.10' id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION_PLACEHOLDER'
id 'org.jetbrains.compose' version 'COMPOSE_VERSION_PLACEHOLDER' id 'org.jetbrains.compose' version 'COMPOSE_VERSION_PLACEHOLDER'
} }
repositories { repositories {

2
gradle-plugins/compose/src/test/test-projects/application/jvmKotlinDsl/settings.gradle

@ -1,6 +1,6 @@
pluginManagement { pluginManagement {
plugins { plugins {
id 'org.jetbrains.kotlin.jvm' version '1.4.10' id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION_PLACEHOLDER'
id 'org.jetbrains.compose' version 'COMPOSE_VERSION_PLACEHOLDER' id 'org.jetbrains.compose' version 'COMPOSE_VERSION_PLACEHOLDER'
} }
repositories { repositories {

2
gradle-plugins/compose/src/test/test-projects/application/mpp/settings.gradle

@ -1,6 +1,6 @@
pluginManagement { pluginManagement {
plugins { plugins {
id 'org.jetbrains.kotlin.multiplatform' version '1.4.10' id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION_PLACEHOLDER'
id 'org.jetbrains.compose' version 'COMPOSE_VERSION_PLACEHOLDER' id 'org.jetbrains.compose' version 'COMPOSE_VERSION_PLACEHOLDER'
} }
repositories { repositories {

Loading…
Cancel
Save