Revert "Pin to bazel 8.4.2 (#3804)"

.bazelci/presubmit.yml

@@ -964,12 +964,6 @@ tasks:
     working_directory: examples/proto
     build_targets:
       - "//..."
-  bzlmod_protoc:
-    name: Proto and Prost with prebuilt protoc with bzlmod
-    platform: ubuntu2204
-    working_directory: examples/proto_with_toolchain
-    build_targets:
-      - "//..."
   compile_one_dependency:
     name: --compile_one_dependency flag
     platform: ubuntu2204

.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/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/tests/cargo_build_script/tools_exec/tools_exec.rs

@@ -2,7 +2,8 @@
 pub fn test_tool_exec() {
     let tool_path = env!("TOOL_PATH");
     assert!(
-        tool_path.contains("-exec-"),
-        "tool_path did not contain '-exec-'",
+        tool_path.contains("-exec-") || tool_path.contains("-exec/bin/"),
+        "tool_path did not contain '-exec-' or '-exec/bin'\n`{}`",
+        tool_path,
     );
 }

cargo/tests/unit/build_script_deps/build_script_deps.bzl

@@ -42,7 +42,11 @@ def _build_script_deps_test_impl(ctx):
         if output.path.endswith(".rlib")
     ][0]
 
-    asserts.true(env, "-exec-" in rlib_output.path)
+    asserts.true(
+        env,
+        ("-exec-" in rlib_output.path) or ("-exec/bin/" in rlib_output.path),
+        "Expected rlib output to be in an exec configuration, but got: {}".format(rlib_output.path),
+    )
     return analysistest.end(env)
 
 build_script_deps_test = analysistest.make(

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

@@ -15,14 +15,14 @@ local_path_override(
 
 bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_cc", version = "0.2.8")
-bazel_dep(name = "rules_java", version = "8.13.0")
-bazel_dep(name = "rules_jvm_external", version = "6.6")
+bazel_dep(name = "rules_java", version = "9.6.1")
+bazel_dep(name = "rules_jvm_external", version = "6.10")
 
 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_ndk", version = "0.1.3")
+bazel_dep(name = "rules_android", version = "0.7.1")
+bazel_dep(name = "rules_android_ndk", version = "0.1.5")
 
 ###############################################################################
 # T O O L C H A I N S

examples/crate_universe/MODULE.bazel

@@ -16,7 +16,7 @@ local_path_override(
 )
 
 bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "rules_cc", version = "0.2.8")
+bazel_dep(name = "rules_cc", version = "0.2.17")
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
 
 bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
@@ -561,7 +561,7 @@ using_cxx = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
 using_cxx.spec(
     package = "cxx",
     repositories = ["using_cxx"],
-    version = "1.0.109",
+    version = "1.0.194",
 )
 using_cxx.splicing_config(
     repositories = ["using_cxx"],
@@ -588,20 +588,23 @@ rust_binary(
     name = "cxxbridge-cmd",
     srcs = glob(["src/**/*.rs"]),
     aliases = aliases(),
-    compile_data = [
-        "src/gen/include/cxx.h",
-    ],
+    compile_data = glob(["src/gen/**"]),
     edition = "2021",
+    rustc_env = {
+        "CARGO_PKG_VERSION_MAJOR": "1",
+        "CARGO_PKG_VERSION_MINOR": "0",
+        "CARGO_PKG_VERSION_PATCH": "194",
+    },
     visibility = ["//visibility:public"],
     deps = all_crate_deps(
         normal = True,
     ),
 )
     """,
-    sha256 = "d93600487d429c8bf013ee96719af4e62e809ac57fc4cac24f17cf58e4526009",
-    strip_prefix = "cxxbridge-cmd-1.0.109",
+    sha256 = "d0956799fa8678d4c50eed028f2de1c0552ae183c76e976cf7ca8c4e36a7c328",
+    strip_prefix = "cxxbridge-cmd-1.0.194",
     type = "tar.gz",
-    urls = ["https://static.crates.io/crates/cxxbridge-cmd/cxxbridge-cmd-1.0.109.crate"],
+    urls = ["https://static.crates.io/crates/cxxbridge-cmd/cxxbridge-cmd-1.0.194.crate"],
 )
 
 cxxbridge_cmd_deps = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
@@ -653,7 +656,7 @@ use_repo(
     "cvm",
     "cvm__serde_yaml-0.9.34-deprecated",
     "cvm__tempfile-3.27.0",
-    "cvm__tokio-1.50.0",
+    "cvm__tokio-1.51.0",
     "cvm__tokio-test-0.4.5",
 )