Jvm target to 17

skydoves · Jun 5, 2024 · bb8aa48 · bb8aa48
1 parent 9aa85f5
commit bb8aa48
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -45,15 +45,6 @@ android {
     }
   }
 
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-  }
-
-  kotlinOptions {
-    jvmTarget = libs.versions.jvmTarget.get()
-  }
-
   lint {
     abortOnError = false
   }

diff --git a/compose-stable-marker/build.gradle.kts b/compose-stable-marker/build.gradle.kts
@@ -43,7 +43,7 @@ mavenPublishing {
 }
 
 kotlin {
-  jvmToolchain(11)
+  jvmToolchain(17)
   androidTarget { publishLibraryVariants("release") }
   jvm("desktop")
   iosX64()
@@ -52,6 +52,19 @@ kotlin {
   macosX64()
   macosArm64()
 
+  js {
+    browser()
+    nodejs {
+      testTask {
+        useMocha {
+          timeout = "60s"
+        }
+      }
+    }
+    binaries.executable()
+    binaries.library()
+  }
+
   @OptIn(ExperimentalWasmDsl::class)
   wasmJs {
     browser {
@@ -90,6 +103,7 @@ kotlin {
             }
           }
           withJs()
+          withWasmJs()
         }
       }
     }
@@ -104,19 +118,4 @@ android {
   defaultConfig {
     minSdk = Configurations.minSdk
   }
-
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-  }
 }
-
-java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
-}
-
-tasks.withType(JavaCompile::class.java).configureEach {
-  this.targetCompatibility = JavaVersion.VERSION_11.toString()
-  this.sourceCompatibility = JavaVersion.VERSION_11.toString()
-}
diff --git a/gradle.properties b/gradle.properties
@@ -39,7 +39,7 @@ android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
 
 # KMP
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=tru
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "2.0.0"
 dokka = "1.9.10"
-jvmTarget = "11"
+jvmTarget = "17"
 nexusPlugin = "0.26.0"
 kotlinxCoroutines = "1.7.2"
 kotlinxTime = "0.4.0"