Use --@rules_swift//swift:copt instead of --swiftcopt (#3206)

Old way is no longer supported as of Bazel 8.

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

Author: brentleyjones

xcodeproj/internal/bazel_integration_files/BUILD

@@ -2,7 +2,6 @@ _BASE_FILES = [
     "calculate_output_groups.py",
     "copy_dsyms.sh",
     "create_lldbinit.sh",
-    "generate_bazel_dependencies.sh",
     ":renamed_import_indexstores",
     "process_bazel_build_log.py",
 ]

xcodeproj/internal/bazel_integration_files/actions.bzl

@@ -54,3 +54,35 @@ def write_bazel_build_script(
     )
 
     return output
+
+def write_generate_bazel_dependencies_script(
+        *,
+        actions,
+        generator_label,
+        template):
+    """Writes the `generate_bazel_dependencies.sh` script.
+
+    Args:
+        actions: `ctx.actions`.
+        generator_label: The `Label` of the `xcodeproj` generator target.
+        template: `xcodeproj/internal/templates/generate_bazel_dependencies.sh`.
+
+    Returns:
+        The `File` for `generate_bazel_dependencies.sh`.
+    """
+    output = actions.declare_file(
+        "{}_bazel_integration_files/generate_bazel_dependencies.sh".format(
+            generator_label.name,
+        ),
+    )
+
+    actions.expand_template(
+        template = template,
+        output = output,
+        is_executable = True,
+        substitutions = {
+            "%swiftcopt%": str(Label("@build_bazel_rules_swift//swift:copt")),
+        },
+    )
+
+    return output

xcodeproj/internal/bazel_integration_files/generate_bazel_dependencies.sh renamed to xcodeproj/internal/templates/generate_bazel_dependencies.sh

@@ -141,7 +141,7 @@ if [[ $apply_sanitizers -eq 1 ]]; then
       --copt=-fno-sanitize-recover=all
       --copt=-fsanitize=address
       --linkopt=-fsanitize=address
-      --swiftcopt=-sanitize=address
+      --%swiftcopt%=-sanitize=address
       --copt=-Wno-macro-redefined
       --copt=-D_FORTIFY_SOURCE=0
     )
@@ -152,7 +152,7 @@ if [[ $apply_sanitizers -eq 1 ]]; then
       --copt=-fno-sanitize-recover=all
       --copt=-fsanitize=thread
       --linkopt=-fsanitize=thread
-      --swiftcopt=-sanitize=thread
+      --%swiftcopt%=-sanitize=thread
       )
   fi
   if [ "${ENABLE_UNDEFINED_BEHAVIOR_SANITIZER:-}" == "YES" ]; then

xcodeproj/internal/templates/xcodeproj.bazelrc

@@ -94,9 +94,9 @@ common:rules_xcodeproj_swiftuipreviews --config=rules_xcodeproj
 common:rules_xcodeproj_swiftuipreviews --linkopt="-Wl,-rpath,@loader_path/SwiftUIPreviewsFrameworks"
 
 # `swiftc` flags needed for SwiftUI Previews
-common:rules_xcodeproj_swiftuipreviews --swiftcopt=-Xfrontend --swiftcopt=-enable-implicit-dynamic
-common:rules_xcodeproj_swiftuipreviews --swiftcopt=-Xfrontend --swiftcopt=-enable-private-imports
-common:rules_xcodeproj_swiftuipreviews --swiftcopt=-Xfrontend --swiftcopt=-enable-dynamic-replacement-chaining
+common:rules_xcodeproj_swiftuipreviews --%swiftcopt%=-Xfrontend --%swiftcopt%=-enable-implicit-dynamic
+common:rules_xcodeproj_swiftuipreviews --%swiftcopt%=-Xfrontend --%swiftcopt%=-enable-private-imports
+common:rules_xcodeproj_swiftuipreviews --%swiftcopt%=-Xfrontend --%swiftcopt%=-enable-dynamic-replacement-chaining
 
 ### `--config=_rules_xcodeproj_build`
 #

xcodeproj/internal/xcodeproj_rule.bzl

@@ -6,6 +6,7 @@ load("//xcodeproj/internal:pbxproj_partials.bzl", "pbxproj_partials")
 load(
     "//xcodeproj/internal/bazel_integration_files:actions.bzl",
     "write_bazel_build_script",
+    "write_generate_bazel_dependencies_script",
 )
 load("//xcodeproj/internal/files:input_files.bzl", "input_files")
 load("//xcodeproj/internal/files:output_files.bzl", "output_groups")
@@ -227,6 +228,7 @@ def _write_bazel_integration_files(
         *,
         actions,
         bazel_build_script_template,
+        bazel_dependencies_script_template,
         bazel_path,
         bazel_env,
         colorize,
@@ -246,6 +248,12 @@ def _write_bazel_integration_files(
         template = bazel_build_script_template,
     )
 
+    generate_bazel_dependencies_script = write_generate_bazel_dependencies_script(
+        actions = actions,
+        generator_label = label,
+        template = bazel_dependencies_script_template,
+    )
+
     swift_debug_settings = xcode_targets_module.write_swift_debug_settings(
         actions = actions,
         colorize = colorize,
@@ -255,7 +263,11 @@ def _write_bazel_integration_files(
         tool = swift_debug_settings_generator,
     )
 
-    return [bazel_build_script] + swift_debug_settings + static_files
+    return (
+        [bazel_build_script, generate_bazel_dependencies_script] +
+        swift_debug_settings +
+        static_files
+    )
 
 def _write_installer(
         *,
@@ -724,6 +736,9 @@ Are you using an `alias`? `xcodeproj.focused_targets` and \
     bazel_integration_files = _write_bazel_integration_files(
         actions = actions,
         bazel_build_script_template = ctx.file._bazel_build_script_template,
+        bazel_dependencies_script_template = (
+            ctx.file._generate_bazel_dependencies_script_template
+        ),
         bazel_path = ctx.attr.bazel_path,
         bazel_env = ctx.attr.bazel_env,
         colorize = colorize,
@@ -858,6 +873,12 @@ def _xcodeproj_attrs(
             ),
             executable = True,
         ),
+        "_generate_bazel_dependencies_script_template": attr.label(
+            allow_single_file = True,
+            default = Label(
+                "//xcodeproj/internal/templates:generate_bazel_dependencies.sh",
+            ),
+        ),
         "_index_import": attr.label(
             cfg = "exec",
             default = Label("@rules_xcodeproj_index_import//:index_import"),

xcodeproj/internal/xcodeproj_runner.bzl

@@ -69,6 +69,7 @@ common:_{config}_build --config={config}
         output = output,
         substitutions = {
             "%project_configs%": project_configs,
+            "%swiftcopt%": str(Label("@build_bazel_rules_swift//swift:copt")),
         },
     )