From 06d6be2f7e57d9a082bb2d10f5f8eb8f0ec3037f Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Sat, 22 Mar 2025 03:53:51 -0400
Subject: [PATCH] Get rid of Java toolchain (#5357)

---
 build.gradle | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9c1dac8514..5781800680 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 import app.cash.licensee.SpdxId
 import com.android.build.gradle.api.AndroidBasePlugin
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -35,6 +36,10 @@ allprojects {
                 abortOnError true
                 checkReleaseBuilds false
             }
+            compileOptions {
+                sourceCompatibility = JavaVersion.VERSION_17
+                targetCompatibility = JavaVersion.VERSION_17
+            }
         }
         dependencies {
             implementation 'androidx.core:core-ktx:1.15.0'
@@ -66,14 +71,18 @@ allprojects {
 
     plugins.withType(JavaBasePlugin).configureEach {
         java {
-            toolchain.languageVersion = JavaLanguageVersion.of(17)
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
         }
     }
 
     tasks.withType(KotlinCompile).configureEach {
-        compilerOptions.freeCompilerArgs.add(
-            "-Xjvm-default=all",
-        )
+        compilerOptions {
+            freeCompilerArgs.add(
+                "-Xjvm-default=all",
+            )
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 
     ext {