Support latest rules_swift (#2729)

Changes:

- Remove use of `objc_infos` (no longer provided by **rules_swift**)
- Remove use of `emit_swiftinterface` (no longer provided by
**rules_swift**)
- **NOTE**: this means `.swiftinterface` files are no longer provided by
default unless the underlying `swift_library` uses `features =
["swift.emit_swiftinterface"]` or `library_evolution = True`
- Update to use new free functions instead of `swift_common` when
available in rules_swift 3+ (e.g. `swift_common.create_swift_info` vs.
`SwiftInfo()`)
- Update tests

Tasks:

- [x] Tag a rules_swift 3.x release and update this PR to use that as an
override.

Author: luispadron

MODULE.bazel

@@ -13,8 +13,16 @@ bazel_dep(name = "rules_cc", version = "0.0.10")
 bazel_dep(
     name = "rules_swift",
     version = "2.4.0",
+    max_compatibility_level = 3,
     repo_name = "build_bazel_rules_swift",
 )
+
+# Test with latest rules_swift without requiring users to use this version
+single_version_override(
+    module_name = "rules_swift",
+    version = "3.0.2",
+)
+
 bazel_dep(name = "rules_python", version = "1.3.0")
 bazel_dep(name = "rules_shell", version = "0.3.0")
 

apple/internal/apple_framework_import.bzl

@@ -332,9 +332,12 @@ def _apple_static_framework_import_impl(ctx):
         # rare case that a binary has a Swift framework import dependency but
         # no other Swift dependencies, make sure we pick those up so that it
         # links to the standard libraries correctly.
-        additional_objc_providers.extend(toolchain.implicit_deps_providers.objc_infos)
         additional_cc_infos.extend(toolchain.implicit_deps_providers.cc_infos)
 
+        # TODO: remove this once rules_swift 3+ is required
+        if hasattr(toolchain.implicit_deps_providers, "objc_infos"):
+            additional_objc_providers.extend(toolchain.implicit_deps_providers.objc_infos)
+
         if _is_debugging(compilation_mode):
             swiftmodule = _swiftmodule_for_cpu(
                 framework.swift_module_imports,

apple/internal/apple_xcframework_import.bzl

@@ -651,7 +651,10 @@ def _apple_static_xcframework_import_impl(ctx):
         # no other Swift dependencies, make sure we pick those up so that it
         # links to the standard libraries correctly.
         additional_cc_infos.extend(swift_toolchain.implicit_deps_providers.cc_infos)
-        additional_objc_providers.extend(swift_toolchain.implicit_deps_providers.objc_infos)
+
+        # TODO: remove this once rules_swift 3+ is required
+        if hasattr(swift_toolchain.implicit_deps_providers, "objc_infos"):
+            additional_objc_providers.extend(swift_toolchain.implicit_deps_providers.objc_infos)
 
     # Create Objc provider
     additional_objc_providers.extend([

apple/internal/framework_import_support.bzl

@@ -20,6 +20,7 @@ load(
     "SwiftInfo",
     "swift_common",
 )
+load("@build_bazel_rules_swift//swift:swift_interop_info.bzl", "create_swift_interop_info")
 load("//apple:providers.bzl", "AppleFrameworkImportInfo")
 load("//apple:utils.bzl", "group_files_by_directory")
 load("//apple/internal:providers.bzl", "new_appleframeworkimportinfo")
@@ -500,10 +501,17 @@ def _swift_info_from_module_interface(
         target_name = ctx.label.name,
     )
 
-    return swift_common.create_swift_info(
-        modules = [module_context],
-        swift_infos = swift_infos,
-    )
+    # TODO: use SwiftInfo directly when rules_apple sets min for rules_swift to v3+
+    if hasattr(swift_common, "create_swift_info"):
+        return swift_common.create_swift_info(
+            modules = [module_context],
+            swift_infos = swift_infos,
+        )
+    else:
+        return SwiftInfo(
+            modules = [module_context],
+            swift_infos = swift_infos,
+        )
 
 def _swift_interop_info_with_dependencies(deps, module_name, module_map_imports):
     """Return a Swift interop provider for the framework if it has a module map."""
@@ -513,11 +521,20 @@ def _swift_interop_info_with_dependencies(deps, module_name, module_map_imports)
     # Assume that there is only a single module map file (the legacy
     # implementation that read from the Objc provider made the same
     # assumption).
-    return swift_common.create_swift_interop_info(
-        module_map = module_map_imports[0],
-        module_name = module_name,
-        swift_infos = [dep[SwiftInfo] for dep in deps if SwiftInfo in dep],
-    )
+
+    # TODO: Use the free function when rules_apple sets min for rules_swift to v3+
+    if hasattr(swift_common, "create_swift_interop_info"):
+        return swift_common.create_swift_interop_info(
+            module_map = module_map_imports[0],
+            module_name = module_name,
+            swift_infos = [dep[SwiftInfo] for dep in deps if SwiftInfo in dep],
+        )
+    else:
+        return create_swift_interop_info(
+            module_map = module_map_imports[0],
+            module_name = module_name,
+            swift_infos = [dep[SwiftInfo] for dep in deps if SwiftInfo in dep],
+        )
 
 framework_import_support = struct(
     cc_info_with_dependencies = _cc_info_with_dependencies,

apple/internal/header_map.bzl

@@ -14,6 +14,7 @@
 
 """Rule for creating header_maps."""
 
+load("@build_bazel_rules_swift//swift:providers.bzl", "SwiftInfo")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_common")
 
 HeaderMapInfo = provider(
@@ -81,9 +82,15 @@ def _header_map_impl(ctx):
         hdrs_lists = hdrs_lists,
     )
 
+    # TODO: use SwiftInfo directly when rules_apple sets min for rules_swift to v3+
+    if hasattr(swift_common, "create_swift_info"):
+        swift_info = swift_common.create_swift_info()
+    else:
+        swift_info = SwiftInfo()
+
     return [
         apple_common.new_objc_provider(),
-        swift_common.create_swift_info(),
+        swift_info,
         CcInfo(
             compilation_context = cc_common.create_compilation_context(
                 headers = depset([ctx.outputs.header_map]),

apple/internal/transition_support.bzl

@@ -206,7 +206,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,
@@ -221,8 +220,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.
@@ -284,7 +281,6 @@ def _command_line_options(
             platform = "watchos",
             platform_type = platform_type,
         ),
-        "@build_bazel_rules_swift//swift:emit_swiftinterface": emit_swiftinterface,
     }
 
 def _xcframework_split_attr_key(*, arch, environment, platform_type):
@@ -320,7 +316,6 @@ def _resolved_environment_arch_for_arch(*, arch, environment, platform_type):
 
 def _command_line_options_for_xcframework_platform(
         *,
-        attr,
         minimum_os_version,
         platform_attr,
         platform_type,
@@ -329,7 +324,6 @@ def _command_line_options_for_xcframework_platform(
     """Generates a dictionary of command line options keyed by 1:2+ transition for this platform.
 
     Args:
-        attr: The attributes passed to the transition function.
         minimum_os_version: A string representing the minimum OS version specified for this
             platform, represented as a dotted version number (for example, `"9.0"`).
         platform_attr: The attribute for the apple platform specifying in dictionary form which
@@ -363,10 +357,6 @@ def _command_line_options_for_xcframework_platform(
                     environment = target_environment,
                     platform_type = platform_type,
                 ): _command_line_options(
-                    emit_swiftinterface = _should_emit_swiftinterface(
-                        attr,
-                        is_xcframework = True,
-                    ),
                     environment_arch = resolved_environment_arch,
                     minimum_os_version = minimum_os_version,
                     platform_type = platform_type,
@@ -377,28 +367,10 @@ def _command_line_options_for_xcframework_platform(
 
     return output_dictionary
 
-def _should_emit_swiftinterface(attr, is_xcframework = False):
-    """Determines if a .swiftinterface file should be generated for Swift dependencies.
-
-    Needed until users of the framework rules are allowed to enable
-    library evolution on specific targets instead of having it automatically
-    applied to the entire dependency subgraph.
-    """
-
-    features = getattr(attr, "features", [])
-    if type(features) == "list" and "apple.no_legacy_swiftinterface" in features:
-        return False
-
-    # 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.
-    return is_xcframework or hasattr(attr, "_emitswiftinterface")
-
 def _apple_rule_base_transition_impl(settings, attr):
     """Rule transition for Apple rules using Bazel CPUs and a valid Apple split transition."""
     platform_type = attr.platform_type
     return _command_line_options(
-        emit_swiftinterface = _should_emit_swiftinterface(attr),
         environment_arch = _environment_archs(platform_type, settings)[0],
         minimum_os_version = attr.minimum_os_version,
         platform_type = platform_type,
@@ -444,7 +416,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_universal_binary_rule_transition_outputs = _apple_rule_base_transition_outputs + [
     "//command_line_option:ios_multi_cpus",
@@ -469,7 +440,6 @@ def _apple_platforms_rule_base_transition_impl(settings, attr):
         environment_arch = _environment_archs(platform_type, settings)[0]
     return _command_line_options(
         apple_platforms = settings["//command_line_option:apple_platforms"],
-        emit_swiftinterface = _should_emit_swiftinterface(attr),
         environment_arch = environment_arch,
         minimum_os_version = minimum_os_version,
         platform_type = platform_type,
@@ -492,7 +462,6 @@ def _apple_platforms_rule_bundle_output_base_transition_impl(settings, attr):
         environment_arch = _environment_archs(platform_type, settings)[0]
     return _command_line_options(
         apple_platforms = settings["//command_line_option:apple_platforms"],
-        emit_swiftinterface = _should_emit_swiftinterface(attr),
         environment_arch = environment_arch,
         force_bundle_outputs = True,
         minimum_os_version = minimum_os_version,
@@ -569,11 +538,6 @@ def _apple_platform_split_transition_impl(settings, attr):
     output_dictionary = {}
     invalid_requested_archs = []
 
-    # 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 = _should_emit_swiftinterface(attr)
-
     if settings["//command_line_option:incompatible_enable_apple_toolchain_resolution"]:
         platforms = (
             settings["//command_line_option:apple_platforms"] or
@@ -594,7 +558,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 = attr.minimum_os_version,
                     platform_type = attr.platform_type,
                     settings = settings,
@@ -643,7 +606,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,
@@ -694,7 +656,6 @@ def _xcframework_transition_impl(settings, attr):
             target_environments.append("simulator")
 
         command_line_options = _command_line_options_for_xcframework_platform(
-            attr = attr,
             minimum_os_version = attr.minimum_os_versions.get(platform_type),
             platform_attr = platform_attr,
             platform_type = platform_type,

test/starlark_tests/apple_static_xcframework_tests.bzl

@@ -131,12 +131,9 @@ def apple_static_xcframework_test_suite(name):
         contains = [
             "$BUNDLE_ROOT/Info.plist",
             "$BUNDLE_ROOT/ios-arm64/ios_static_xcfmwk_with_swift.framework/Modules/ios_static_xcfmwk_with_swift.swiftmodule/arm64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64/ios_static_xcfmwk_with_swift.framework/Modules/ios_static_xcfmwk_with_swift.swiftmodule/arm64.swiftinterface",
             "$BUNDLE_ROOT/ios-arm64/ios_static_xcfmwk_with_swift.framework/ios_static_xcfmwk_with_swift",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift.framework/Modules/ios_static_xcfmwk_with_swift.swiftmodule/arm64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift.framework/Modules/ios_static_xcfmwk_with_swift.swiftmodule/arm64.swiftinterface",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift.framework/Modules/ios_static_xcfmwk_with_swift.swiftmodule/x86_64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift.framework/Modules/ios_static_xcfmwk_with_swift.swiftmodule/x86_64.swiftinterface",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift.framework/ios_static_xcfmwk_with_swift",
         ],
         tags = [name],
@@ -153,14 +150,11 @@ def apple_static_xcframework_test_suite(name):
             "$BUNDLE_ROOT/ios-arm64/ios_static_xcfmwk_with_swift_generated_headers.framework/Headers/ios_static_xcfmwk_with_swift_generated_headers.h",
             "$BUNDLE_ROOT/ios-arm64/ios_static_xcfmwk_with_swift_generated_headers.framework/Modules/module.modulemap",
             "$BUNDLE_ROOT/ios-arm64/ios_static_xcfmwk_with_swift_generated_headers.framework/Modules/ios_static_xcfmwk_with_swift_generated_headers.swiftmodule/arm64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64/ios_static_xcfmwk_with_swift_generated_headers.framework/Modules/ios_static_xcfmwk_with_swift_generated_headers.swiftmodule/arm64.swiftinterface",
             "$BUNDLE_ROOT/ios-arm64/ios_static_xcfmwk_with_swift_generated_headers.framework/ios_static_xcfmwk_with_swift_generated_headers",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift_generated_headers.framework/Headers/ios_static_xcfmwk_with_swift_generated_headers.h",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift_generated_headers.framework/Modules/module.modulemap",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift_generated_headers.framework/Modules/ios_static_xcfmwk_with_swift_generated_headers.swiftmodule/arm64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift_generated_headers.framework/Modules/ios_static_xcfmwk_with_swift_generated_headers.swiftmodule/arm64.swiftinterface",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift_generated_headers.framework/Modules/ios_static_xcfmwk_with_swift_generated_headers.swiftmodule/x86_64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift_generated_headers.framework/Modules/ios_static_xcfmwk_with_swift_generated_headers.swiftmodule/x86_64.swiftinterface",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/ios_static_xcfmwk_with_swift_generated_headers.framework/ios_static_xcfmwk_with_swift_generated_headers",
         ],
         tags = [name],

test/starlark_tests/apple_xcframework_tests.bzl

@@ -457,7 +457,8 @@ def apple_xcframework_test_suite(name):
         tags = [name],
     )
 
-    # Tests that generated swift interfaces work for XCFrameworks when a swift_library is included.
+    # Tests that generated swift interfaces work for XCFrameworks when a swift_library is included that
+    # enable swift interface/library evolution.
     archive_contents_test(
         name = "{}_swift_interface_generation_test".format(name),
         build_type = "device",
@@ -489,13 +490,10 @@ def apple_xcframework_test_suite(name):
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/SwiftFmwkWithGenHeader.framework/Headers/SwiftFmwkWithGenHeader.h",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/SwiftFmwkWithGenHeader.framework/Modules/module.modulemap",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/SwiftFmwkWithGenHeader.framework/Modules/SwiftFmwkWithGenHeader.swiftmodule/arm64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/SwiftFmwkWithGenHeader.framework/Modules/SwiftFmwkWithGenHeader.swiftmodule/arm64.swiftinterface",
             "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/SwiftFmwkWithGenHeader.framework/Modules/SwiftFmwkWithGenHeader.swiftmodule/x86_64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64_x86_64-simulator/SwiftFmwkWithGenHeader.framework/Modules/SwiftFmwkWithGenHeader.swiftmodule/x86_64.swiftinterface",
             "$BUNDLE_ROOT/ios-arm64/SwiftFmwkWithGenHeader.framework/Headers/SwiftFmwkWithGenHeader.h",
             "$BUNDLE_ROOT/ios-arm64/SwiftFmwkWithGenHeader.framework/Modules/module.modulemap",
             "$BUNDLE_ROOT/ios-arm64/SwiftFmwkWithGenHeader.framework/Modules/SwiftFmwkWithGenHeader.swiftmodule/arm64.swiftdoc",
-            "$BUNDLE_ROOT/ios-arm64/SwiftFmwkWithGenHeader.framework/Modules/SwiftFmwkWithGenHeader.swiftmodule/arm64.swiftinterface",
         ],
         tags = [name],
     )

test/starlark_tests/ios_framework_tests.bzl

@@ -410,7 +410,7 @@ def ios_framework_test_suite(name):
     archive_contents_test(
         name = "{}_static_framework_contains_swiftinterface".format(name),
         build_type = "simulator",
-        target_under_test = "//test/starlark_tests/targets_under_test/ios:swift_static_framework",
+        target_under_test = "//test/starlark_tests/targets_under_test/ios:swift_static_framework_with_swiftinterface",
         contains = [
             "$BUNDLE_ROOT/Headers/swift_framework_lib.h",
             "$BUNDLE_ROOT/Modules/swift_framework_lib.swiftmodule/x86_64.swiftdoc",

test/starlark_tests/ios_static_framework_tests.bzl

@@ -120,7 +120,6 @@ def ios_static_framework_test_suite(name):
         target_under_test = "//test/starlark_tests/targets_under_test/ios:static_fmwk_with_swift_and_avoid_deps",
         contains = [
             "$BUNDLE_ROOT/Modules/SwiftFmwkUpperLib.swiftmodule/x86_64.swiftdoc",
-            "$BUNDLE_ROOT/Modules/SwiftFmwkUpperLib.swiftmodule/x86_64.swiftinterface",
         ],
         binary_test_file = "$BUNDLE_ROOT/SwiftFmwkUpperLib",
         binary_test_architecture = "x86_64",
@@ -188,7 +187,6 @@ def ios_static_framework_test_suite(name):
             "$BUNDLE_ROOT/Headers/SwiftStaticFmwkWithGenHeader.h",
             "$BUNDLE_ROOT/Modules/module.modulemap",
             "$BUNDLE_ROOT/Modules/SwiftStaticFmwkWithGenHeader.swiftmodule/x86_64.swiftdoc",
-            "$BUNDLE_ROOT/Modules/SwiftStaticFmwkWithGenHeader.swiftmodule/x86_64.swiftinterface",
         ],
         tags = [name],
     )