diff --git a/BUILD b/BUILD index 56b79c87eac07d..5283d78b471dc6 100644 --- 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 index a12ffce8e0cd8c..f362c7e3178e56 100644 --- 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 index 083735ce8ec091..940310ddb118e6 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "aaab0222d59ce65e73c8f85970ce131b3956f40cd5e5a492533ecf1629d9ba88", + "moduleFileHash": "18fec4eb44f143167df4a447775699cce225cad5eb0cf1c7044db6478ac31aac", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -29,7 +29,8 @@ "toolchainsToRegister": [ "@bazel_tools//tools/python:autodetecting_toolchain", "@local_config_winsdk//:all", - "//src/main/res:empty_rc_toolchain" + "//src/main/res:empty_rc_toolchain", + "//:bazel_java_toolchain_definition" ], "extensionUsages": [ { @@ -329,7 +330,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 317, + "line": 321, "column": 22 } } @@ -543,7 +544,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 339, + "line": 343, "column": 35 }, "imports": { @@ -560,7 +561,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 342, + "line": 346, "column": 42 }, "imports": {