Remove explicit Swift execution group (#2822)

Part of 3da7b31.

Signed-off-by: Brentley Jones <github@brentleyjones.com>

Author: brentleyjones

apple/internal/apple_framework_import.bzl

@@ -78,10 +78,6 @@ load(
     "AppleFrameworkImportBundleInfo",
 )
 
-# The name of the execution group that houses the Swift toolchain and is used to
-# run Swift actions.
-_SWIFT_EXEC_GROUP = "swift"
-
 def _swiftmodule_for_cpu(swiftmodule_files, cpu):
     """Select the cpu specific swiftmodule."""
 
@@ -259,7 +255,7 @@ def _apple_dynamic_framework_import_impl(ctx):
 
     if "apple._import_framework_via_swiftinterface" in features and framework.swift_interface_imports:
         # Create SwiftInfo provider
-        swift_toolchain = swift_common.get_toolchain(ctx, exec_group = _SWIFT_EXEC_GROUP)
+        swift_toolchain = swift_common.get_toolchain(ctx)
         swiftinterface_files = framework_import_support.get_swift_module_files_with_target_triplet(
             swift_module_files = framework.swift_interface_imports,
             target_triplet = target_triplet,
@@ -325,7 +321,7 @@ def _apple_static_framework_import_impl(ctx):
     additional_objc_providers = []
     additional_objc_provider_fields = {}
     if framework.swift_interface_imports or framework.swift_module_imports or has_swift:
-        toolchain = swift_common.get_toolchain(ctx, exec_group = _SWIFT_EXEC_GROUP)
+        toolchain = swift_common.get_toolchain(ctx)
         providers.append(SwiftUsageInfo())
 
         # The Swift toolchain propagates Swift-specific linker flags (e.g.,
@@ -397,7 +393,7 @@ def _apple_static_framework_import_impl(ctx):
 
     if "apple._import_framework_via_swiftinterface" in features and framework.swift_interface_imports:
         # Create SwiftInfo provider
-        swift_toolchain = swift_common.get_toolchain(ctx, exec_group = _SWIFT_EXEC_GROUP)
+        swift_toolchain = swift_common.get_toolchain(ctx)
         swiftinterface_files = framework_import_support.get_swift_module_files_with_target_triplet(
             swift_module_files = framework.swift_interface_imports,
             target_triplet = target_triplet,
@@ -497,7 +493,7 @@ objc_library(
 )
 ```
 """,
-    toolchains = use_cpp_toolchain(),
+    toolchains = swift_common.use_toolchain() + use_cpp_toolchain(),
 )
 
 apple_static_framework_import = rule(
@@ -581,12 +577,7 @@ not include Swift interface or Swift module files.
             ),
         },
     ),
-    exec_groups = {
-        _SWIFT_EXEC_GROUP: exec_group(
-            toolchains = swift_common.use_toolchain(),
-        ),
-    },
-    toolchains = use_cpp_toolchain(),
+    toolchains = swift_common.use_toolchain() + use_cpp_toolchain(),
     doc = """
 This rule encapsulates an already-built static framework. It is defined by a list of
 files in exactly one `.framework` directory. `apple_static_framework_import` targets

apple/internal/apple_xcframework_import.bzl

@@ -62,10 +62,6 @@ load(
 # This defines an _enum_ to identify an imported XCFramework bundle type.
 _BUNDLE_TYPE = struct(frameworks = 1, libraries = 2)
 
-# The name of the execution group that houses the Swift toolchain and is used to
-# run Swift actions.
-_SWIFT_EXEC_GROUP = "swift"
-
 def _classify_xcframework_imports(config_vars, xcframework_imports):
     """Classifies XCFramework files for later processing.
 
@@ -566,7 +562,7 @@ def _apple_dynamic_xcframework_import_impl(ctx):
 
     if "apple._import_framework_via_swiftinterface" in features and xcframework_library.swift_module_interface:
         # Create SwiftInfo provider
-        swift_toolchain = swift_common.get_toolchain(ctx, exec_group = _SWIFT_EXEC_GROUP)
+        swift_toolchain = swift_common.get_toolchain(ctx)
         providers.append(
             framework_import_support.swift_info_from_module_interface(
                 actions = actions,
@@ -643,7 +639,7 @@ def _apple_static_xcframework_import_impl(ctx):
     if xcframework.files_by_category.swift_interface_imports or \
        xcframework.files_by_category.swift_module_imports or \
        has_swift:
-        swift_toolchain = swift_common.get_toolchain(ctx, exec_group = _SWIFT_EXEC_GROUP)
+        swift_toolchain = swift_common.get_toolchain(ctx)
         providers.append(SwiftUsageInfo())
 
         # The Swift toolchain propagates Swift-specific linker flags (e.g.,
@@ -700,7 +696,7 @@ def _apple_static_xcframework_import_impl(ctx):
 
     if "apple._import_framework_via_swiftinterface" in features and xcframework_library.swift_module_interface:
         # Create SwiftInfo provider
-        swift_toolchain = swift_common.get_toolchain(ctx, exec_group = _SWIFT_EXEC_GROUP)
+        swift_toolchain = swift_common.get_toolchain(ctx)
         providers.append(
             framework_import_support.swift_info_from_module_interface(
                 actions = actions,
@@ -795,18 +791,13 @@ Unnecssary and ignored, will be removed in the future.
             ),
         },
     ),
-    exec_groups = {
-        _SWIFT_EXEC_GROUP: exec_group(
-            toolchains = swift_common.use_toolchain(),
-        ),
-    },
     fragments = ["apple", "cpp"],
     provides = [
         AppleFrameworkImportInfo,
         CcInfo,
         AppleDynamicFrameworkInfo,
     ],
-    toolchains = use_cpp_toolchain(),
+    toolchains = swift_common.use_toolchain() + use_cpp_toolchain(),
 )
 
 apple_static_xcframework_import = rule(
@@ -935,11 +926,6 @@ Unnecssary and ignored, will be removed in the future.
             ),
         },
     ),
-    exec_groups = {
-        _SWIFT_EXEC_GROUP: exec_group(
-            toolchains = swift_common.use_toolchain(),
-        ),
-    },
     fragments = ["apple", "cpp", "objc"],
-    toolchains = use_cpp_toolchain(),
+    toolchains = swift_common.use_toolchain() + use_cpp_toolchain(),
 )