Skip to content

Commit d78f143

Browse files
authored
Fix non-experimental remote_download_regex flag (#3125)
This flag in Bazel 7.0 is no longer experimental so you get the following warning: ``` WARNING: Option 'experimental_remote_download_regex' is deprecated: Use --remote_download_regex instead ``` We can update to the non-experimental flag as we now only support Bazel 7+. Signed-off-by: Luis Padron <[email protected]>
1 parent a9686b3 commit d78f143

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

docs/usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ bazel run //:xcodeproj -- 'build --remote_download_minimal --output_groups=all_t
203203
This requires knowing the internal name of the generator target
204204
(`//:xcodeproj.generator` in this example), and it also doesn’t apply some flags
205205
that Xcode `bazel build` command applies (e.g.
206-
`--experimental_remote_download_regex`). Instead, it’s recommended that you use
206+
`--remote_download_regex`). Instead, it’s recommended that you use
207207
the [`--generator_output_groups` option](#--generator_output_groups):
208208

209209
```
@@ -302,7 +302,7 @@ bazel run //:xcodeproj -- --config=swiftuipreviews --generator_output_groups=all
302302

303303
If the Bazel command is `build`, then this builds the specified generator
304304
outputs groups, potentially adding additional flags to match the behavior of
305-
Xcode’s `bazel build` (e.g. `--experimental_remote_download_regex`).
305+
Xcode’s `bazel build` (e.g. `--remote_download_regex`).
306306

307307
<a id="output-groups"></a>
308308
These are the available output groups to use:

xcodeproj/internal/bazel_integration_files/generate_bazel_dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ build_pre_config_flags=(
122122
# This is brittle. If different file extensions are used for compilation
123123
# inputs, they will need to be added to this list. Ideally we can stop doing
124124
# this once Bazel adds support for a Remote Output Service.
125-
"--experimental_remote_download_regex=.*\.indexstore/.*|.*\.(a|cfg|c|C|cc|cl|cpp|cu|cxx|c++|def|h|H|hh|hpp|hxx|h++|hmap|ilc|inc|inl|ipp|tcc|tlh|tli|tpp|m|modulemap|mm|pch|swift|swiftdoc|swiftmodule|swiftsourceinfo|yaml)$"
125+
"--remote_download_regex=.*\.indexstore/.*|.*\.(a|cfg|c|C|cc|cl|cpp|cu|cxx|c++|def|h|H|hh|hpp|hxx|h++|hmap|ilc|inc|inl|ipp|tcc|tlh|tli|tpp|m|modulemap|mm|pch|swift|swiftdoc|swiftmodule|swiftsourceinfo|yaml)$"
126126
)
127127

128128
apply_sanitizers=1

xcodeproj/internal/bazel_integration_files/generate_index_build_bazel_dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ output_groups=(
1212
"bc $BAZEL_TARGET_ID"
1313
# Products (i.e. bundles) and index store data. The products themselves aren't
1414
# used, they cause transitive files to be created. We use
15-
# `--experimental_remote_download_regex` below to collect the files we care
15+
# `--remote_download_regex` below to collect the files we care
1616
# about.
1717
"bp $BAZEL_TARGET_ID"
1818
)
@@ -58,7 +58,7 @@ readonly build_pre_config_flags=(
5858
# This is brittle. If different file extensions are used for compilation
5959
# inputs, they will need to be added to this list. Ideally we can stop doing
6060
# this once Bazel adds support for a Remote Output Service.
61-
"--experimental_remote_download_regex=${indexstores_regex}.*|.*\.(cfg|c|C|cc|cl|cpp|cu|cxx|c++|def|h|H|hh|hpp|hxx|h++|hmap|ilc|inc|inl|ipp|tcc|tlh|tli|tpp|m|modulemap|mm|pch|swift|swiftdoc|swiftmodule|swiftsourceinfo|yaml)$"
61+
"--remote_download_regex=${indexstores_regex}.*|.*\.(cfg|c|C|cc|cl|cpp|cu|cxx|c++|def|h|H|hh|hpp|hxx|h++|hmap|ilc|inc|inl|ipp|tcc|tlh|tli|tpp|m|modulemap|mm|pch|swift|swiftdoc|swiftmodule|swiftsourceinfo|yaml)$"
6262
)
6363

6464
source "$BAZEL_INTEGRATION_DIR/bazel_build.sh"

xcodeproj/internal/files/legacy_output_files.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ def swift_to_outputs(swift):
470470
return (
471471
# We only need the single swiftmodule in order to download everything
472472
# from the remote cache (because of
473-
# `--experimental_remote_download_regex`). Reducing the number of
473+
# `--remote_download_regex`). Reducing the number of
474474
# items in an output group keeps the BEP small.
475475
[module.swiftmodule],
476476
getattr(module, "indexstore", None),

xcodeproj/internal/templates/runner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ else
239239
if [[ $cmd == "build" && -n "${generator_output_groups:-}" ]]; then
240240
if [[ $download_intermediates -eq 1 ]]; then
241241
pre_config_flags=(
242-
"--experimental_remote_download_regex=.*\.indexstore/.*|.*\.(a|cfg|c|C|cc|cl|cpp|cu|cxx|c++|def|h|H|hh|hpp|hxx|h++|hmap|ilc|inc|inl|ipp|tcc|tlh|tli|tpp|m|modulemap|mm|pch|swift|swiftdoc|swiftmodule|swiftsourceinfo|yaml)$"
242+
"--remote_download_regex=.*\.indexstore/.*|.*\.(a|cfg|c|C|cc|cl|cpp|cu|cxx|c++|def|h|H|hh|hpp|hxx|h++|hmap|ilc|inc|inl|ipp|tcc|tlh|tli|tpp|m|modulemap|mm|pch|swift|swiftdoc|swiftmodule|swiftsourceinfo|yaml)$"
243243
)
244244
else
245245
pre_config_flags=()

0 commit comments

Comments
 (0)