Revert "Pin to bazel 8.4.2 (#3804)"

.bazelci/presubmit.yml

@@ -81,6 +81,10 @@ crate_universe_vendor_example_targets: &crate_universe_vendor_example_targets
   - "//vendor_remote_manifests:crates_vendor"
   - "//vendor_remote_pkgs:crates_vendor"
   - "@rules_rust//tools/rust_analyzer:gen_rust_project"
+# TODO: `rules_cc` currently fails coverage invocations on Bazel 9
+# https://github.com/bazelbuild/rules_cc/issues/613
+coverage_build_flags: &coverage_build_flags
+  - --test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1
 coverage_validation_post_shell_commands: &coverage_validation_post_shell_commands
   - |
     grep -q '^SF:.*\.rs$' bazel-out/_coverage/_coverage_report.dat \
@@ -97,6 +101,7 @@ tasks:
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
     run_targets:
       - //test:query_test_binary
@@ -111,6 +116,7 @@ tasks:
     build_targets: *default_macos_targets
     test_targets: *default_macos_targets
     coverage_targets: *default_macos_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   windows:
     build_targets: *default_windows_targets
@@ -123,6 +129,7 @@ tasks:
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
     run_targets:
       - //test:query_test_binary
@@ -141,6 +148,7 @@ tasks:
     build_targets: *default_macos_targets
     test_targets: *default_macos_targets
     coverage_targets: *default_macos_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   windows_no_bzlmod:
     name: No Bzlmod
@@ -162,12 +170,14 @@ tasks:
     platform: ubuntu2204
     shell_commands: *split_coverage_postprocessing_shell_commands
     coverage_targets: *default_linux_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   macos_split_coverage_postprocessing:
     name: Split Coverage Postprocessing
     platform: macos_arm64
     shell_commands: *split_coverage_postprocessing_shell_commands
     coverage_targets: *default_macos_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   ubuntu2204_opt:
     name: Opt Mode
@@ -203,6 +213,7 @@ tasks:
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   rbe_ubuntu2204_with_aspects:
     name: With Aspects
@@ -231,6 +242,7 @@ tasks:
     build_targets: *default_macos_targets
     test_targets: *default_macos_targets
     coverage_targets: *default_macos_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   macos_rolling_with_aspects:
     name: "Macos Rolling Bazel Version With Aspects"
@@ -239,6 +251,7 @@ tasks:
     build_targets: *default_macos_targets
     test_targets: *default_macos_targets
     coverage_targets: *default_macos_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
     soft_fail: yes
     bazel: "rolling"
@@ -335,6 +348,7 @@ tasks:
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   ubuntu1804_with_aspects:
     name: "Min Bazel Version With Aspects"
@@ -345,6 +359,7 @@ tasks:
     test_targets: *default_linux_targets
     build_flags: *aspects_flags
     coverage_targets: *default_linux_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   ubuntu2204_min_rust_version:
     name: "Min Rust Version"
@@ -411,6 +426,7 @@ tasks:
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
+    coverage_flags: *coverage_build_flags
     post_shell_commands: *coverage_validation_post_shell_commands
   linux_docs:
     name: Docs

.bcr/extensions/bindgen/presubmit.yml

@@ -6,7 +6,7 @@ bcr_test_module:
       - "ubuntu2004"
       # # TODO: https://github.com/bazelbuild/rules_rust/issues/2009
       # - "windows"
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/extensions/mdbook/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["macos_arm64", "ubuntu2004", "windows"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/extensions/prost/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["macos_arm64", "ubuntu2004", "windows"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/extensions/protobuf/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["macos_arm64", "ubuntu2004", "windows"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/extensions/pyo3/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["macos_arm64", "ubuntu2004", "windows"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/extensions/wasm_bindgen/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["ubuntu2004", "windows"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"
@@ -16,7 +16,7 @@ bcr_test_module_macos:
   module_path: ""
   matrix:
     platform: ["macos_arm64"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["macos_arm64", "ubuntu2004"]
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       working_directory: examples/hello_world
@@ -21,7 +21,7 @@ bcr_test_module:
 bcr_test_module_windows:
   module_path: ""
   matrix:
-    bazel: ["7.x", "8.x"]
+    bazel: ["7.x", "8.x", "9.x"]
   tasks:
     run_tests:
       working_directory: examples/hello_world

cargo/private/cargo_build_script_runner/bin.rs

@@ -237,6 +237,19 @@ fn run_buildrs() -> Result<(), String> {
             .drain_runfiles_dir(&out_dir_abs)
             .unwrap();
     }
+
+    // If out_dir is empty add an empty file to the directory to avoid an upstream Bazel bug
+    // https://github.com/bazelbuild/bazel/issues/28286
+    if out_dir_abs.read_dir().map(|read| read.count()).unwrap_or(1) == 0 {
+        std::fs::write(out_dir_abs.join(".empty"), "").unwrap_or_else(|e| {
+            panic!(
+                "Failed to write empty file to OUT_DIR `{}`\n{:?}",
+                out_dir_abs.display(),
+                e
+            )
+        })
+    }
+
     Ok(())
 }
 

cargo/private/cargo_build_script_runner/cargo_manifest_dir.rs

@@ -273,6 +273,25 @@ impl RunfilesMaker {
                 )
             })?;
         }
+
+        // If the runfiles dir is empty add an empty file to the directory to
+        // avoid an upstream Bazel bug https://github.com/bazelbuild/bazel/issues/28286
+        if self
+            .output_dir
+            .read_dir()
+            .map(|read| read.count())
+            .unwrap_or(1)
+            == 0
+        {
+            std::fs::write(self.output_dir.join(".empty"), "").unwrap_or_else(|e| {
+                panic!(
+                    "Failed to write empty file to OUT_DIR `{}`\n{:?}",
+                    self.output_dir.display(),
+                    e
+                )
+            })
+        }
+
         Ok(())
     }
 

examples/android/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library")
+load("@rules_android//android:rules.bzl", "android_binary", "android_library")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_rust//rust:defs.bzl", "rust_library")
 

examples/android/MODULE.bazel

@@ -21,7 +21,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.6")
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 use_repo(maven, "maven")
 
-bazel_dep(name = "rules_android", version = "0.6.0", repo_name = "build_bazel_rules_android")
+bazel_dep(name = "rules_android", version = "0.7.1")
 bazel_dep(name = "rules_android_ndk", version = "0.1.3")
 
 ###############################################################################

examples/ios/BUILD.bazel

@@ -1,5 +1,5 @@
-load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
-load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application")
+load("@rules_apple//apple:ios.bzl", "ios_application")
+load("@rules_apple//apple:macos.bzl", "macos_application")
 load("@rules_cc//cc:defs.bzl", "cc_library", "objc_library")
 load("@rules_rust//rust:defs.bzl", "rust_library")
 
@@ -62,7 +62,7 @@ platform(
     constraint_values = [
         "@platforms//cpu:x86_64",
         "@platforms//os:ios",
-        "@build_bazel_apple_support//constraints:simulator",
+        "@apple_support//constraints:simulator",
     ],
 )
 
@@ -71,7 +71,7 @@ platform(
     constraint_values = [
         "@platforms//cpu:arm64",
         "@platforms//os:ios",
-        "@build_bazel_apple_support//constraints:simulator",
+        "@apple_support//constraints:simulator",
     ],
 )
 
@@ -80,6 +80,6 @@ platform(
     constraint_values = [
         "@platforms//cpu:arm64",
         "@platforms//os:ios",
-        "@build_bazel_apple_support//constraints:device",
+        "@apple_support//constraints:device",
     ],
 )

examples/ios/MODULE.bazel

@@ -13,9 +13,9 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "rules_apple", version = "4.2.0", repo_name = "build_bazel_rules_apple")
-bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support")
-bazel_dep(name = "rules_swift", version = "3.1.2", repo_name = "build_bazel_rules_swift")
+bazel_dep(name = "rules_apple", version = "4.3.3")
+bazel_dep(name = "apple_support", version = "2.3.0")
+bazel_dep(name = "rules_swift", version = "3.4.2")
 bazel_dep(name = "rules_cc", version = "0.2.4")
 
 ###############################################################################

examples/ios_build/BUILD.bazel

@@ -64,7 +64,7 @@ platform(
     constraint_values = [
         "@platforms//cpu:x86_64",
         "@platforms//os:ios",
-        "@build_bazel_apple_support//constraints:simulator",
+        "@apple_support//constraints:simulator",
     ],
 )
 
@@ -73,7 +73,7 @@ platform(
     constraint_values = [
         "@platforms//cpu:arm64",
         "@platforms//os:ios",
-        "@build_bazel_apple_support//constraints:simulator",
+        "@apple_support//constraints:simulator",
     ],
 )
 
@@ -82,6 +82,6 @@ platform(
     constraint_values = [
         "@platforms//cpu:arm64",
         "@platforms//os:ios",
-        "@build_bazel_apple_support//constraints:device",
+        "@apple_support//constraints:device",
     ],
 )

examples/ios_build/MODULE.bazel

@@ -13,9 +13,9 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "rules_apple", version = "4.2.0", repo_name = "build_bazel_rules_apple")
-bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support")
-bazel_dep(name = "rules_swift", version = "3.1.2", repo_name = "build_bazel_rules_swift")
+bazel_dep(name = "rules_apple", version = "4.3.3")
+bazel_dep(name = "apple_support", version = "2.3.0")
+bazel_dep(name = "rules_swift", version = "3.4.2")
 bazel_dep(name = "rules_shell", version = "0.6.1")
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
 bazel_dep(name = "platforms", version = "1.0.0")