Add visionOS & tvOS platform attrs to apple_xcframework rules (#2853)

Author: adincebic

apple/internal/xcframework_rules.bzl

@@ -114,6 +114,8 @@ load(
     "files",
 )
 
+files_utils = files
+
 def _has_non_system_swift_modules(*, target):
     """Indicates if the given target references any non-system Swift modules.
 
@@ -140,6 +142,17 @@ def _has_non_system_swift_modules(*, target):
 
     return False
 
+_XCFRAMEWORK_PLATFORM_NAME = {
+    "ios": "ios",
+    "macos": "macos",
+    "tvos": "tvos",
+    "watchos": "watchos",
+    "visionos": "xros",
+}
+
+def _xcframework_platform_name(platform):
+    return _XCFRAMEWORK_PLATFORM_NAME.get(platform, platform)
+
 def _apple_platform_info_for_link_output(*, link_output):
     """Creates an ApplePlatformInfo for a framework slice's target platform.
 
@@ -306,7 +319,7 @@ def _library_identifier(*, architectures, environment, platform):
         in the final XCFramework bundle. This mirrors the formatting for subfolders as given by the
         xcodebuild -create-xcframework tool.
     """
-    library_identifier = "{}-{}".format(platform, "_".join(architectures))
+    library_identifier = "{}-{}".format(_xcframework_platform_name(platform), "_".join(architectures))
     if environment != "device":
         library_identifier += "-{}".format(environment)
     return library_identifier
@@ -687,7 +700,7 @@ def _apple_xcframework_impl(ctx):
             split_attr_keys = link_output.split_attr_keys,
         )
 
-        environment_plist = files.get_file_with_name(
+        environment_plist = files_utils.get_file_with_name(
             name = "environment_plist_{platform}".format(
                 platform = link_output.platform,
             ),
@@ -846,7 +859,7 @@ def _apple_xcframework_impl(ctx):
             headers_path = None,
             library_identifier = library_identifier,
             library_path = bundle_name + nested_bundle_extension,
-            platform = link_output.platform,
+            platform = _xcframework_platform_name(link_output.platform),
         ))
 
     root_info_plist = _create_xcframework_root_infoplist(
@@ -919,6 +932,7 @@ apple_xcframework = rule_factory.create_apple_rule(
                 default = [
                     "//apple/internal:environment_plist_ios",
                     "//apple/internal:environment_plist_tvos",
+                    "//apple/internal:environment_plist_visionos",
                 ],
             ),
             "bundle_id": attr.string(
@@ -987,6 +1001,13 @@ A list of strings indicating which architecture should be built for the macOS pl
 A dictionary of strings indicating which platform variants should be built for the tvOS platform (
 `device` or `simulator`) as keys, and arrays of strings listing which architectures should be
 built for those platform variants (for example, `x86_64`, `arm64`) as their values.
+""",
+            ),
+            "visionos": attr.string_list_dict(
+                doc = """
+A dictionary of strings indicating which platform variants should be built for the visionOS platform
+(`device` or `simulator`) as keys, and arrays of strings listing which architectures should be
+built for those platform variants (for example, `arm64`) as their values.
 """,
             ),
             "minimum_deployment_os_versions": attr.string_dict(
@@ -1007,6 +1028,7 @@ or `tvos` as keys:
     minimum_os_versions = {
         "ios": "13.0",
         "tvos": "15.0",
+        "visionos": "1.0",
     }
 """,
                 mandatory = True,
@@ -1150,7 +1172,7 @@ def _apple_static_xcframework_impl(ctx):
                 headers_path = None,
                 library_identifier = library_identifier,
                 library_path = bundle_name + ".framework",
-                platform = link_output.platform,
+                platform = _xcframework_platform_name(link_output.platform),
             ),
         )
 
@@ -1194,21 +1216,29 @@ def _apple_static_xcframework_impl(ctx):
 
         # Collect top_level_infoplists only if bundle_id is set
         top_level_infoplists = []
+        environment_plist = None
         if ctx.attr.bundle_id:
             top_level_infoplists = resources.collect(
                 attr = ctx.split_attr,
                 res_attrs = ["infoplists"],
                 split_attr_keys = link_output.split_attr_keys,
             )
 
+            environment_plist = files_utils.get_file_with_name(
+                name = "environment_plist_{platform}".format(
+                    platform = link_output.platform,
+                ),
+                files = ctx.files._environment_plist_files,
+            )
+
         partial_output = partial.call(partials.resources_partial(
             actions = actions,
             apple_mac_toolchain_info = apple_mac_toolchain_info,
             bundle_extension = ".framework",
             bundle_id = ctx.attr.bundle_id,
             bundle_name = bundle_name,
             # TODO(b/174858377): Select which environment_plist to use based on Apple platform.
-            environment_plist = ctx.file._environment_plist_ios,
+            environment_plist = environment_plist,
             executable_name = executable_name,
             launch_storyboard = None,
             output_discriminator = library_identifier,
@@ -1297,6 +1327,13 @@ apple_static_xcframework = rule_factory.create_apple_rule(
             deps_cfg = transition_support.xcframework_transition,
         ),
         {
+            "_environment_plist_files": attr.label_list(
+                default = [
+                    "//apple/internal:environment_plist_ios",
+                    "//apple/internal:environment_plist_tvos",
+                    "//apple/internal:environment_plist_visionos",
+                ],
+            ),
             "bundle_id": attr.string(
                 mandatory = False,
                 doc = """
@@ -1313,10 +1350,6 @@ then the name of the `bundle_name` attribute will be used if it is set; if not,
 the target will be used instead.
 """,
             ),
-            "_environment_plist_ios": attr.label(
-                allow_single_file = True,
-                default = "//apple/internal:environment_plist_ios",
-            ),
             "avoid_deps": attr.label_list(
                 aspects = [apple_resource_aspect],
                 allow_files = True,
@@ -1371,6 +1404,20 @@ built for those platform variants (for example, `x86_64`, `arm64`) as their valu
             "macos": attr.string_list(
                 doc = """
 A list of strings indicating which architecture should be built for the macOS platform (for example, `x86_64`, `arm64`).
+""",
+            ),
+            "tvos": attr.string_list_dict(
+                doc = """
+A dictionary of strings indicating which platform variants should be built for the tvOS platform (
+`device` or `simulator`) as keys, and arrays of strings listing which architectures should be
+built for those platform variants (for example, `x86_64`, `arm64`) as their values.
+""",
+            ),
+            "visionos": attr.string_list_dict(
+                doc = """
+A dictionary of strings indicating which platform variants should be built for the visionOS platform
+(`device` or `simulator`) as keys, and arrays of strings listing which architectures should be
+built for those platform variants (for example, `arm64`) as their values.
 """,
             ),
             "minimum_deployment_os_versions": attr.string_dict(
@@ -1386,8 +1433,14 @@ at compile time. Ensure version specific APIs are guarded with `available` claus
                 mandatory = True,
                 doc = """
 A dictionary of strings indicating the minimum OS version supported by the target, represented as a
-dotted version number (for example, "8.0") as values, with their respective platforms such as `ios`
-as keys.
+dotted version number (for example, "8.0") as values, with their respective platforms such as `ios`,
+`tvos`, or `visionos` as keys:
+
+    minimum_os_versions = {
+        "ios": "13.0",
+        "tvos": "15.0",
+        "visionos": "1.0",
+    }
 """,
             ),
             "public_hdrs": attr.label_list(