Add support for Bazel 8 and 9

Signed-off-by: Brentley Jones <[email protected]>

Author: brentleyjones

MODULE.bazel

@@ -58,12 +58,12 @@ bazel_dep(
 # To support Bazel 8 tests
 single_version_override(
     module_name = "rules_swift",
-    version = "1.18.0",
+    version = "2.3.0",
 )
 
 single_version_override(
     module_name = "apple_support",
-    version = "1.15.1",
+    version = "1.17.1",
 )
 
 # Some of our deps are forcing a new stardoc on us, so pinning for now

README.md

@@ -80,7 +80,7 @@ to include it in the list above.
 
 | rules_xcodeproj | Bazel | [rules_apple][1] | [rules_swift][2] | Xcode | macOS | Supporting Branch |
 | :-------------: | :---: | :--------------: | :--------------: | :---: | :---: | :---------------: |
-| 2.10.0+ | 7.0-8.x | 3.16.1+ | 1.18.0+ | 13.3–15.x | 13–14.x | `main` |
+| 2.10.0+ | 7.0-9.x | 3.16.1+ | 1.18.0+ | 13.3–15.x | 13–14.x | `main` |
 | 1.17.0+ | 6.3-7.x | 1.0.1–2.x | 1.x | 13.3–15.x | 13–14.x | - |
 | 1.16.0 | 6.3-7.x | 1.0.1–2.x | 1.x | 13.3–15.2 | 13–14.x | - |
 | 1.14.0-1.15.0 | 6.1-7.x | 1.0.1–2.x | 1.x | 13.3–15.2 | 13–14.x | - |

bazel_6.bazelrc

@@ -1,3 +1 @@
-common --incompatible_fail_on_unknown_attributes
-
-build:cache --remote_build_event_upload=minimal
+common --incompatible_disallow_empty_glob

bazel_7.bazelrc

@@ -20,12 +20,10 @@ x_templates:
         USE_BAZEL_VERSION: 7.x
     - &bazel_lts
       env:
-        # FIXME: Adjust to 8.x
-        USE_BAZEL_VERSION: 7.x
+        USE_BAZEL_VERSION: 8.x
     - &bazel_head
       env:
-        # FIXME: Adjust to `last_green`
-        USE_BAZEL_VERSION: 7.x
+        USE_BAZEL_VERSION: last_green
 
     - &normal_resources
       resource_requests: { memory: 6GB }

bazel_9.bazelrc

@@ -3,6 +3,9 @@ import %workspace%/../../shared.bazelrc
 
 build --experimental_cc_implementation_deps
 
+# Until we fix our examples for Bazel 8
+common --enable_workspace
+
 # Exercise the extra flags feature
 
 build:rules_xcodeproj --@rules_xcodeproj//xcodeproj:extra_common_flags='--verbose_failures'

buildbuddy.yaml

@@ -26,8 +26,6 @@ _deps_aspect = aspect(
     attr_aspects = ["*"],
 )
 
-_is_bazel_6 = hasattr(apple_common, "link_multi_arch_static_library")
-
 def _dep_resources_collector_impl(ctx):
     all_deps = depset(
         transitive = [dep[DepCollectorInfo].dep_names for dep in ctx.attr.deps],
@@ -39,9 +37,7 @@ def _dep_resources_collector_impl(ctx):
         command = "echo '{}' > {}".format("\n".join(all_deps), output.path),
     )
 
-    res = [output]
-    if _is_bazel_6:
-        res = {tuple(): res}
+    res = {tuple(): [output]}
 
     return resources.bucketize(
         resources = res,

examples/integration/.bazelrc

@@ -1,9 +1,3 @@
-# Opt into future migrations
-build --incompatible_disallow_empty_glob
-
-# Support rules_swift 2.0 on Bazel 6
-common --experimental_enable_aspect_hints
-
 # Don't create convenience symlinks
 build --experimental_convenience_symlinks=ignore
 
@@ -27,8 +21,6 @@ startup --output_base=bazel-output-base
 build --deleted_packages=test/fixtures/generated/xcodeproj_bwx,test/fixtures/generated/xcodeproj_bwb
 
 # Ensure we work with BwtB
-build --experimental_inmemory_jdeps_files
-build --experimental_inmemory_dotd_files
 build --remote_download_outputs=minimal
 test --remote_download_outputs=toplevel
 

examples/integration/iOSApp/Resources/ExampleResources/dep_resources_collector.bzl

@@ -17,7 +17,7 @@ readonly workspace_dir="${tool_location%/*/*}"
 
 bazel_version=$("$BAZEL_REAL" info release | /usr/bin/cut -d ' ' -f 2 | /usr/bin/cut -d '.' -f 1)
 if [[ "$bazel_version" == "version" ]]; then
-  bazel_version=8
+  bazel_version=9
 fi
 
 flags=("--noworkspace_rc")