build: Apply toolchain resolver

YuKongA · Jun 3, 2024 · cb69d9a · cb69d9a
1 parent b2b844a
commit cb69d9a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.android.build.gradle.internal.api.BaseVariantOutputImpl
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.ByteArrayOutputStream
 import java.util.Properties
 
@@ -65,13 +64,14 @@ android {
             applicationIdSuffix = ".debug"
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
     }
     kotlin {
+        jvmToolchain(21)
         compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
             freeCompilerArgs = listOf(
                 "-Xno-param-assertions",
                 "-Xno-call-assertions",

diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,4 @@ android.nonTransitiveRClass=true
 
 # Gradle
 org.gradle.parallel=true
-org.gradle.caching=true
-
-# Experimental
-android.experimental.enableNewResourceShrinker.preciseShrinking=true
+org.gradle.caching=true
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,6 +20,10 @@ dependencyResolutionManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+}
+
 rootProject.name = "HQ ICON"
 include(":app")