Update for rules_swift 3.0 (#945)

Signed-off-by: Luis Padron <lpadron@squareup.com>

Author: luispadron

.github/workflows/tests.yml

@@ -28,8 +28,8 @@ jobs:
     env:
         XCODE_VERSION: ${{ matrix.xcode_version }}
         USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
-        LATEST_RULES_SWIFT_VERSION: 2.1.1
-        LATEST_RULES_APPLE_VERSION: 3.15.0
+        LATEST_RULES_SWIFT_VERSION: 3.0.2
+        LATEST_RULES_APPLE_VERSION: 4.0.1
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4

MODULE.bazel

@@ -22,7 +22,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_apple",
-    version = "3.15.0",
+    version = "4.0.1",
     repo_name = "build_bazel_rules_apple",
 )
 bazel_dep(
@@ -31,8 +31,8 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_swift",
-    version = "1.18.0",
-    max_compatibility_level = 2,
+    version = "3.0.2",
+    max_compatibility_level = 3,
     repo_name = "build_bazel_rules_swift",
 )
 bazel_dep(

rules/framework.bzl

@@ -25,7 +25,8 @@ load("@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl", "AppleMacT
 load("@build_bazel_rules_apple//apple/internal:swift_support.bzl", "swift_support")
 load("@build_bazel_rules_apple//apple/internal/utils:clang_rt_dylibs.bzl", "clang_rt_dylibs")
 load("@build_bazel_rules_apple//apple/internal:providers.bzl", "AppleBundleInfo", "ApplePlatformInfo", "IosFrameworkBundleInfo", "new_applebundleinfo", "new_iosframeworkbundleinfo")
-load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo", "swift_clang_module_aspect", "swift_common")
+load("@build_bazel_rules_swift//swift:providers.bzl", "SwiftInfo", "create_clang_module_inputs", "create_swift_module_context", "create_swift_module_inputs")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_clang_module_aspect")
 load(
     "@build_bazel_rules_apple//apple/internal/aspects:resource_aspect.bzl",
     "apple_resource_aspect",
@@ -558,7 +559,7 @@ def _create_swiftmodule(attrs):
     if attrs.symbol_graph:
         kwargs["symbol_graph"] = attrs.symbol_graph
 
-    return swift_common.create_swift_module(
+    return create_swift_module_inputs(
         swiftdoc = attrs.swiftdoc,
         swiftmodule = attrs.swiftmodule,
         swiftinterface = attrs.swiftinterface,
@@ -585,7 +586,7 @@ def _copy_swiftmodule(ctx, framework_files, clang_module):
     return [
         # only add the swift module, the objc modulemap is already listed as a header,
         # and it will be discovered via the framework search path
-        swift_common.create_module(
+        create_swift_module_context(
             name = swiftmodule_name,
             clang = clang_module,
             swift = swift_module,
@@ -600,13 +601,13 @@ def _get_merged_swift_info(ctx, framework_files, transitive_deps, clang_module):
         swift_info_fields["modules"] = _copy_swiftmodule(ctx, framework_files, clang_module)
     else:
         swift_info_fields["modules"] = [
-            swift_common.create_module(
+            create_swift_module_context(
                 name = ctx.attr.framework_name,
                 clang = clang_module,
             ),
         ]
 
-    return swift_common.create_swift_info(**swift_info_fields)
+    return SwiftInfo(**swift_info_fields)
 
 def _merge_root_infoplists(ctx):
     if ctx.attr.infoplists == None or len(ctx.attr.infoplists) == 0:
@@ -695,6 +696,7 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps):
     actions = ctx.actions
     apple_mac_toolchain_info = ctx.attr._mac_toolchain[AppleMacToolsToolchainInfo]
     apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo]
+    cc_toolchain_forwarder = ctx.split_attr._child_configuration_dummy
     bin_root_path = ctx.bin_dir.path
     bundle_id = ctx.attr.bundle_id
     if not bundle_id:
@@ -753,6 +755,7 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps):
     )
     link_result = linking_support.register_binary_linking_action(
         ctx,
+        cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = avoid_deps,
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -1104,15 +1107,15 @@ def _apple_framework_packaging_impl(ctx):
 
     # rules_swift 2.x no longers takes compilation_context from CcInfo, need to pass it in via SwiftInfo's clang_module
     if virtualize_frameworks:
-        clang_module = swift_common.create_clang_module(
+        clang_module = create_clang_module_inputs(
             module_map = None,
             compilation_context = compilation_context,
         )
     else:
         # Setup the `clang` attr of the Swift module for non-vfs case this is required to have it locate the modulemap
         # and headers correctly.
         module_map = outputs.modulemaps[0] if outputs.modulemaps else None
-        clang_module = swift_common.create_clang_module(
+        clang_module = create_clang_module_inputs(
             module_map = module_map,
             compilation_context = cc_common.create_compilation_context(
                 headers = depset(_compact(

rules/framework/vfs_overlay.bzl

@@ -10,7 +10,7 @@ to each of the entries.
 """
 
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
-load("@build_bazel_rules_swift//swift:swift.bzl", "swift_common")
+load("@build_bazel_rules_swift//swift:providers.bzl", "SwiftInfo")
 load("//rules:features.bzl", "feature_names")
 load("//rules:providers.bzl", "FrameworkInfo")
 
@@ -298,7 +298,7 @@ def _framework_vfs_overlay_impl(ctx):
             files = depset([vfs.vfsoverlay_file]),
             vfs_info = vfs.vfs_info,
         ),
-        swift_common.create_swift_info(),
+        SwiftInfo(),
     ]
 
 def _merge_vfs_infos(base, vfs_infos):

rules/library.bzl

@@ -7,7 +7,7 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@build_bazel_rules_apple//apple/internal:apple_framework_import.bzl", "apple_dynamic_framework_import", "apple_static_framework_import")
 load("@build_bazel_rules_apple//apple/internal/resource_rules:apple_intent_library.bzl", "apple_intent_library")
-load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_interop_hint", "swift_library")
 load("//rules:precompiled_apple_resource_bundle.bzl", "precompiled_apple_resource_bundle")
 load("//rules:hmap.bzl", "headermap")
 load("//rules:features.bzl", "feature_names")
@@ -1106,15 +1106,23 @@ def apple_library(
     if module_map:
         objc_hdrs.append(module_map)
 
+    swift_interop_hint_name = name + "_swift_interop_hint"
+    swift_interop_hint(
+        name = swift_interop_hint_name,
+        module_name = module_name,
+        module_map = module_map,
+        tags = _MANUAL,
+    )
+
     default_alwayslink = kwargs.pop("alwayslink", True)  # ensure symbols from any static deps are always included (see https://github.com/bazelbuild/rules_apple/issues/1938)
     native.objc_library(
         name = objc_libname,
+        aspect_hints = [swift_interop_hint_name],
         srcs = objc_sources + objc_private_hdrs + objc_non_exported_hdrs,
         non_arc_srcs = objc_non_arc_sources,
         hdrs = objc_hdrs,
         copts = copts_by_build_setting.objc_copts + objc_copts + additional_objc_vfs_copts + additional_objc_copts + index_while_building_objc_copts,
         deps = deps + private_deps + private_dep_names + lib_names + additional_objc_vfs_deps,
-        module_map = module_map,
         sdk_dylibs = sdk_dylibs,
         sdk_frameworks = sdk_frameworks,
         weak_sdk_frameworks = weak_sdk_frameworks,

rules/repositories.bzl

@@ -1,14 +1,14 @@
 """Definitions for handling Bazel repositories used by the Apple rules."""
 
+load(
+    "@bazel_tools//tools/build_defs/repo:git.bzl",
+    "new_git_repository",
+)
 load(
     "@bazel_tools//tools/build_defs/repo:http.bzl",
     "http_archive",
     "http_file",
 )
-load(
-    "@bazel_tools//tools/build_defs/repo:git.bzl",
-    "new_git_repository",
-)
 
 def _maybe(repo_rule, name, **kwargs):
     """Executes the given repository rule if it hasn't been executed already.
@@ -85,15 +85,15 @@ def _rules_ios_bzlmod_dependencies():
     _maybe(
         http_archive,
         name = "build_bazel_rules_swift",
-        sha256 = "bb01097c7c7a1407f8ad49a1a0b1960655cf823c26ad2782d0b7d15b323838e2",
-        url = "https://github.com/bazelbuild/rules_swift/releases/download/1.18.0/rules_swift.1.18.0.tar.gz",
+        sha256 = "ae6673d27024914fa89e32fd1369e9563fb8ede463feac703aaec1ba6ca0358c",
+        url = "https://github.com/bazelbuild/rules_swift/releases/download/3.0.1/rules_swift.3.0.1.tar.gz",
     )
 
     _maybe(
         http_archive,
         name = "build_bazel_rules_apple",
-        sha256 = "b4df908ec14868369021182ab191dbd1f40830c9b300650d5dc389e0b9266c8d",
-        url = "https://github.com/bazelbuild/rules_apple/releases/download/3.5.1/rules_apple.3.5.1.tar.gz",
+        sha256 = "b28822cb81916fb544119f5533de010cc67ec6a789f2e7d0fc19d53bfcbb8285",
+        url = "https://github.com/bazelbuild/rules_apple/releases/download/4.0.1/rules_apple.4.0.1.tar.gz",
     )
     _maybe(
         http_archive,

rules/transition_support.bzl

@@ -252,7 +252,6 @@ def _is_arch_supported_for_target_tuple(*, environment_arch, minimum_os_version,
 def _command_line_options(
         *,
         apple_platforms = [],
-        emit_swiftinterface = False,
         environment_arch = None,
         force_bundle_outputs = False,
         minimum_os_version,
@@ -267,8 +266,6 @@ def _command_line_options(
             first element will be applied to `platforms` as that will be what is resolved by the
             underlying rule. Defaults to an empty list, which will signal to Bazel that platform
             mapping can take place as a fallback measure.
-        emit_swiftinterface: Wheither to emit swift interfaces for the given target. Defaults to
-            `False`.
         environment_arch: A valid Apple environment when applicable with its architecture as a
             string (for example `sim_arm64` from `ios_sim_arm64`, or `arm64` from `ios_arm64`), or
             None to infer a value from command line options passed through settings.
@@ -339,7 +336,6 @@ def _command_line_options(
             platform = "watchos",
             platform_type = platform_type,
         ),
-        "@build_bazel_rules_swift//swift:emit_swiftinterface": emit_swiftinterface,
     }
 
 def _apple_rule_base_transition_impl(settings, attr):
@@ -351,7 +347,6 @@ def _apple_rule_base_transition_impl(settings, attr):
     # PATCH: end
 
     return _command_line_options(
-        emit_swiftinterface = hasattr(attr, "_emitswiftinterface"),
         environment_arch = _environment_archs(platform_type, settings)[0],
         minimum_os_version = minimum_os_version,
         platform_type = platform_type,
@@ -401,7 +396,6 @@ _apple_rule_base_transition_outputs = [
     "//command_line_option:platforms",
     "//command_line_option:tvos_minimum_os",
     "//command_line_option:watchos_minimum_os",
-    "@build_bazel_rules_swift//swift:emit_swiftinterface",
 ]
 
 _apple_rule_base_transition = transition(
@@ -420,11 +414,6 @@ def _apple_platform_split_transition_impl(settings, attr):
     minimum_os_version = _rules_ios_minimum_os_version(platform_type, attr)
     # PATCH: end
 
-    # iOS and tvOS static frameworks require underlying swift_library targets generate a Swift
-    # interface file. These rules define a private attribute called `_emitswiftinterface` that
-    # let's this transition flip rules_swift config down the build graph.
-    emit_swiftinterface = hasattr(attr, "_emitswiftinterface")
-
     if settings["//command_line_option:incompatible_enable_apple_toolchain_resolution"]:
         platforms = (
             settings["//command_line_option:apple_platforms"] or
@@ -445,7 +434,6 @@ def _apple_platform_split_transition_impl(settings, attr):
             if str(platform) not in output_dictionary:
                 output_dictionary[str(platform)] = _command_line_options(
                     apple_platforms = apple_platforms,
-                    emit_swiftinterface = emit_swiftinterface,
                     minimum_os_version = minimum_os_version,
                     platform_type = platform_type,
                     settings = settings,
@@ -492,7 +480,6 @@ def _apple_platform_split_transition_impl(settings, attr):
                 continue
 
             output_dictionary[found_cpu] = _command_line_options(
-                emit_swiftinterface = emit_swiftinterface,
                 environment_arch = environment_arch,
                 minimum_os_version = minimum_os_version,
                 platform_type = platform_type,