Changes required to support Bazel 9

.bazelci/presubmit.yml

@@ -32,32 +32,25 @@ x_defaults:
 # NOTE: To avoid listing the same things for build_flags/test_flags for each
 # of these tasks, they are listed in the .bazelrc instead.
 tasks:
-  macos_7.x:
-    name: "7.x"
-    bazel: 7.x
-    <<: *common
-
   macos_8.x:
     name: "8.x"
     bazel: 8.x
     <<: *common
 
-  # TODO: Re-enable when we fix bazel 9.x
-  # macos_last_rc:
-  #   name: "Last RC Bazel"
-  #   bazel: last_rc
-  #   <<: *common
-
-  macos_last_green:
-    name: "Last Green Bazel"
-    # TODO: Move back to last_green ASAP
-    bazel: 5409637c4e2d5c010b7264172b1004a2afd46bfe
+  macos_9.x:
+    name: "9.x"
+    bazel: 9.x
     <<: *common
 
+  # TODO: Enable ASAP when we remove usage of `//command_line_option:incompatible_enable_apple_toolchain_resolution`
+  # macos_last_green:
+  #   name: "Last Green Bazel"
+  #   bazel: last_green
+  #   <<: *common
+
   doc_tests:
     name: "Doc tests"
-    # TODO: Move back to last_green once rules_cc is fixed
-    bazel: 48555196ef92f54d0a331a01dac9db0a6aabc8b4
+    bazel: 9.x # TODO: use last_green when we fix issues
     platform: ubuntu2004
     test_targets:
     - "doc/..."

.bazelversion

@@ -1 +1 @@
-5409637c4e2d5c010b7264172b1004a2afd46bfe
+rolling

.bcr/presubmit.yml

@@ -1,5 +1,5 @@
 matrix:
-  bazel: ["7.x", "8.x"]
+  bazel: ["8.x", "9.x"]
 
 tasks:
   verify_targets:

MODULE.bazel

@@ -7,26 +7,19 @@ module(
     compatibility_level = 1,
 )
 
-bazel_dep(name = "apple_support", version = "1.21.1", repo_name = "build_bazel_apple_support")
-bazel_dep(name = "bazel_features", version = "1.30.0")
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "rules_cc", version = "0.1.2")
+bazel_dep(name = "apple_support", version = "2.2.0", repo_name = "build_bazel_apple_support")
+bazel_dep(name = "bazel_features", version = "1.36.0")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.2.17")
 bazel_dep(
     name = "rules_swift",
-    version = "2.4.0",
+    version = "3.5.0",
     max_compatibility_level = 3,
     repo_name = "build_bazel_rules_swift",
 )
-
-# Test with latest rules_swift without requiring users to use this version
-single_version_override(
-    module_name = "rules_swift",
-    version = "3.0.2",
-)
-
-bazel_dep(name = "rules_python", version = "1.3.0")
-bazel_dep(name = "rules_shell", version = "0.3.0")
+bazel_dep(name = "rules_python", version = "1.7.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 
 bazel_dep(
     name = "stardoc",

apple/internal/BUILD

@@ -195,6 +195,19 @@ bzl_library(
     ],
 )
 
+bzl_library(
+    name = "compilation_support",
+    srcs = ["compilation_support.bzl"],
+    visibility = [
+        "//apple:__subpackages__",
+    ],
+    deps = [
+        ":platform_support",
+        "@bazel_skylib//lib:paths",
+        "@rules_cc//cc/common",
+    ],
+)
+
 bzl_library(
     name = "entitlements_support",
     srcs = ["entitlements_support.bzl"],
@@ -329,12 +342,14 @@ bzl_library(
     ],
     deps = [
         ":apple_toolchains",
-        ":cc_toolchain_info_support",
+        ":compilation_support",
         ":entitlements_support",
+        ":intermediates",
         ":providers",
         ":rule_support",
         "@bazel_skylib//lib:collections",
         "@build_bazel_apple_support//lib:lipo",
+        "@rules_cc//cc/private/rules_impl:objc_common",
     ],
 )