Support Bazel 9 (#3286)

aaronsky · web-flow · commit 6dbe31f7d81b · 2026-03-06T10:25:49.000-06:00
Iterating on #3266 - Bumps CI config to `[8.x, 9.x, last_green]` - Does not bump BCR tests – should we do that? - Does not fix HEAD tests due to patches needed in rules_apple - Updates rules_apple, rules_swift, rules_cc, and more to align with transitive deps required for Bazel 9 support - Updates loads across the repo for newly-starlarkified things (objc_library, cc_library, toolchain_utils.bzl, etc) - Fixes some broken tests --------- Signed-off-by: Aaron Sky <aaronsky@skyaaron.com>
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-8.x
+9.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,7 +52,7 @@ END_UNRELEASED_TEMPLATE
 
 ### Adjusted
 
-* TBD
+* Added support for Bazel 9: [#3286](https://github.com/MobileNativeFoundation/rules_xcodeproj/pull/3286)
 
 ### Fixed
 
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -6,19 +6,25 @@ module(
     repo_name = "rules_xcodeproj",
 )
 
-bazel_dep(name = "bazel_features", version = "1.3.0")
-bazel_dep(name = "bazel_skylib", version = "1.3.0")
+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.9.0")
+bazel_dep(name = "rules_cc", version = "0.2.17")
 bazel_dep(
     name = "rules_swift",
-    version = "3.1.1",
+    version = "3.5.0",
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(
     name = "rules_apple",
-    version = "4.0.1",
+    version = "4.4.0",
     repo_name = "build_bazel_rules_apple",
 )
-bazel_dep(name = "rules_python", version = "0.27.1")
+bazel_dep(name = "rules_python", version = "1.7.0")
 
 internal = use_extension("//xcodeproj:extensions.bzl", "internal")
 use_repo(internal, "rules_xcodeproj_generated")
@@ -32,12 +38,6 @@ use_repo(
 
 # Non-release dependencies
 
-bazel_dep(
-    name = "apple_support",
-    version = "1.21.0",
-    dev_dependency = True,
-    repo_name = "build_bazel_apple_support",
-)
 bazel_dep(
     name = "buildifier_prebuilt",
     version = "6.3.3",
@@ -50,22 +50,16 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_shell",
-    version = "0.5.0",
+    version = "0.6.1",
     dev_dependency = True,
 )
 bazel_dep(
     name = "stardoc",
-    version = "0.6.1",
+    version = "0.8.0",
     dev_dependency = True,
     repo_name = "io_bazel_stardoc",
 )
 
-# Some of our deps are forcing a new stardoc on us, so pinning for now
-single_version_override(
-    module_name = "stardoc",
-    version = "0.6.1",
-)
-
 apple_cc_configure = use_extension(
     "@build_bazel_apple_support//crosstool:setup.bzl",
     "apple_cc_configure_extension",
diff --git a/buildbuddy.yaml b/buildbuddy.yaml
@@ -19,10 +19,10 @@ x_templates:
       env: {}
     - &bazel_previous_lts
       env:
-        USE_BAZEL_VERSION: 7.x
+        USE_BAZEL_VERSION: 8.x
     - &bazel_lts
       env:
-        USE_BAZEL_VERSION: 8.x
+        USE_BAZEL_VERSION: 9.x
     - &bazel_head
       env:
         USE_BAZEL_VERSION: last_green
diff --git a/docs/bazel.md b/docs/bazel.md
diff --git a/examples/integration/Bundle/BUILD b/examples/integration/Bundle/BUILD
@@ -1,4 +1,5 @@
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_bundle")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 cc_library(
     name = "aplugin.library",
diff --git a/examples/integration/CommandLine/CommandLineTool/BUILD b/examples/integration/CommandLine/CommandLineTool/BUILD
@@ -1,6 +1,7 @@
 load("@build_bazel_rules_apple//apple:apple.bzl", "apple_universal_binary")
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_binary")
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 
 macos_command_line_application(
     name = "CommandLineTool",
diff --git a/examples/integration/CommandLine/CommandLineToolLib/BUILD b/examples/integration/CommandLine/CommandLineToolLib/BUILD
@@ -1,4 +1,6 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 
 objc_library(
     name = "lib_defines",
diff --git a/examples/integration/CommandLine/external/BUILD.tpl b/examples/integration/CommandLine/external/BUILD.tpl
@@ -2,6 +2,8 @@ load(
     "@build_bazel_rules_apple//apple:apple.bzl",
     "apple_static_framework_import",
 )
+load("@rules_cc//cc:objc_import.bzl", "objc_import")
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 
 apple_static_framework_import(
     name = "ExternalFramework",
diff --git a/examples/integration/CommandLine/swift_interop_hint/BUILD b/examples/integration/CommandLine/swift_interop_hint/BUILD
@@ -2,6 +2,7 @@ load(
     "@build_bazel_rules_swift//swift:swift_interop_hint.bzl",
     "swift_interop_hint",
 )
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 cc_library(
     name = "c_lib",
diff --git a/examples/integration/MODULE.bazel b/examples/integration/MODULE.bazel
@@ -5,22 +5,23 @@ bazel_dep(
 )
 bazel_dep(
     name = "apple_support",
-    version = "1.21.0",
+    version = "2.2.0",
     repo_name = "build_bazel_apple_support",
 )
+bazel_dep(name = "rules_cc", version = "0.2.17")
 bazel_dep(
     name = "rules_apple",
-    version = "4.0.1",
+    version = "4.4.0",
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(
     name = "rules_swift",
-    version = "3.1.1",
+    version = "3.5.0",
     repo_name = "build_bazel_rules_swift",
 )
-bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "protobuf", version = "29.0")
-bazel_dep(name = "rules_shell", version = "0.5.0")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
+bazel_dep(name = "protobuf", version = "34.0.bcr.1")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 bazel_dep(
     name = "examples_cc_external",
     version = "0.0.1",
@@ -30,7 +31,7 @@ bazel_dep(
     version = "0.0.1",
 )
 
-bazel_dep(name = "bazel_features", version = "1.1.1", dev_dependency = True)
+bazel_dep(name = "bazel_features", version = "1.36.0", dev_dependency = True)
 
 local_path_override(
     module_name = "examples_cc_external",
diff --git a/examples/integration/cc/external/BUILD b/examples/integration/cc/external/BUILD
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load(":local_includes.bzl", "local_includes")
 
 cc_library(
diff --git a/examples/integration/cc/external/MODULE.bazel b/examples/integration/cc/external/MODULE.bazel
@@ -5,3 +5,4 @@ module(
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "rules_cc", version = "0.2.17")
diff --git a/examples/integration/cc/lib/BUILD b/examples/integration/cc/lib/BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 cc_library(
     name = "cc_lib_defines",
     srcs = [
diff --git a/examples/integration/cc/lib/impl/BUILD b/examples/integration/cc/lib/impl/BUILD
@@ -1,4 +1,5 @@
 load("@examples_cc_external//:local_includes.bzl", "local_includes")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 cc_library(
     name = "cc_lib_impl",
diff --git a/examples/integration/cc/lib2/BUILD b/examples/integration/cc/lib2/BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 cc_library(
     name = "cc_lib_impl",
     srcs = [
diff --git a/examples/integration/cc/lib3/BUILD b/examples/integration/cc/lib3/BUILD
@@ -1,3 +1,6 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 cc_library(
     name = "cc_lib_impl",
     srcs = [
diff --git a/examples/integration/cc/tool/BUILD b/examples/integration/cc/tool/BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+
 cc_binary(
     name = "tool",
     srcs = ["main.c"],
diff --git a/examples/integration/iOSApp/Source/CoreUtilsMixed/MixedAnswer/BUILD b/examples/integration/iOSApp/Source/CoreUtilsMixed/MixedAnswer/BUILD
@@ -3,6 +3,7 @@ load(
     "swift_interop_hint",
     "swift_library",
 )
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 load(
     ":module_map.bzl",
     "module_map",
diff --git a/examples/integration/iOSApp/Source/CoreUtilsMixed/MixedAnswer/module_map.bzl b/examples/integration/iOSApp/Source/CoreUtilsMixed/MixedAnswer/module_map.bzl
@@ -1,6 +1,8 @@
 """ Allows for the creation of modulemaps given a list of headers """
 
 load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 HEADERS_FILE_TYPES = [
     ".h",
diff --git a/examples/integration/iOSApp/Source/CoreUtilsObjC/BUILD b/examples/integration/iOSApp/Source/CoreUtilsObjC/BUILD
@@ -1,4 +1,5 @@
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_framework")
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 
 objc_library(
     name = "CoreUtilsObjC",
diff --git a/examples/integration/iOSApp/Source/Utils/BUILD b/examples/integration/iOSApp/Source/Utils/BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
+
 objc_library(
     name = "Utils",
     srcs = glob(
diff --git a/examples/integration/iOSApp/Test/ObjCUnitTests/BUILD b/examples/integration/iOSApp/Test/ObjCUnitTests/BUILD
@@ -7,6 +7,7 @@ load(
     "@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl",
     "ios_test_runner",
 )
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 
 ios_unit_test(
     name = "iOSAppObjCUnitTests",
diff --git a/examples/integration/iOSApp/external/MODULE.bazel b/examples/integration/iOSApp/external/MODULE.bazel
@@ -6,6 +6,6 @@ module(
 
 bazel_dep(
     name = "rules_apple",
-    version = "4.0.1",
+    version = "4.4.0",
     repo_name = "build_bazel_rules_apple",
 )
diff --git a/examples/integration/repositories.bzl b/examples/integration/repositories.bzl
@@ -76,6 +76,8 @@ apple_dynamic_xcframework_import(
     http_archive(
         name = "FXPageControl",
         build_file_content = """
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
+
 objc_library(
     name = "FXPageControl",
     module_name = "FXPageControl",
diff --git a/examples/sanitizers/UndefinedBehaviorSanitizerApp/BUILD b/examples/sanitizers/UndefinedBehaviorSanitizerApp/BUILD
@@ -1,4 +1,5 @@
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 
 ios_application(
     name = "UndefinedBehaviorSanitizerApp",
diff --git a/xcodeproj/automatic_target_info.bzl b/xcodeproj/automatic_target_info.bzl
@@ -6,6 +6,7 @@ load(
     "AppleFrameworkImportInfo",
     "AppleResourceBundleInfo",
 )
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//xcodeproj:xcodeprojinfo.bzl", "target_type")
 load("//xcodeproj/internal:memory_efficiency.bzl", "EMPTY_LIST", "NONE_LIST")
 
diff --git a/xcodeproj/internal/compilation_providers.bzl b/xcodeproj/internal/compilation_providers.bzl
@@ -1,6 +1,7 @@
 """Module for propagating compilation providers."""
 
 load("@bazel_features//:features.bzl", "bazel_features")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load(
     ":memory_efficiency.bzl",
     "EMPTY_DEPSET",
diff --git a/xcodeproj/internal/processed_targets/library_targets.bzl b/xcodeproj/internal/processed_targets/library_targets.bzl
@@ -3,6 +3,7 @@
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("@build_bazel_rules_apple//apple:providers.bzl", "AppleDebugOutputsInfo")
 load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo", "SwiftProtoInfo")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//xcodeproj/internal:build_settings.bzl", "get_product_module_name")
 load("//xcodeproj/internal:compilation_providers.bzl", "compilation_providers")
 load("//xcodeproj/internal:compiler_args.bzl", "compiler_args")
diff --git a/xcodeproj/internal/processed_targets/mixed_language_library_targets.bzl b/xcodeproj/internal/processed_targets/mixed_language_library_targets.bzl
@@ -3,6 +3,7 @@
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("@build_bazel_rules_apple//apple:providers.bzl", "AppleDebugOutputsInfo")
 load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//xcodeproj:xcodeprojinfo.bzl", "XcodeProjInfo")
 load("//xcodeproj/internal:build_settings.bzl", "get_product_module_name")
 load("//xcodeproj/internal:compilation_providers.bzl", "compilation_providers")
diff --git a/xcodeproj/internal/processed_targets/top_level_targets.bzl b/xcodeproj/internal/processed_targets/top_level_targets.bzl
@@ -10,6 +10,7 @@ load(
     "AppleResourceInfo",
 )
 load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo", "SwiftProtoInfo")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//xcodeproj:xcodeprojinfo.bzl", "XcodeProjInfo")
 load(
     "//xcodeproj/internal:build_settings.bzl",
diff --git a/xcodeproj/internal/processed_targets/unsupported_targets.bzl b/xcodeproj/internal/processed_targets/unsupported_targets.bzl
@@ -4,6 +4,7 @@ load(
     "@build_bazel_rules_apple//apple:providers.bzl",
     "AppleResourceBundleInfo",
 )
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//xcodeproj/internal:compilation_providers.bzl", "compilation_providers")
 load("//xcodeproj/internal:configuration.bzl", "calculate_configuration")
 load("//xcodeproj/internal:dependencies.bzl", "dependencies")
diff --git a/xcodeproj/internal/products.bzl b/xcodeproj/internal/products.bzl
@@ -1,6 +1,7 @@
 """Module for collecting product information for a target."""
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//xcodeproj/internal/files:files.bzl", "join_paths_ignoring_empty")
 load("//xcodeproj/internal/files:linker_input_files.bzl", "linker_input_files")
 
diff --git a/xcodeproj/internal/xcodeproj_aspect.bzl b/xcodeproj/internal/xcodeproj_aspect.bzl
@@ -73,7 +73,7 @@ def _xcodeproj_aspect_attrs(
             executable = True,
         ),
         "_cc_toolchain": attr.label(default = Label(
-            "@bazel_tools//tools/cpp:current_cc_toolchain",
+            "@rules_cc//cc:current_cc_toolchain",
         )),
         "_colorize": attr.label(
             default = Label("//xcodeproj:color"),
diff --git a/xcodeproj/internal/xcodeproj_factory.bzl b/xcodeproj/internal/xcodeproj_factory.bzl
@@ -1,6 +1,6 @@
 """Module to create `xcodeproj` rules and transitions."""
 
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "use_cpp_toolchain")
+load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
 load(":xcodeproj_aspect.bzl", "xcodeproj_aspect")
 load(":xcodeproj_rule.bzl", "xcodeproj_rule")
 load(":xcodeproj_transitions.bzl", "XCODEPROJ_TRANSITION_ATTRS")
@@ -22,7 +22,7 @@ def _make_xcodeproj_aspect(
         attr_aspects = ["*"],
         attrs = attrs,
         fragments = ["apple", "cpp", "objc"],
-        toolchains = use_cpp_toolchain(),
+        toolchains = use_cc_toolchain(),
     )
 
 def _make_xcodeproj_rule(
diff --git a/xcodeproj/repositories.bzl b/xcodeproj/repositories.bzl
@@ -235,6 +235,8 @@ swift_library(
         http_archive,
         name = "com_github_michaeleisel_jjliso8601dateformatter",
         build_file_content = """\
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
+
 objc_library(
     name = "JJLISO8601DateFormatter",
     srcs = glob(["Sources/JJLISO8601DateFormatter/**/*"]),
@@ -264,6 +266,8 @@ objc_library(
         http_archive,
         name = "com_github_michaeleisel_zippyjsoncfamily",
         build_file_content = """\
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
+
 objc_library(
     name = "ZippyJSONCFamily",
     copts = [
diff --git a/xcodeproj/xcodeproj_cache_warm_aspect.bzl b/xcodeproj/xcodeproj_cache_warm_aspect.bzl
@@ -8,6 +8,7 @@ bundle, or codesign as well (which we don't cache anyway).
 
 load("@build_bazel_rules_apple//apple:providers.bzl", "AppleResourceInfo")
 load("@build_bazel_rules_swift//swift:providers.bzl", "SwiftInfo")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 _BUNDLING_RULE_KINDS = set([
     "ios_app_clip",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`load("@build_bazel_rules_apple//apple:macos.bzl", "macos_bundle")`
	`2`	`+load("@rules_cc//cc:cc_library.bzl", "cc_library")`
`2`	`3`
`3`	`4`	`cc_library(`
`4`	`5`	`name = "aplugin.library",`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@ load(`
`2`	`2`	`"@build_bazel_rules_apple//apple:apple.bzl",`
`3`	`3`	`"apple_static_framework_import",`
`4`	`4`	`)`
	`5`	`+load("@rules_cc//cc:objc_import.bzl", "objc_import")`
	`6`	`+load("@rules_cc//cc:objc_library.bzl", "objc_library")`
`5`	`7`
`6`	`8`	`apple_static_framework_import(`
`7`	`9`	`name = "ExternalFramework",`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ load(`
`2`	`2`	`"@build_bazel_rules_swift//swift:swift_interop_hint.bzl",`
`3`	`3`	`"swift_interop_hint",`
`4`	`4`	`)`
	`5`	`+load("@rules_cc//cc:cc_library.bzl", "cc_library")`
`5`	`6`
`6`	`7`	`cc_library(`
`7`	`8`	`name = "c_lib",`