From 3d60b919db930ec2f686f212fab446c83d8b7d73 Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Fri, 24 Oct 2025 18:11:52 +0800
Subject: [PATCH] Sync jvmTarget from jdkRelease (#6018)

---
 build.gradle              | 10 +++++-----
 gradle/libs.versions.toml |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index e23c4e3ecf..d91212d5b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,8 +40,8 @@ allprojects {
                 checkReleaseBuilds false
             }
             compileOptions {
-                sourceCompatibility = JavaVersion.VERSION_17
-                targetCompatibility = JavaVersion.VERSION_17
+                sourceCompatibility = libs.versions.jdkRelease.get()
+                targetCompatibility = libs.versions.jdkRelease.get()
             }
         }
         dependencies {
@@ -73,15 +73,15 @@ allprojects {
 
     plugins.withType(JavaBasePlugin).configureEach {
         java {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
+            sourceCompatibility = libs.versions.jdkRelease.get()
+            targetCompatibility = libs.versions.jdkRelease.get()
         }
     }
 
     tasks.withType(KotlinCompile).configureEach {
         compilerOptions {
             jvmDefault = JvmDefaultMode.ENABLE
-            jvmTarget = JvmTarget.JVM_17
+            jvmTarget = JvmTarget.fromTarget(libs.versions.jdkRelease.get())
         }
     }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8d7e104b68..69f143b3f8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,4 +1,6 @@
 [versions]
+jdkRelease = "17"
+
 accompanist = "0.37.3"
 benchmarkMacroJunit4 = "1.4.1"
 concurrentFutures = "1.3.0"