Merge pull request #50 from comius:run-buildifier PiperOrigin-RevId: 428730302 Change-Id: Ia5957fd5b280f7026846c0c2bb853580bb45d46b
diff --git a/MODULE.bazel b/MODULE.bazel index 5f0377e..fc61c65 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -1,5 +1,16 @@ -JDK_VERSIONS = ["11", "15", "16", "17"] -PLATFORMS = ["linux", "macos", "macos_aarch64", "win"] +JDK_VERSIONS = [ + "11", + "15", + "16", + "17", +] + +PLATFORMS = [ + "linux", + "macos", + "macos_aarch64", + "win", +] # Remote JDK repos for those Linux platforms are only defined for JDK 11. EXTRA_REMOTE_JDK11_REPOS = [ @@ -14,16 +25,17 @@ module( name = "rules_java", - version = "4.0.0", compatibility_level = 1, toolchains_to_register = [ "//toolchains:all", "@local_jdk//:runtime_toolchain_definition", ] + REMOTE_JAVA_TOOLCHAINS, + version = "4.0.0", ) bazel_dep(name = "platforms", version = "0.0.4") bazel_dep(name = "rules_cc", version = "0.0.1") + # rules_proto is required by @remote_java_tools, which is loaded via module extension. bazel_dep(name = "rules_proto", version = "4.0.0") @@ -31,15 +43,21 @@ # Declare remote java tools repos use_repo(toolchains, "remote_java_tools") + use_repo(toolchains, "remote_java_tools_linux") + use_repo(toolchains, "remote_java_tools_windows") + use_repo(toolchains, "remote_java_tools_darwin") # Declare local jdk repo use_repo(toolchains, "local_jdk") # Declare all remote jdk toolchain config repos -[use_repo(toolchains, repo + "_toolchain_config_repo") for repo in REMOTE_JDK_REPOS] +[use_repo( + toolchains, + repo + "_toolchain_config_repo", +) for repo in REMOTE_JDK_REPOS] # Dev dependencies -bazel_dep(name = "rules_pkg", version = "0.5.1", dev_dependency = True) +bazel_dep(name = "rules_pkg", dev_dependency = True, version = "0.5.1")
diff --git a/java/extensions.bzl b/java/extensions.bzl index 899f22e..ae51218 100644 --- a/java/extensions.bzl +++ b/java/extensions.bzl
@@ -15,7 +15,7 @@ load("//java:repositories.bzl", "java_tools_repos", "local_jdk_repo", "remote_jdk11_repos", "remote_jdk15_repos", "remote_jdk16_repos", "remote_jdk17_repos") -def _toolchains_impl(ctx): +def _toolchains_impl(_ctx): java_tools_repos() local_jdk_repo() remote_jdk11_repos()
diff --git a/toolchains/java_toolchain_alias.bzl b/toolchains/java_toolchain_alias.bzl index 1dc15ee..8cf247b 100644 --- a/toolchains/java_toolchain_alias.bzl +++ b/toolchains/java_toolchain_alias.bzl
@@ -70,7 +70,7 @@ ], ) -def _java_runtime_transition_impl(settings, attr): +def _java_runtime_transition_impl(_settings, attr): return {"//command_line_option:java_runtime_version": attr.runtime_version} _java_runtime_transition = transition(