Update the compilation JDK to 25 (#323)

fmeum · rules_java Copybara · commit 39cae30eea61 · 2025-09-23T05:28:45.000-07:00
This is necessary to support `--java_runtime_version=remotejdk_25` with lower `--java_language_version` values. JDK 21 already showed warnings when targeting Java 8. Closes #323 COPYBARA_INTEGRATE_REVIEW=#323 from fmeum:jdk-25-default 8ab1d01 PiperOrigin-RevId: 810400625 Change-Id: Id7b66c2a737f28b09316077a338ec9dd0e1928e1
diff --git a/toolchains/BUILD b/toolchains/BUILD
@@ -358,7 +358,7 @@ RELEASES = (8, 9, 10, 11, 17, 21, 25)
 [
     default_java_toolchain(
         name = ("toolchain_java%d" if release <= 11 else "toolchain_jdk_%d") % release,
-        configuration = DEFAULT_TOOLCHAIN_CONFIGURATION if release <= 21 else DEFAULT_TOOLCHAIN_CONFIGURATION | {"java_runtime": ":remotejdk_%d" % release},
+        configuration = DEFAULT_TOOLCHAIN_CONFIGURATION | {"java_runtime": ":remotejdk_25"},
         source_version = "%s" % release,
         target_version = "%s" % release,
     )
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl
@@ -98,6 +98,8 @@ _BASE_TOOLCHAIN_CONFIGURATION = dict(
     reduced_classpath_incompatible_processors = [
         "dagger.hilt.processor.internal.root.RootProcessor",  # see b/21307381
     ],
+    # TODO: Update to JDK 25 after some time has passed - it no longer supports
+    # targeting JDK 7.
     java_runtime = Label("//toolchains:remotejdk_21"),
     oneversion = Label("//toolchains:one_version"),
 )

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ RELEASES = (8, 9, 10, 11, 17, 21, 25)`
`358`	`358`	`[`
`359`	`359`	`default_java_toolchain(`
`360`	`360`	`name = ("toolchain_java%d" if release <= 11 else "toolchain_jdk_%d") % release,`
`361`		`- configuration = DEFAULT_TOOLCHAIN_CONFIGURATION if release <= 21 else DEFAULT_TOOLCHAIN_CONFIGURATION \| {"java_runtime": ":remotejdk_%d" % release},`
	`361`	`+ configuration = DEFAULT_TOOLCHAIN_CONFIGURATION \| {"java_runtime": ":remotejdk_25"},`
`362`	`362`	`source_version = "%s" % release,`
`363`	`363`	`target_version = "%s" % release,`
`364`	`364`	`)`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,8 @@ _BASE_TOOLCHAIN_CONFIGURATION = dict(`
`98`	`98`	`reduced_classpath_incompatible_processors = [`
`99`	`99`	`"dagger.hilt.processor.internal.root.RootProcessor", # see b/21307381`
`100`	`100`	`],`
	`101`	`+ # TODO: Update to JDK 25 after some time has passed - it no longer supports`
	`102`	`+ # targeting JDK 7.`
`101`	`103`	`java_runtime = Label("//toolchains:remotejdk_21"),`
`102`	`104`	`oneversion = Label("//toolchains:one_version"),`
`103`	`105`	`)`