Skip to content

Commit 70bf5f1

Browse files
authored
Remove old Kotlin compatibility tests and related projects (#5281)
## Release Notes N/A
1 parent 0706bfa commit 70bf5f1

File tree

11 files changed

+37
-228
lines changed

11 files changed

+37
-228
lines changed

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.jetbrains.compose.desktop.ui.tooling.preview.rpc.PreviewLogger
1212
import org.jetbrains.compose.desktop.ui.tooling.preview.rpc.RemoteConnection
1313
import org.jetbrains.compose.desktop.ui.tooling.preview.rpc.receiveConfigFromGradle
1414
import org.jetbrains.compose.internal.Version
15+
import org.jetbrains.compose.newComposeCompilerError
1516
import org.jetbrains.compose.test.utils.GradlePluginTestBase
1617
import org.jetbrains.compose.test.utils.checkExists
1718
import org.jetbrains.compose.test.utils.checks
@@ -96,6 +97,41 @@ class GradlePluginTest : GradlePluginTestBase() {
9697
}
9798
}
9899

100+
// Note: we can't test non-jvm targets with Kotlin older than 2.1.0, because of klib abi version bump in 2.1.0
101+
private val oldestSupportedKotlinVersion = "2.1.0"
102+
@Test
103+
fun testOldestKotlinMpp() = with(
104+
testProject(
105+
"application/mpp",
106+
testEnvironment = defaultTestEnvironment.copy(kotlinVersion = oldestSupportedKotlinVersion)
107+
)
108+
) {
109+
val logLine = "Kotlin MPP app is running!"
110+
gradle("run").checks {
111+
check.taskSuccessful(":run")
112+
check.logContains(logLine)
113+
}
114+
}
115+
116+
@Test
117+
fun testOldestKotlinJsMpp() = with(
118+
testProject(
119+
"application/jsMpp",
120+
testEnvironment = defaultTestEnvironment.copy(kotlinVersion = oldestSupportedKotlinVersion)
121+
)
122+
) {
123+
gradle(":compileKotlinJs").checks {
124+
check.taskSuccessful(":compileKotlinJs")
125+
}
126+
}
127+
128+
@Test
129+
fun testOldComposePluginError() = with(testProject("misc/oldComposePlugin")) {
130+
gradleFailure("tasks").checks {
131+
check.logContains(newComposeCompilerError)
132+
}
133+
}
134+
99135
@Test
100136
fun configurePreview() {
101137
val isAlive = AtomicBoolean(true)

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

Lines changed: 0 additions & 100 deletions
This file was deleted.

gradle-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler/build.gradle

Lines changed: 0 additions & 40 deletions
This file was deleted.
Binary file not shown.

gradle-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler/settings.gradle

Lines changed: 0 additions & 11 deletions
This file was deleted.

gradle-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler/src/main/kotlin/Main.kt

Lines changed: 0 additions & 76 deletions
This file was deleted.

gradle-plugins/compose/src/test/test-projects/beforeKotlin2/mpp/build.gradle renamed to gradle-plugins/compose/src/test/test-projects/misc/oldComposePlugin/build.gradle

File renamed without changes.

gradle-plugins/compose/src/test/test-projects/beforeKotlin2/mpp/gradle.properties renamed to gradle-plugins/compose/src/test/test-projects/misc/oldComposePlugin/gradle.properties

File renamed without changes.

gradle-plugins/compose/src/test/test-projects/beforeKotlin2/mpp/settings.gradle renamed to gradle-plugins/compose/src/test/test-projects/misc/oldComposePlugin/settings.gradle

File renamed without changes.

gradle-plugins/compose/src/test/test-projects/beforeKotlin2/mpp/src/jvmMain/kotlin/main.kt renamed to gradle-plugins/compose/src/test/test-projects/misc/oldComposePlugin/src/jvmMain/kotlin/main.kt

File renamed without changes.

0 commit comments

Comments
 (0)