🔀 Merge pull request #35 from mrljdx/main

✏️ Fix compile error by modifying compileOptions and setting JVM target to 17
vinceglb · May 31, 2024 · d2d9979 · d2d9979
2 parents e360428 + eab07cf
commit d2d9979
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
+
 plugins {
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.androidApplication) apply false
@@ -6,3 +9,29 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.mavenPublishVanniktech) apply false
 }
+
+allprojects {
+
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile> {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+    tasks.withType<JavaCompile> {
+        sourceCompatibility = "${JavaVersion.VERSION_17}"
+        targetCompatibility = "${JavaVersion.VERSION_17}"
+    }
+}
+subprojects {
+    afterEvaluate {
+        tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile> {
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_17)
+            }
+        }
+        tasks.withType<JavaCompile> {
+            sourceCompatibility = "${JavaVersion.VERSION_17}"
+            targetCompatibility = "${JavaVersion.VERSION_17}"
+        }
+    }
+}
diff --git a/samples/sample-compose/composeApp/build.gradle.kts b/samples/sample-compose/composeApp/build.gradle.kts
@@ -101,8 +101,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }