From 3ed2d792ba1c3bf0cf6c009284efe137dfc6abb1 Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Wed, 25 Mar 2026 13:24:05 -0500 Subject: [PATCH] Adjust Bazel compatibility to Bazel 8+ repo-wide Signed-off-by: Brentley Jones --- .bcr/presubmit.yml | 2 +- MODULE.bazel | 2 +- bazel_7.bazelrc | 4 ---- bazel_8.bazelrc | 2 -- bazel_9.bazelrc | 3 --- shared.bazelrc | 2 ++ 6 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 bazel_7.bazelrc delete mode 100644 bazel_8.bazelrc diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index ba9b059f93..32527f6846 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -1,7 +1,7 @@ tasks: verify_targets_macos: name: Verify build targets - bazel: 7.x + bazel: 8.x platform: macos build_targets: - '@rules_xcodeproj//tools/generators/pbxproj_prefix:universal_pbxproj_prefix' diff --git a/MODULE.bazel b/MODULE.bazel index 522fac7655..a9e93cd87b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,7 +1,7 @@ module( name = "rules_xcodeproj", version = "0.0.0", - bazel_compatibility = [">=7.0.0"], + bazel_compatibility = [">=8.0.0"], compatibility_level = 1, repo_name = "rules_xcodeproj", ) diff --git a/bazel_7.bazelrc b/bazel_7.bazelrc deleted file mode 100644 index 5eb80a2347..0000000000 --- a/bazel_7.bazelrc +++ /dev/null @@ -1,4 +0,0 @@ -common --incompatible_disallow_empty_glob - -build:cache --experimental_remote_cache_async -build:cache --experimental_remote_cache_compression diff --git a/bazel_8.bazelrc b/bazel_8.bazelrc deleted file mode 100644 index 0d3216563a..0000000000 --- a/bazel_8.bazelrc +++ /dev/null @@ -1,2 +0,0 @@ -build:cache --remote_cache_async -build:cache --remote_cache_compression diff --git a/bazel_9.bazelrc b/bazel_9.bazelrc index 2797cd9400..b8768c6d7c 100644 --- a/bazel_9.bazelrc +++ b/bazel_9.bazelrc @@ -1,5 +1,2 @@ # TODO: Remove once rules_apple is updated to support the new test toolchain common --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=no - -build:cache --remote_cache_async -build:cache --remote_cache_compression diff --git a/shared.bazelrc b/shared.bazelrc index 15d8f86461..279fa414b5 100644 --- a/shared.bazelrc +++ b/shared.bazelrc @@ -29,6 +29,8 @@ build:rules_xcodeproj --remote_download_outputs=toplevel build:cache --bes_backend=grpcs://remote.buildbuddy.io build:cache --bes_results_url=https://app.buildbuddy.io/invocation/ build:cache --bes_upload_mode=nowait_for_upload_complete +build:cache --remote_cache_async +build:cache --remote_cache_compression build:cache --jobs=100 build:cache --modify_execution_info=^(AppleLipo|BitcodeSymbolsCopy|BundleApp|BundleTreeApp|DsymDwarf|DsymLipo|GenerateAppleSymbolsFile|ObjcBinarySymbolStrip|CppArchive|CppLink|ObjcLink|ProcessAndSign|SignBinary|SwiftArchive|SwiftStdlibCopy)$=+no-remote,^(BundleResources|ImportedDynamicFrameworkProcessor)$=+no-remote-exec build:cache --remote_cache=grpcs://remote.buildbuddy.io