Temporarily work around bazelbuild#19837

fmeum · Oct 19, 2023 · e73a7cf · e73a7cf
1 parent 828e0cd
commit e73a7cf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/BUILD b/BUILD
@@ -2,6 +2,7 @@
 
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@rules_license//rules:license.bzl", "license")
+load("@rules_java//toolchains:default_java_toolchain.bzl", "default_java_toolchain")
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 load("@rules_python//python:defs.bzl", "py_binary")
 load("//src/tools/bzlmod:utils.bzl", "get_canonical_repo_name")
@@ -293,3 +294,12 @@ REMOTE_PLATFORMS = ("rbe_ubuntu2004_java11",)
     )
     for platform_name in REMOTE_PLATFORMS
 ]
+
+# Workaround for https://github.com/bazelbuild/bazel/issues/19837.
+# TODO(bazel-team): Remove when .bazelversion is 7.0.0rc2 or later.
+default_java_toolchain(
+    name = "bazel_java_toolchain",
+    bootclasspath = ["@rules_java//toolchains:platformclasspath"],
+    source_version = "11",
+    target_version = "11",
+)
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -309,6 +309,10 @@ register_toolchains("@local_config_winsdk//:all")
 
 register_toolchains("//src/main/res:empty_rc_toolchain")
 
+# Workaround for https://github.com/bazelbuild/bazel/issues/19837.
+# TODO(bazel-team): Remove when .bazelversion is 7.0.0rc2 or later.
+register_toolchains("//:bazel_java_toolchain_definition")
+
 # =========================================
 # Android tools dependencies
 # =========================================

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock