[8.0.0] Back-port a few commits to update MODULE.tools (#24109)

- Update rules_java to 8.2.0:
93daa7b
-
78abca3
- #24094

---------

Co-authored-by: Googler <[email protected]>

Author: meteorcloudy

MODULE.bazel

@@ -24,7 +24,7 @@ bazel_dep(name = "zstd-jni", version = "1.5.2-3.bcr.1")
 bazel_dep(name = "blake3", version = "1.5.1.bcr.1")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
 bazel_dep(name = "rules_cc", version = "0.0.13")
-bazel_dep(name = "rules_java", version = "8.1.0")
+bazel_dep(name = "rules_java", version = "8.2.0")
 bazel_dep(name = "rules_graalvm", version = "0.11.1")
 bazel_dep(name = "rules_proto", version = "6.0.2")
 bazel_dep(name = "rules_jvm_external", version = "6.0")

MODULE.bazel.lock

@@ -37,7 +37,8 @@ use_repo(buildozer_binary, "buildozer_binary")
 
 # Dependencies used to auto-load removed symbols and rules from Bazel (due to Starlarkification)
 # See also:  --incompatible_autoload_externally, AutoloadSymbols
-bazel_dep(name = "rules_java", version = "8.1.0")
+bazel_dep(name = "protobuf", version = "29.0-rc2")
+bazel_dep(name = "rules_java", version = "8.2.0")
 bazel_dep(name = "rules_cc", version = "0.0.13")
 bazel_dep(name = "rules_python", version = "0.36.0")
 bazel_dep(name = "rules_shell", version = "0.2.0")

src/MODULE.tools

@@ -274,13 +274,13 @@ function test_packages_cleared() {
   # is still low (external packages don't contribute there). We can lower this
   # number again once we remove WORKSPACE logic and move repo rules to not use
   # Package anymore.
-  [[ "$package_count" -le 53 ]] \
+  [[ "$package_count" -le 56 ]] \
       || fail "package count $package_count too high"
   globs_count="$(extract_histogram_count "$histo_file" "GlobsValue$")"
   [[ "$globs_count" -le 1 ]] \
       || fail "globs count $globs_count too high"
   module_count="$(extract_histogram_count "$histo_file" 'eval.Module$')"
-  [[ "$module_count" -le 270 ]] \
+  [[ "$module_count" -le 295 ]] \
       || fail "Module count $module_count too high"
   ct_count="$(extract_histogram_count "$histo_file" \
        'RuleConfiguredTarget$')"

src/test/shell/integration/discard_graph_edges_test.sh

@@ -592,12 +592,6 @@ function add_rules_license() {
 
 function add_protobuf() {
   add_bazel_dep "protobuf" "$1"
-  cat >> "$1" <<EOF
-single_version_override(
-    module_name = "protobuf",
-    version = "29.0-rc2",
-)
-EOF
 }
 
 function add_rules_testing() {

src/test/shell/testenv.sh

@@ -29,6 +29,35 @@ source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/
 source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \
   || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
 
+# List of expected modules in the default lock file.
+# You may need to update this list if MODULE.tools changes,
+# but we should keep the list as small as possible because
+# they are tranitive dependencies for all Bazel users (although fetched lazily).
+expected_modules=(
+  abseil-cpp
+  bazel_features
+  bazel_skylib
+  buildozer
+  googletest
+  jsoncpp
+  platforms
+  protobuf
+  pybind11_bazel
+  re2
+  rules_android
+  rules_cc
+  rules_fuzzing
+  rules_java
+  rules_jvm_external
+  rules_kotlin
+  rules_license
+  rules_pkg
+  rules_proto
+  rules_python
+  rules_shell
+  zlib
+)
+
 function test_verify_lock_file() {
   rm -f MODULE.bazel
   touch MODULE.bazel
@@ -37,6 +66,10 @@ function test_verify_lock_file() {
   bazel mod deps --lockfile_mode=update
   diff -u $(rlocation io_bazel/src/test/tools/bzlmod/MODULE.bazel.lock) MODULE.bazel.lock || fail "Default lockfile for empty workspace is no longer in sync with MODULE.tools. Please run \"bazel run //src/test/tools/bzlmod:update_default_lock_file\""
 
+  # Verify the list of expected modules in the lock file.
+  grep -o '"https://bcr\.bazel\.build[^"]*source.json"' MODULE.bazel.lock | sed -E 's|.*modules/([^/]+)/.*|\1|' | sort -u > actual_modules
+  diff -u <(printf '%s\n' "${expected_modules[@]}" | sort) actual_modules || fail "Expected modules in lockfile do not match the actual modules. Please update 'expected_modules' if necessary."
+
   # Verify if python toolchain version matches Bazel's lock file to ensure it's cached in integration tests.
   # Check strings like `"default_version": "3.11"`` for default python version.
   python_version=$(grep -o '"default_version": "[0-9.]*"' MODULE.bazel.lock | grep -o '[0-9.]*')

src/test/tools/bzlmod/MODULE.bazel.lock

@@ -46,6 +46,7 @@ filegroup(
         exclude = ["fastutil.proguard"],
     ) + [
         "//tools/allowlists:srcs",
+        "//tools/android:embedded_tools",
         "//tools/bash:embedded_tools",
         "//tools/build_defs:embedded_tools",
         "//tools/build_rules:embedded_tools_srcs",
@@ -76,6 +77,7 @@ filegroup(
     name = "bzl_srcs",
     srcs = [
         "//tools:build_defs.bzl",
+        "//tools/android:bzl_srcs",
         "//tools/build_defs:bzl_srcs",
         "//tools/build_rules:bzl_srcs",
         "//tools/cpp:bzl_srcs",

src/test/tools/bzlmod/verify_default_lock_file.sh

@@ -41,6 +41,14 @@ filegroup(
     ],
 )
 
+filegroup(
+    name = "embedded_tools",
+    srcs = [
+        "BUILD.tools",
+        "android_extensions.bzl",
+    ],
+)
+
 platform(
     name = "arm64-v8a",
     constraint_values = [

tools/BUILD

@@ -0,0 +1,5 @@
+filegroup(
+    name = "bzl_srcs",
+    srcs = glob(["*.bzl"]),
+    visibility = ["//tools:__pkg__"],
+)

tools/android/BUILD

@@ -31,9 +31,9 @@ WORKSPACE_REPOS = {
         "strip_prefix": "protobuf-27.0",
     },
     "rules_java": {
-        "archive": "rules_java-8.0.0-rc2.tar.gz",
-        "sha256": "7bfdbb51bb362ecdca5d989efa3c77683ce4d431e82e2d2d7aadca33a8c35ca7",
-        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/8.0.0-rc2/rules_java-8.0.0-rc2.tar.gz"],
+        "archive": "rules_java-8.2.0.tar.gz",
+        "sha256": "c86a51fb2baf3cfd60c4f7c158df8f7a4c2066b3908107c181f2c7e8aa413a3e",
+        "urls": ["https://github.com/bazelbuild/rules_java/releases/download/8.2.0/rules_java-8.2.0.tar.gz"],
     },
     "bazel_skylib": {
         "archive": "bazel-skylib-1.6.1.tar.gz",