Merge branch 'main' into karim/add-custom-toolchain-to-generated-project

Signed-off-by: Nicholas Long <[email protected]>

Author: longsview

.bazelversion

@@ -1 +1 @@
-8.0.0
+8.x

MODULE.bazel

@@ -10,7 +10,7 @@ bazel_dep(name = "bazel_features", version = "1.3.0")
 bazel_dep(name = "bazel_skylib", version = "1.3.0")
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
+    version = "2.8.2",
     max_compatibility_level = 2,
     repo_name = "build_bazel_rules_swift",
 )
@@ -28,13 +28,19 @@ non_module_deps = use_extension("//xcodeproj:extensions.bzl", "non_module_deps")
 use_repo(
     non_module_deps,
     "rules_xcodeproj_index_import",
+    "rules_xcodeproj_legacy_index_import",
 )
 
+# Legacy generator
+
+bazel_dep(name = "xcodeproj", version = "8.27.3", repo_name = "com_github_tuist_xcodeproj")
+bazel_dep(name = "pathkit", version = "1.0.1", repo_name = "com_github_kylef_pathkit")
+
 # Non-release dependencies
 
 bazel_dep(
     name = "apple_support",
-    version = "1.11.1",
+    version = "1.21.0",
     dev_dependency = True,
     repo_name = "build_bazel_apple_support",
 )
@@ -55,17 +61,6 @@ bazel_dep(
     repo_name = "io_bazel_stardoc",
 )
 
-# Use newer versions of deps in development
-single_version_override(
-    module_name = "apple_support",
-    version = "1.17.1",
-)
-
-single_version_override(
-    module_name = "rules_swift",
-    version = "2.3.0",
-)
-
 # Some of our deps are forcing a new stardoc on us, so pinning for now
 single_version_override(
     module_name = "stardoc",
@@ -83,12 +78,10 @@ use_repo(
     non_module_deps,
     "com_github_apple_swift_argument_parser",
     "com_github_apple_swift_collections",
-    "com_github_kylef_pathkit",
     "com_github_michaeleisel_jjliso8601dateformatter",
     "com_github_michaeleisel_zippyjson",
     "com_github_michaeleisel_zippyjsoncfamily",
     "com_github_tadija_aexml",
-    "com_github_tuist_xcodeproj",
 )
 
 dev_non_module_deps = use_extension(

buildbuddy.yaml

@@ -23,7 +23,7 @@ x_templates:
         USE_BAZEL_VERSION: 8.x
     - &bazel_head
       env:
-        USE_BAZEL_VERSION: last_green
+        USE_BAZEL_VERSION: 4c2d91e762ab6e492853b021408129dd93fb5904 # TODO: Switch back to last_green once get_cpu has been removed
 
     - &normal_resources
       resource_requests: { memory: 6GB }
@@ -114,7 +114,7 @@ actions:
     <<: *normal_resources
     <<: *examples_integration_workspace
     bazel_commands:
-      # Not validate since Bazel 8 Bzlmod paths are different
+      # Not validate since Bazel 8+ Bzlmod paths are different
       - *generate_integration
       - *build_all
   - name: Integration Test - "examples/integration" - Bazel LTS
@@ -124,8 +124,7 @@ actions:
     <<: *normal_resources
     <<: *examples_integration_workspace
     bazel_commands:
-      # Not validate since Bazel 8 Bzlmod paths are different
-      - *generate_integration
+      - *validate_integration
       - *build_all
   - name: Integration Test - "examples/integration" - Bazel HEAD
     <<: *bazel_head
@@ -134,7 +133,10 @@ actions:
     <<: *normal_resources
     <<: *examples_integration_workspace
     bazel_commands:
-      - *validate_integration
+      # Not validate as Bazel HEAD has incompatible path changes to repo rules
+      # - "external/+_repo_rules+examples_command_line_external/",
+      # + "external/+new_local_repository+examples_command_line_external/
+      - *generate_integration
       - *build_all
 
   - name: Integration Test - "examples/rules_ios" - Bazel Previous LTS

docs/usage.md

@@ -1,16 +1,27 @@
 - [Bazel aspects](#bazel-aspects)
   - [`compile_only_aspect`](#compile_only_aspect)
 - [Bazel configs](#bazel-configs)
-  - [`rules_xcodeproj`](#rules_xcodeproj)
-  - [`rules_xcodeproj_generator`](#rules_xcodeproj_generator)
-  - [`rules_xcodeproj_indexbuild`](#rules_xcodeproj_indexbuild)
-  - [`rules_xcodeproj_swiftuipreviews`](#rules_xcodeproj_swiftuipreviews)
+    - [`rules_xcodeproj`](#rules_xcodeproj)
+    - [`rules_xcodeproj_generator`](#rules_xcodeproj_generator)
+    - [`rules_xcodeproj_indexbuild`](#rules_xcodeproj_indexbuild)
+    - [`rules_xcodeproj_swiftuipreviews`](#rules_xcodeproj_swiftuipreviews)
   - [Project-level configs](#project-level-configs)
   - [Extra config flags](#extra-config-flags)
   - [`.bazelrc` files](#bazelrc-files)
+    - [Project `xcodeproj.bazelrc`](#project-xcodeprojbazelrc)
+    - [Workspace `xcodeproj.bazelrc`](#workspace-xcodeprojbazelrc)
+    - [Workspace `.bazelrc`](#workspace-bazelrc)
+    - [Project `xcodeproj_extra_flags.bazelrc`](#project-xcodeproj_extra_flagsbazelrc)
 - [Command-line API](#command-line-api)
   - [Commands](#commands)
+    - [`build`](#build)
+    - [`clean`](#clean)
+    - [`query`/`cquery`/`aquery`](#querycqueryaquery)
   - [Options](#options)
+    - [`-v`/`--verbose`](#-v--verbose)
+    - [`--config`](#--config)
+    - [`--generator_output_groups`](#--generator_output_groups)
+    - [`--download_intermediates`](#--download_intermediates)
   - [Substitutions](#substitutions)
 
 # Bazel aspects
@@ -28,24 +39,23 @@ To use the aspect, you apply it at the command line:
 ```
 bazel build //some:target \
   --aspects=@rules_xcodeproj//xcodeproj:compile_only_aspect.bzl%compile_only_aspect \
-  --output_groups=compile_only
+  --output_groups=compiles
 ```
 
 You can also create a Bazel configuration in a `.bazelrc` file to reuse the
 aspect easily:
 
 ```
 common:compile_only --aspects=@rules_xcodeproj//xcodeproj:compile_only_aspect.bzl%compile_only_aspect
-common:compile_only --output_groups=compile_only
+common:compile_only --output_groups=compiles
 ```
 
 And use it, for example, with the command-line API:
 
 ```
 bazel run //label/to:xcodeproj \
   -- \
-  --generator_output_groups=all_targets \
-  'build --config=compile_only --remote_download_minimal'
+  'build --config=compile_only --remote_download_minimal $_GENERATOR_LABEL_'
 ```
 
 # Bazel configs

examples/integration/MODULE.bazel

@@ -5,7 +5,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "apple_support",
-    version = "1.15.1",
+    version = "1.21.0",
     repo_name = "build_bazel_apple_support",
 )
 bazel_dep(
@@ -50,13 +50,18 @@ use_repo(
     "local_config_apple_cc_toolchains",
 )
 
-# TODO: Remove manual register once https://github.com/bazelbuild/rules_cc/commit/c8c38f8c710cbbf834283e4777916b68261b359c is released
-register_toolchains("@local_config_apple_cc_toolchains//:all")
-
 non_module_deps = use_extension(":repositories.bzl", "non_module_deps")
 use_repo(
     non_module_deps,
     "FXPageControl",
     "com_github_krzyzanowskim_cryptoswift",
     "com_google_google_maps",
 )
+
+new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository")
+
+new_local_repository(
+    name = "examples_command_line_external",
+    build_file = "//CommandLine/external:BUILD.tpl",
+    path = "CommandLine/external",
+)

examples/integration/WORKSPACE.bzlmod

@@ -1,5 +0,0 @@
-new_local_repository(
-    name = "examples_command_line_external",
-    build_file = "//CommandLine/external:BUILD.tpl",
-    path = "CommandLine/external",
-)

examples/integration/iOSApp/Source/BUILD

@@ -44,7 +44,6 @@ ios_application(
         ":release_build": [],
         "//conditions:default": [
             "--digest-algorithm=sha1",
-            "--resource-rules=$(RESOURCE_RULES)",
         ],
     }),
     entitlements = "ios app.entitlements",

examples/integration/test/fixtures/bazel-8/bwb_replacements.txt

@@ -1,35 +1,35 @@
 CONFIGURATION-STABLE-0 darwin_x86_64-dbg-ST-376989c9bb44
 CONFIGURATION-STABLE-1 darwin_x86_64-dbg-ST-65b9ae3229ca
 CONFIGURATION-STABLE-2 darwin_x86_64-opt-ST-4603bbaf5d98
-CONFIGURATION-STABLE-3 ios_x86_64-dbg-ios-x86_64-min15.0-applebin_ios-ST-ec49b5570e6a
-CONFIGURATION-STABLE-4 watchos_x86_64-dbg-watchos-x86_64-min7.0-applebin_watchos-ST-c601ed35d954
-CONFIGURATION-STABLE-5 ios_x86_64-dbg-ios-x86_64-min16.0-applebin_ios-ST-7c661f35007d
-CONFIGURATION-STABLE-6 tvos_x86_64-dbg-tvos-x86_64-min15.0-applebin_tvos-ST-8fa93ae60f3c
-CONFIGURATION-STABLE-7 darwin_x86_64-dbg-macos-x86_64-min12.0-applebin_macos-ST-e4d1b54e0a5f
-CONFIGURATION-STABLE-8 ios_arm64-dbg-ios-arm64-min15.0-applebin_ios-ST-d4ed85805c03
-CONFIGURATION-STABLE-9 watchos_arm64_32-dbg-watchos-arm64_32-min7.0-applebin_watchos-ST-2d1383ea1bfd
-CONFIGURATION-STABLE-10 ios_arm64-dbg-ios-arm64-min16.0-applebin_ios-ST-9d40ca217462
-CONFIGURATION-STABLE-11 tvos_arm64-dbg-tvos-arm64-min15.0-applebin_tvos-ST-f0bf1e4db2b5
-CONFIGURATION-STABLE-12 ios_x86_64-opt-ios-x86_64-min15.0-applebin_ios-ST-f0647120a524
-CONFIGURATION-STABLE-13 watchos_x86_64-opt-watchos-x86_64-min7.0-applebin_watchos-ST-9b6da1c1ca96
-CONFIGURATION-STABLE-14 ios_x86_64-opt-ios-x86_64-min16.0-applebin_ios-ST-98784b0141f7
-CONFIGURATION-STABLE-15 tvos_x86_64-opt-tvos-x86_64-min15.0-applebin_tvos-ST-fd3222aa8913
-CONFIGURATION-STABLE-16 darwin_x86_64-opt-macos-x86_64-min12.0-applebin_macos-ST-478bd2e7095f
-CONFIGURATION-STABLE-17 ios_arm64-opt-ios-arm64-min15.0-applebin_ios-ST-d4b659e4a9d4
-CONFIGURATION-STABLE-18 watchos_arm64_32-opt-watchos-arm64_32-min7.0-applebin_watchos-ST-ecd9d94fb4e5
-CONFIGURATION-STABLE-19 ios_arm64-opt-ios-arm64-min16.0-applebin_ios-ST-9a1b0839beb3
-CONFIGURATION-STABLE-20 tvos_arm64-opt-tvos-arm64-min15.0-applebin_tvos-ST-618e0eabc398
-CONFIGURATION-STABLE-21 watchos_x86_64-dbg-watchos-x86_64-min8.0-applebin_watchos-ST-65044d9cb033
-CONFIGURATION-STABLE-22 watchos_arm64_32-dbg-watchos-arm64_32-min8.0-applebin_watchos-ST-e2adfc6423ec
-CONFIGURATION-STABLE-23 watchos_x86_64-opt-watchos-x86_64-min8.0-applebin_watchos-ST-b7000f81fbba
-CONFIGURATION-STABLE-24 watchos_arm64_32-opt-watchos-arm64_32-min8.0-applebin_watchos-ST-58e24dd35eea
-CONFIGURATION-STABLE-25 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-23ced71d870c
-CONFIGURATION-STABLE-26 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-5c2767082c6b
-CONFIGURATION-STABLE-27 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-7c4786726810
-CONFIGURATION-STABLE-28 darwin_arm64-dbg-macos-arm64-min11.0-applebin_macos-ST-5f46583411cc
-CONFIGURATION-STABLE-29 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-a6b23e99dd1c
-CONFIGURATION-STABLE-30 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-d247baf1a2e1
-CONFIGURATION-STABLE-31 darwin_arm64-opt-macos-arm64-min11.0-applebin_macos-ST-4320432566be
-CONFIGURATION-STABLE-32 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-11b4a0ee8e7b
+CONFIGURATION-STABLE-3 ios_x86_64-dbg-ios-x86_64-min15.0-applebin_ios-ST-729671d856ea
+CONFIGURATION-STABLE-4 watchos_x86_64-dbg-watchos-x86_64-min7.0-applebin_watchos-ST-a56208b3ea17
+CONFIGURATION-STABLE-5 ios_x86_64-dbg-ios-x86_64-min16.0-applebin_ios-ST-e07395093609
+CONFIGURATION-STABLE-6 tvos_x86_64-dbg-tvos-x86_64-min15.0-applebin_tvos-ST-f2eafbbb2c71
+CONFIGURATION-STABLE-7 darwin_x86_64-dbg-macos-x86_64-min12.0-applebin_macos-ST-c5aba9a2664d
+CONFIGURATION-STABLE-8 ios_arm64-dbg-ios-arm64-min15.0-applebin_ios-ST-ebc965843194
+CONFIGURATION-STABLE-9 watchos_arm64_32-dbg-watchos-arm64_32-min7.0-applebin_watchos-ST-ee37b6f7c2f8
+CONFIGURATION-STABLE-10 ios_arm64-dbg-ios-arm64-min16.0-applebin_ios-ST-22e6ffafd033
+CONFIGURATION-STABLE-11 tvos_arm64-dbg-tvos-arm64-min15.0-applebin_tvos-ST-34aed803ff64
+CONFIGURATION-STABLE-12 ios_x86_64-opt-ios-x86_64-min15.0-applebin_ios-ST-7e26020362db
+CONFIGURATION-STABLE-13 watchos_x86_64-opt-watchos-x86_64-min7.0-applebin_watchos-ST-0b3052a22d34
+CONFIGURATION-STABLE-14 ios_x86_64-opt-ios-x86_64-min16.0-applebin_ios-ST-24288e6a8a11
+CONFIGURATION-STABLE-15 tvos_x86_64-opt-tvos-x86_64-min15.0-applebin_tvos-ST-839820e646a4
+CONFIGURATION-STABLE-16 darwin_x86_64-opt-macos-x86_64-min12.0-applebin_macos-ST-fdfd02bb595a
+CONFIGURATION-STABLE-17 ios_arm64-opt-ios-arm64-min15.0-applebin_ios-ST-a175c2921f59
+CONFIGURATION-STABLE-18 watchos_arm64_32-opt-watchos-arm64_32-min7.0-applebin_watchos-ST-52c88b620570
+CONFIGURATION-STABLE-19 ios_arm64-opt-ios-arm64-min16.0-applebin_ios-ST-d9e7edaa2e03
+CONFIGURATION-STABLE-20 tvos_arm64-opt-tvos-arm64-min15.0-applebin_tvos-ST-09f0630d9e9d
+CONFIGURATION-STABLE-21 watchos_x86_64-dbg-watchos-x86_64-min8.0-applebin_watchos-ST-c0f93201a38e
+CONFIGURATION-STABLE-22 watchos_arm64_32-dbg-watchos-arm64_32-min8.0-applebin_watchos-ST-5383078a5ee1
+CONFIGURATION-STABLE-23 watchos_x86_64-opt-watchos-x86_64-min8.0-applebin_watchos-ST-040af2a54015
+CONFIGURATION-STABLE-24 watchos_arm64_32-opt-watchos-arm64_32-min8.0-applebin_watchos-ST-023f6c62a458
+CONFIGURATION-STABLE-25 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-ab644b0d3414
+CONFIGURATION-STABLE-26 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-03342bc805f6
+CONFIGURATION-STABLE-27 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-66f6a67d07be
+CONFIGURATION-STABLE-28 darwin_arm64-dbg-macos-arm64-min11.0-applebin_macos-ST-857af5314a24
+CONFIGURATION-STABLE-29 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-ca73ce429e0a
+CONFIGURATION-STABLE-30 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-34857d59845d
+CONFIGURATION-STABLE-31 darwin_arm64-opt-macos-arm64-min11.0-applebin_macos-ST-4e8ee0b7762f
+CONFIGURATION-STABLE-32 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-db9afb28d4b1
 CONFIGURATION-STABLE-33 darwin_x86_64-dbg-ST-3a99c2752788
 CONFIGURATION-STABLE-34 darwin_x86_64-opt-ST-a99a48f137fe