Remove jvmToolchain from gradle build

MohamedRejeb · Nov 24, 2024 · d50a3a6 · d50a3a6
1 parent cb27979
commit d50a3a6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/richeditor-compose-coil3/build.gradle.kts b/richeditor-compose-coil3/build.gradle.kts
@@ -23,8 +23,12 @@ kotlin {
         }
     }
 
-    jvmToolchain(11)
-    jvm("desktop")
+    jvm("desktop") {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
 
     js(IR) {
         browser()
@@ -68,9 +72,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlin {
-        jvmToolchain(8)
-    }
 }
 
 apiValidation {

diff --git a/richeditor-compose/build.gradle.kts b/richeditor-compose/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -22,8 +23,13 @@ kotlin {
             jvmTarget.set(JvmTarget.JVM_1_8)
         }
     }
-    jvmToolchain(11)
-    jvm("desktop")
+
+    jvm("desktop") {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
 
     js(IR).browser()
     @OptIn(ExperimentalWasmDsl::class)
@@ -55,6 +61,13 @@ kotlin {
 
     sourceSets.commonTest.dependencies {
         implementation(kotlin("test"))
+        @OptIn(ExperimentalComposeLibrary::class)
+        implementation(compose.uiTest)
+    }
+
+    sourceSets.named("desktopTest").dependencies {
+        implementation(compose.desktop.uiTestJUnit4)
+        implementation(compose.desktop.currentOs)
     }
 }
 
@@ -71,9 +84,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlin {
-        jvmToolchain(8)
-    }
 }
 
 apiValidation {

diff --git a/sample/common/build.gradle.kts b/sample/common/build.gradle.kts
@@ -19,8 +19,12 @@ kotlin {
         }
     }
 
-    jvmToolchain(11)
-    jvm("desktop")
+    jvm("desktop") {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
 
     js(IR).browser()
     @OptIn(ExperimentalWasmDsl::class)
@@ -97,11 +101,9 @@ android {
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlin {
-        jvmToolchain(8)
-    }
 }