Update the gradle plugin tests after kotlin 2.1.0 (#5210)

JetBrains · Jan 22, 2025 · 1e1810c · 1e1810c
1 parent f9c8448
commit 1e1810c
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 178 deletions.
diff --git a/...e/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatibilityTest.kt b/...e/src/test/kotlin/org/jetbrains/compose/test/tests/integration/KotlinCompatibilityTest.kt
@@ -12,21 +12,17 @@ import org.jetbrains.compose.test.utils.checks
 import org.junit.jupiter.api.Test
 
 class KotlinCompatibilityTest : GradlePluginTestBase() {
-    @Test
-    fun testKotlinMpp_1_9_10() = testMpp("1.9.10")
-
-    @Test
-    fun testKotlinJsMpp_1_9_24() = testJsMpp("1.9.24")
 
+    // 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
     @Test
-    fun testKotlinMpp_1_9_20() = testMpp("1.9.20")
+    fun testKotlinMpp_2_1_0() = testMpp("2.1.0")
 
     @Test
-    fun testKotlinJsMpp_1_9_20() = testJsMpp("1.9.20")
+    fun testKotlinJsMpp_2_1_0() = testJsMpp("2.1.0")
 
     private fun testMpp(kotlinVersion: String) = with(
         testProject(
-            "beforeKotlin2/mpp",
+            "application/mpp",
             testEnvironment = defaultTestEnvironment.copy(kotlinVersion = kotlinVersion)
         )
     ) {
@@ -39,7 +35,7 @@ class KotlinCompatibilityTest : GradlePluginTestBase() {
 
     private fun testJsMpp(kotlinVersion: String) = with(
         testProject(
-            "beforeKotlin2/jsMpp",
+            "application/jsMpp",
             testEnvironment = defaultTestEnvironment.copy(kotlinVersion = kotlinVersion)
         )
     ) {
@@ -87,15 +83,6 @@ class KotlinCompatibilityTest : GradlePluginTestBase() {
         )
     ).checkCustomComposeCompiler()
 
-    @Test
-    fun testKotlinCheckDisabled() = testProject(
-        "beforeKotlin2/custom-compiler-args", defaultTestEnvironment.copy(
-            kotlinVersion = "1.9.21",
-            composeCompilerPlugin = "dependencies.compiler.forKotlin(\"1.9.20\")",
-            composeCompilerArgs = "\"suppressKotlinVersionCompatibilityCheck=1.9.21\""
-        )
-    ).checkCustomComposeCompiler(checkKJS = true)
-
     private fun TestProject.checkCustomComposeCompiler(checkKJS: Boolean = false) {
         gradle(":runDistributable").checks {
             val actualMainImage = file("main-image.actual.png")

diff --git a/...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt b/...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
@@ -243,7 +243,7 @@ class ResourcesTest : GradlePluginTestBase() {
 
     @Test
     fun testMultiModuleResources() {
-        val environment = defaultTestEnvironment.copy(kotlinVersion = "2.0.0")
+        val environment = defaultTestEnvironment
         with(
             testProject("misc/kmpResourcePublication", environment)
         ) {

diff --git a/...projects/beforeKotlin2/jsMpp/build.gradle → ...t-projects/application/jsMpp/build.gradle b/...projects/beforeKotlin2/jsMpp/build.gradle → ...t-projects/application/jsMpp/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id "org.jetbrains.kotlin.multiplatform"
     id "org.jetbrains.compose"
+    id "org.jetbrains.kotlin.plugin.compose"
 }
 
 kotlin {

diff --git a/...jects/beforeKotlin2/jsMpp/settings.gradle → ...rojects/application/jsMpp/settings.gradle b/...jects/beforeKotlin2/jsMpp/settings.gradle → ...rojects/application/jsMpp/settings.gradle
@@ -1,6 +1,7 @@
 pluginManagement {
     plugins {
         id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION_PLACEHOLDER'
+        id 'org.jetbrains.kotlin.plugin.compose' version 'KOTLIN_VERSION_PLACEHOLDER'
         id 'org.jetbrains.compose' version 'COMPOSE_GRADLE_PLUGIN_VERSION_PLACEHOLDER'
     }
     repositories {

diff --git a/...2/jsMpp/src/commonMain/kotlin/platform.kt → ...n/jsMpp/src/commonMain/kotlin/platform.kt b/...2/jsMpp/src/commonMain/kotlin/platform.kt → ...n/jsMpp/src/commonMain/kotlin/platform.kt
diff --git a/...tlin2/jsMpp/src/jsMain/kotlin/platform.kt → ...ation/jsMpp/src/jsMain/kotlin/platform.kt b/...tlin2/jsMpp/src/jsMain/kotlin/platform.kt → ...ation/jsMpp/src/jsMain/kotlin/platform.kt
diff --git a/...lin2/jsMpp/src/jvmMain/kotlin/platform.kt → ...tion/jsMpp/src/jvmMain/kotlin/platform.kt b/...lin2/jsMpp/src/jvmMain/kotlin/platform.kt → ...tion/jsMpp/src/jvmMain/kotlin/platform.kt
diff --git a/...le-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler-args/build.gradle b/...le-plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler-args/build.gradle
diff --git a/...c/test/test-projects/beforeKotlin2/custom-compiler-args/main-image.expected.png b/...c/test/test-projects/beforeKotlin2/custom-compiler-args/main-image.expected.png
diff --git a/...plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler-args/settings.gradle b/...plugins/compose/src/test/test-projects/beforeKotlin2/custom-compiler-args/settings.gradle
diff --git a/.../src/test/test-projects/beforeKotlin2/custom-compiler-args/src/desktopMain/kotlin/Main.kt b/.../src/test/test-projects/beforeKotlin2/custom-compiler-args/src/desktopMain/kotlin/Main.kt
diff --git a/...se/src/test/test-projects/beforeKotlin2/custom-compiler-args/src/jsMain/kotlin/Main.js.kt b/...se/src/test/test-projects/beforeKotlin2/custom-compiler-args/src/jsMain/kotlin/Main.js.kt