Add support for bazel 9.x

This doesn't flip the default bazel version, but instead makes this repo
compatible with the current version and bazel 9.x. The primary changes
for 9.x support are adding new load statements for things that were
previously built in. This cascaded into a few dep updates to pull in
their missing load statement fixes.

Author: keith

.bazelci/presubmit.yml

@@ -1,7 +1,7 @@
 # LINT.IfChange(bazelci_presubmit)
 matrix:
   platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
-  bazel: [8.x]
+  bazel: [8.x, 9.x]
 
 tasks:
   verify_targets:

.bazelrc

@@ -37,5 +37,7 @@ build --features=layering_check
 
 common --enable_platform_specific_config
 
+common --incompatible_check_testonly_for_output_files
+
 # Use clang-cl by default on Windows (see https://github.com/protocolbuffers/protobuf/issues/20085).
 build:windows --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl --extra_execution_platforms=//build_defs:x64_windows-clang-cl --host_platform=//build_defs:x64_windows-clang-cl

.bcr/presubmit.yml

@@ -3,7 +3,7 @@ bcr_test_module:
   module_path: examples
   matrix:
     platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"]
-    bazel: [8.x]
+    bazel: [8.x, 9.x]
 
   tasks:
     verify_targets:

.github/BUILD.bazel

@@ -1,3 +1,6 @@
+load("@build_bazel_apple_support//xcode:xcode_config.bzl", "xcode_config")
+load("@build_bazel_apple_support//xcode:xcode_version.bzl", "xcode_version")
+
 # This information is extracted from the MacOS runner specs located at:
 # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
 #

MODULE.bazel

@@ -13,14 +13,10 @@ module(
 # https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution
 # Thus the highest version in their module graph is resolved.
 
-bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support")
+bazel_dep(name = "apple_support", version = "1.16.0", repo_name = "build_bazel_apple_support")
 
-# Keep apple_support on 1.15.1 for now to avoid this issue:
-# https://github.com/bazelbuild/apple_support/issues/316
-single_version_override(
-    module_name = "apple_support",
-    version = "1.15.1",
-)
+# Unused but must be pinned to avoid old broken versions
+bazel_dep(name = "rules_proto", version = "7.1.0")
 
 #ifndef PROTO2_OPENSOURCE
 # LINT.IfChange
@@ -36,16 +32,16 @@ bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
 # other dependencies
 bazel_dep(name = "bazel_features", version = "1.33.0", repo_name = "proto_bazel_features")
 bazel_dep(name = "bazel_skylib", version = "1.9.0")
-bazel_dep(name = "jsoncpp", version = "1.9.6")
+bazel_dep(name = "jsoncpp", version = "1.9.6.bcr.1")
 bazel_dep(name = "rules_java", version = "8.6.1")
 bazel_dep(name = "rules_jvm_external", version = "6.7")
-bazel_dep(name = "rules_kotlin", version = "1.9.6")
+bazel_dep(name = "rules_kotlin", version = "2.2.2")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_python", version = "1.6.0")
 bazel_dep(name = "rules_rust", version = "0.63.0")
 
-bazel_dep(name = "rules_ruby", version = "0.17.3", dev_dependency = True)
+bazel_dep(name = "rules_ruby", version = "0.20.1", dev_dependency = True)
 
 # Workaround for https://github.com/bazelbuild/bazel-central-registry/issues/4230
 # rules_fuzzing 0.5.3 is not yet available in BCR.
@@ -65,12 +61,11 @@ single_version_override(
     patch_strip = 1,
     patches = [
         "@com_google_protobuf//:Disable_bundle_install.patch",
-        "@com_google_protobuf//:Neverlink_jruby_jars.patch",
     ],
-    version = "0.17.3",
 )
 
-bazel_dep(name = "rules_shell", version = "0.2.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.22.5")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 bazel_dep(name = "platforms", version = "0.0.11")
 
 # Ruby toolchains
@@ -267,7 +262,7 @@ protobuf_maven_dev.install(
 )
 use_repo(protobuf_maven_dev, "protobuf_maven_dev")
 
-bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True)
+bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True)
 bazel_dep(name = "rules_buf", version = "0.3.0", dev_dependency = True)
 bazel_dep(name = "rules_testing", version = "0.9.0", dev_dependency = True)
 bazel_dep(
@@ -302,6 +297,7 @@ archive_override(
         "@com_google_protobuf//:patches/protobuf_v25/0005-Make-rules_ruby-a-dev-only-dependency.patch",
         "@com_google_protobuf//:patches/protobuf_v25/0006-Add-repo_name.patch",
         "@com_google_protobuf//:patches/protobuf_v25/0007-Java-bazel8.patch",
+        "@com_google_protobuf//:patches/protobuf_v25/0008-bazel9.patch",
     ],
     strip_prefix = "protobuf-25.0",
     urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v25.0/protobuf-25.0.tar.gz"],
@@ -314,6 +310,7 @@ archive_override(
     patch_strip = 1,
     patches = [
         "@com_google_protobuf//:patches/protobuf_v29/0001-Update-module-name.patch",
+        "@com_google_protobuf//:patches/protobuf_v29/0002-bazel9.patch",
     ],
     strip_prefix = "protobuf-29.0",
     urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v29.0/protobuf-29.0.tar.gz"],

Neverlink_jruby_jars.patch

@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+
 cc_binary(
     name = "file_concat",
     srcs = [

bazel/private/file_concat/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("//bazel:proto_descriptor_set.bzl", "proto_descriptor_set")
 load("//bazel:proto_library.bzl", "proto_library")
 load(":bazel_proto_library_tests.bzl", "bazel_proto_library_test_suite")

bazel/tests/BUILD

@@ -649,7 +649,7 @@ def _test_experimental_proto_descriptor_sets_include_source_info(name):
         name = name,
         target = name + "_a_proto",
         impl = _test_experimental_proto_descriptor_sets_include_source_info_impl,
-        config_settings = {"//bazel/flags:experimental_proto_descriptor_sets_include_source_info": True},
+        config_settings = {"@@//bazel/flags:experimental_proto_descriptor_sets_include_source_info": True},
     )
 
 def _test_experimental_proto_descriptor_sets_include_source_info_impl(env, target):

bazel/tests/bazel_proto_library_tests.bzl

@@ -10,26 +10,28 @@ if(${CMAKE_VERSION} VERSION_GREATER 3.16 OR ${CMAKE_VERSION} VERSION_EQUAL 3.16)
   include_guard()
 endif()
 
-set(apple_support-version "1.15.1")
+set(apple_support-version "1.16.0")
+set(rules_proto-version "7.1.0")
 set(abseil-cpp-version "20250512.1")
 set(rules_cc-version "0.0.17")
-set(zlib-version "1.3.1.bcr.5")
+set(zlib-version "1.3.1")
 set(bazel_features-version "1.33.0")
 set(bazel_skylib-version "1.9.0")
 set(jsoncpp-version "1.9.6")
 set(rules_java-version "8.6.1")
 set(rules_jvm_external-version "6.7")
-set(rules_kotlin-version "1.9.6")
+set(rules_kotlin-version "2.2.2")
 set(rules_license-version "1.0.0")
 set(rules_pkg-version "1.0.1")
 set(rules_python-version "1.6.0")
 set(rules_rust-version "0.63.0")
-set(rules_ruby-version "0.17.3")
+set(rules_ruby-version "0.20.1")
 set(rules_fuzzing-version "0.5.3")
-set(rules_shell-version "0.2.0")
+set(aspect_bazel_lib-version "2.22.5")
+set(rules_shell-version "0.6.1")
 set(platforms-version "0.0.11")
-set(re2-version "2024-07-02.bcr.1")
-set(googletest-version "1.15.2")
+set(re2-version "2024-07-02")
+set(googletest-version "1.17.0")
 set(rules_buf-version "0.3.0")
 set(rules_testing-version "0.9.0")
 set(abseil-py-version "2.1.0")