Java 25

.github/workflows/baseline-profile.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi
@@ -61,7 +61,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi
@@ -133,7 +133,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi

.github/workflows/releases.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version-file: .java-version
 
       - name: Install Rust Toolchain
         run: rustup target add thumbv7neon-linux-androideabi

.java-version

@@ -0,0 +1 @@
+25

benchmark/build.gradle.kts

@@ -29,7 +29,8 @@ android {
 }
 
 kotlin {
-    jvmToolchain(21)
+    val javaVersion = libs.versions.java.get().toInt()
+    jvmToolchain(javaVersion)
 }
 
 baselineProfile {

build-logic/convention/build.gradle.kts

@@ -30,7 +30,8 @@ gradlePlugin {
 }
 
 kotlin {
-    jvmToolchain(21)
+    val javaVersion = libs.versions.java.get().toInt()
+    jvmToolchain(javaVersion)
 }
 
 spotless {

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -21,7 +21,8 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
         apply(plugin = libs.plugins.composeCompilerReportGenerator.get().pluginId)
 
         configure<KotlinAndroidExtension> {
-            jvmToolchain(21)
+            val javaVersion = libs.versions.java.get().toInt()
+            jvmToolchain(javaVersion)
             compilerOptions {
                 configureKotlin(includeKotlinX = true)
                 configureKotlinCompose()

build-logic/convention/src/main/kotlin/MultiplatformLibraryConventionPlugin.kt

@@ -22,7 +22,8 @@ class MultiplatformLibraryConventionPlugin : Plugin<Project> {
         apply(plugin = libs.plugins.android.lint.get().pluginId)
 
         configure<KotlinMultiplatformExtension> {
-            jvmToolchain(21)
+            val javaVersion = libs.versions.java.get().toInt()
+            jvmToolchain(javaVersion)
             compilerOptions {
                 configureKotlin(includeKotlinX = path != ":core:i18n")
             }

gradle/libs.versions.toml

@@ -20,6 +20,7 @@ compose-bom = "2026.05.00"
 compose-multiplatform = "1.11.0"
 compose-destinations = "2.3.0"
 compose-preference = "2.2.0"
+java = "25"
 kotlin = "2.3.21"
 kotlinx-coroutines = "1.11.0"
 kotlinx-datetime = "0.8.0"