build: Apply toolchain resolver

* This can get rid of Gradle's strong dependence on JDK version
ReChronoRain · Jun 4, 2024 · 71d8c9b · 71d8c9b
1 parent ea333e6
commit 71d8c9b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -197,13 +197,14 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(22)
+        }
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.majorVersion
+    kotlin {
+        jvmToolchain(22)
     }
 }
 

diff --git a/hidden-api/build.gradle.kts b/hidden-api/build.gradle.kts
@@ -24,12 +24,13 @@ android {
             setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(22)
+        }
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.majorVersion
+    kotlin {
+        jvmToolchain(22)
     }
 }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,6 +19,10 @@ dependencyResolutionManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
+}
+
 rootProject.name = "HyperCeiler"
 include(":app")
 include(":hidden-api")