Skip to content

Commit 5f67523

Browse files
committed
[gradle] Remove custom kotlin version from gradle test project.
1 parent 7d20ee3 commit 5f67523

File tree

5 files changed

+2
-18
lines changed

5 files changed

+2
-18
lines changed

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ class ResourcesTest : GradlePluginTestBase() {
147147
@Test
148148
fun testMultiModuleResources() {
149149
val environment = defaultTestEnvironment.copy(
150-
kotlinVersion = "2.0.0-titan-105",
151-
composeCompilerPlugin = "2.0.0-Beta4"
150+
kotlinVersion = "2.0.0-Beta5"
152151
)
153152
with(
154153
testProject("misc/kmpResourcePublication", environment)

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/appModule/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,4 @@ android {
5757
sourceCompatibility = JavaVersion.VERSION_17
5858
targetCompatibility = JavaVersion.VERSION_17
5959
}
60-
}
61-
62-
compose {
63-
kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("COMPOSE_COMPILER_PLUGIN_PLACEHOLDER"))
64-
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=KOTLIN_VERSION_PLACEHOLDER")
6560
}

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/cmplib/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ android {
5050
}
5151
}
5252

53-
compose {
54-
kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("COMPOSE_COMPILER_PLUGIN_PLACEHOLDER"))
55-
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=KOTLIN_VERSION_PLACEHOLDER")
56-
}
57-
5853
compose.resources {
5954
publicResClass = true
6055
packageOfResClass = "me.sample.library.resources"

gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/featureModule/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,4 @@ android {
3838
sourceCompatibility = JavaVersion.VERSION_17
3939
targetCompatibility = JavaVersion.VERSION_17
4040
}
41-
}
42-
43-
compose {
44-
kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("COMPOSE_COMPILER_PLUGIN_PLACEHOLDER"))
45-
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=KOTLIN_VERSION_PLACEHOLDER")
4641
}

gradle-plugins/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ kotlin.code.style=official
88
dev.junit.parallel=false
99

1010
# Default version of Compose Libraries used by Gradle plugin
11-
compose.version=1.6.10-dev1493
11+
compose.version=1.6.10-dev1523
1212
# The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
1313
compose.tests.compiler.version=1.5.10.1
1414
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.

0 commit comments

Comments
 (0)