From e7338be1c0e515a9e1fc1acd392b2334fedd4f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?X=C3=B9d=C5=8Dng=20Y=C3=A1ng?= <wyverald@gmail.com>
Date: Wed, 17 Aug 2022 19:02:36 +0200
Subject: [PATCH 1/2] refactor MODULE.bazel file

Use `register_toolchains(...)` instead of `module(..., toolchains_to_register = [...])`. The former allows us to put the `module` directive at the very top of the file, improving readability.
---
 MODULE.bazel | 56 +++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 940ed0b..0aef6e8 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,35 +1,6 @@
-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 = [
-    "remotejdk11_linux_aarch64",
-    "remotejdk11_linux_ppc64le",
-    "remotejdk11_linux_s390x",
-]
-
-REMOTE_JDK_REPOS = [("remotejdk" + version + "_" + platform) for version in JDK_VERSIONS for platform in PLATFORMS] + EXTRA_REMOTE_JDK11_REPOS
-
-REMOTE_JAVA_TOOLCHAINS = [("@" + name + "_toolchain_config_repo//:toolchain") for name in REMOTE_JDK_REPOS]
-
 module(
     name = "rules_java",
     compatibility_level = 1,
-    toolchains_to_register = [
-        "//toolchains:all",
-        "@local_jdk//:runtime_toolchain_definition",
-    ] + REMOTE_JAVA_TOOLCHAINS,
     version = "4.0.0",
 )
 
@@ -39,6 +10,8 @@ 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")
 
+register_toolchains("//toolchains:all")
+
 toolchains = use_extension("//java:extensions.bzl", "toolchains")
 
 # Declare remote java tools repos
@@ -52,13 +25,38 @@ use_repo(toolchains, "remote_java_tools_darwin")
 
 # Declare local jdk repo
 use_repo(toolchains, "local_jdk")
+register_toolchains("@local_jdk//:runtime_toolchain_definition")
 
 # Declare all remote jdk toolchain config repos
+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 = [
+    "remotejdk11_linux_aarch64",
+    "remotejdk11_linux_ppc64le",
+    "remotejdk11_linux_s390x",
+]
+
+REMOTE_JDK_REPOS = [("remotejdk" + version + "_" + platform) for version in JDK_VERSIONS for platform in PLATFORMS] + EXTRA_REMOTE_JDK11_REPOS
 [use_repo(
     toolchains,
     repo + "_toolchain_config_repo",
 ) for repo in REMOTE_JDK_REPOS]
 
+[register_toolchains("@" + name + "_toolchain_config_repo//:toolchain") for name in REMOTE_JDK_REPOS]
+
 # Dev dependencies
 bazel_dep(name = "rules_pkg", dev_dependency = True, version = "0.5.1")
 bazel_dep(name = "bazel_skylib", dev_dependency = True, version = "1.2.0")

From 81efa225ee65f6e9892c4b25424e2a3c2af600aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?X=C3=B9d=C5=8Dng=20Y=C3=A1ng?= <wyverald@gmail.com>
Date: Thu, 18 Aug 2022 12:01:46 +0200
Subject: [PATCH 2/2] run buildifier & update version

---
 MODULE.bazel | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 0aef6e8..ac03005 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,7 +1,7 @@
 module(
     name = "rules_java",
     compatibility_level = 1,
-    version = "4.0.0",
+    version = "5.1.0",
 )
 
 bazel_dep(name = "platforms", version = "0.0.4")
@@ -25,6 +25,7 @@ use_repo(toolchains, "remote_java_tools_darwin")
 
 # Declare local jdk repo
 use_repo(toolchains, "local_jdk")
+
 register_toolchains("@local_jdk//:runtime_toolchain_definition")
 
 # Declare all remote jdk toolchain config repos
@@ -50,6 +51,7 @@ EXTRA_REMOTE_JDK11_REPOS = [
 ]
 
 REMOTE_JDK_REPOS = [("remotejdk" + version + "_" + platform) for version in JDK_VERSIONS for platform in PLATFORMS] + EXTRA_REMOTE_JDK11_REPOS
+
 [use_repo(
     toolchains,
     repo + "_toolchain_config_repo",