Simplify Toolchain

imknown · Aug 29, 2024 · f3f089c · f3f089c
1 parent cc066aa
commit f3f089c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -114,13 +114,16 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+//    java {
+//        toolchain {
+//            languageVersion = JavaLanguageVersion.of(17)
+//        }
+//    }
+
+    kotlin {
+        jvmToolchain(17)
     }
 
     externalNativeBuild {

diff --git a/base/build.gradle.kts b/base/build.gradle.kts
@@ -22,13 +22,16 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+//    java {
+//        toolchain {
+//            languageVersion = JavaLanguageVersion.of(17)
+//        }
+//    }
+
+    kotlin {
+        jvmToolchain(17)
     }
 
     buildFeatures {