From ecfb4d6a54a1af1f718b017a4115c0e01e939d74 Mon Sep 17 00:00:00 2001 From: Michael Verges Date: Tue, 18 Apr 2023 12:19:20 -0500 Subject: [PATCH] Add required Info plist keys in starlark tests --- apple/internal/resources.bzl | 1 + .../resources/Info-extensionkit.plist | 11 ++++++++++ .../resources/Info-nsextension.plist | 11 ++++++++++ .../resources/WatchosExtensionKitInfo.plist | 21 ++++++++++++++++++ .../targets_under_test/ios/BUILD | 11 ++++++++++ .../targets_under_test/macos/BUILD | 2 ++ .../targets_under_test/tvos/BUILD | 13 +++++++++-- .../targets_under_test/watchos/BUILD | 22 ++++++++++--------- .../watchos_extensionkit_extension_tests.bzl | 3 +-- 9 files changed, 81 insertions(+), 14 deletions(-) create mode 100644 test/starlark_tests/resources/Info-extensionkit.plist create mode 100644 test/starlark_tests/resources/Info-nsextension.plist create mode 100644 test/starlark_tests/resources/WatchosExtensionKitInfo.plist diff --git a/apple/internal/resources.bzl b/apple/internal/resources.bzl index bd9ed2ac34..6df1dac7c8 100644 --- a/apple/internal/resources.bzl +++ b/apple/internal/resources.bzl @@ -155,6 +155,7 @@ def _get_attr_as_list(*, attr, nested_attr, split_attr_keys): attr = attr, nested_attr = nested_attr, )) + else: # Search the attribute within each split key if any split keys were defined. for split_attr_key in split_attr_keys: diff --git a/test/starlark_tests/resources/Info-extensionkit.plist b/test/starlark_tests/resources/Info-extensionkit.plist new file mode 100644 index 0000000000..7fcef48461 --- /dev/null +++ b/test/starlark_tests/resources/Info-extensionkit.plist @@ -0,0 +1,11 @@ + + + + + EXAppExtensionAttributes + + EXExtensionPointIdentifier + com.apple.app-intents + + + \ No newline at end of file diff --git a/test/starlark_tests/resources/Info-nsextension.plist b/test/starlark_tests/resources/Info-nsextension.plist new file mode 100644 index 0000000000..778bd73d06 --- /dev/null +++ b/test/starlark_tests/resources/Info-nsextension.plist @@ -0,0 +1,11 @@ + + + + + NSExtension + + NSExtensionPointIdentifier + com.apple.widgetkit-extension + + + \ No newline at end of file diff --git a/test/starlark_tests/resources/WatchosExtensionKitInfo.plist b/test/starlark_tests/resources/WatchosExtensionKitInfo.plist new file mode 100644 index 0000000000..9cb0278fd7 --- /dev/null +++ b/test/starlark_tests/resources/WatchosExtensionKitInfo.plist @@ -0,0 +1,21 @@ + + + + + CFBundleName + $(PRODUCT_NAME) + CFBundleVersion + 1.0 + CFBundleShortVersionString + 1.0 + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + EXAppExtensionAttributes + + EXExtensionPointIdentifier + com.apple.app-intents + + + \ No newline at end of file diff --git a/test/starlark_tests/targets_under_test/ios/BUILD b/test/starlark_tests/targets_under_test/ios/BUILD index 778d42fab5..c21a278b52 100644 --- a/test/starlark_tests/targets_under_test/ios/BUILD +++ b/test/starlark_tests/targets_under_test/ios/BUILD @@ -652,6 +652,7 @@ ios_extension( frameworks = [":fmwk_min_os_baseline"], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_ios.nplus1, tags = common.fixture_tags, @@ -1098,6 +1099,7 @@ ios_extension( ], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_ios.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -1117,6 +1119,7 @@ ios_extension( infoplists = [ "//test/starlark_tests/resources:Info.plist", "//test/starlark_tests/resources:Another.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_ios.baseline, tags = common.fixture_tags, @@ -1138,6 +1141,7 @@ ios_extension( ], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_ios.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -1157,6 +1161,7 @@ ios_extension( ], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_ios.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -1263,6 +1268,7 @@ ios_extension( ], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-extensionkit.plist", ], minimum_os_version = common.min_os_ios.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -1283,6 +1289,7 @@ ios_extension( infoplists = [ "//test/starlark_tests/resources:Info.plist", "//test/starlark_tests/resources:Another.plist", + "//test/starlark_tests/resources:Info-extensionkit.plist", ], minimum_os_version = common.min_os_ios.baseline, tags = common.fixture_tags, @@ -1305,6 +1312,7 @@ ios_extension( ], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-extensionkit.plist", ], minimum_os_version = common.min_os_ios.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -1325,6 +1333,7 @@ ios_extension( ], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-extensionkit.plist", ], minimum_os_version = common.min_os_ios.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -3612,6 +3621,7 @@ ios_extension( ], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_ios.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -3795,6 +3805,7 @@ ios_extension( families = ["iphone"], infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_ios.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", diff --git a/test/starlark_tests/targets_under_test/macos/BUILD b/test/starlark_tests/targets_under_test/macos/BUILD index 481a6e0f1f..c1da92e9aa 100644 --- a/test/starlark_tests/targets_under_test/macos/BUILD +++ b/test/starlark_tests/targets_under_test/macos/BUILD @@ -176,6 +176,7 @@ macos_extension( bundle_id = "com.google.example.ext", infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_macos.baseline, tags = common.fixture_tags, @@ -240,6 +241,7 @@ macos_extension( extensionkit_extension = True, infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-extensionkit.plist", ], minimum_os_version = common.min_os_macos.baseline, tags = common.fixture_tags, diff --git a/test/starlark_tests/targets_under_test/tvos/BUILD b/test/starlark_tests/targets_under_test/tvos/BUILD index 948542fb42..58f7ef961d 100644 --- a/test/starlark_tests/targets_under_test/tvos/BUILD +++ b/test/starlark_tests/targets_under_test/tvos/BUILD @@ -91,6 +91,7 @@ tvos_extension( entitlements = "//test/starlark_tests/resources:entitlements.plist", infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_tvos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -115,7 +116,10 @@ tvos_extension( name = "swift_ext", bundle_id = "com.google.example.ext", entitlements = "//test/starlark_tests/resources:entitlements.plist", - infoplists = ["//test/starlark_tests/resources:Info.plist"], + infoplists = [ + "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", + ], minimum_os_version = common.min_os_tvos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", tags = common.fixture_tags, @@ -148,6 +152,7 @@ tvos_extension( extensionkit_extension = True, infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-extensionkit.plist", ], minimum_os_version = common.min_os_tvos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -173,7 +178,10 @@ tvos_extension( bundle_id = "com.google.example.exappextension", entitlements = "//test/starlark_tests/resources:entitlements.plist", extensionkit_extension = True, - infoplists = ["//test/starlark_tests/resources:Info.plist"], + infoplists = [ + "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-extensionkit.plist", + ], minimum_os_version = common.min_os_tvos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", tags = common.fixture_tags, @@ -1001,6 +1009,7 @@ tvos_extension( entitlements = "//test/starlark_tests/resources:entitlements.plist", infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_tvos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", diff --git a/test/starlark_tests/targets_under_test/watchos/BUILD b/test/starlark_tests/targets_under_test/watchos/BUILD index 7c0a4a33a4..ee7f100646 100644 --- a/test/starlark_tests/targets_under_test/watchos/BUILD +++ b/test/starlark_tests/targets_under_test/watchos/BUILD @@ -289,7 +289,7 @@ watchos_extension( entitlements = "//test/starlark_tests/resources:entitlements.plist", extensionkit_extension = True, infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], minimum_os_version = common.min_os_watchos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -312,7 +312,7 @@ watchos_extension( extensionkit_extension = True, frameworks = [":fmwk"], infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], minimum_os_version = common.min_os_watchos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -332,7 +332,7 @@ watchos_extension( ":second_fmwk_with_provisioning", ], infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], ipa_post_processor = "//test/starlark_tests/targets_under_test/apple:ipa_post_processor_verify_codesigning", minimum_os_version = common.min_os_watchos.baseline, @@ -350,7 +350,7 @@ watchos_extension( extensionkit_extension = True, frameworks = [":fmwk_with_fmwk_with_provisioning"], infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], ipa_post_processor = "//test/starlark_tests/targets_under_test/apple:ipa_post_processor_verify_codesigning", minimum_os_version = common.min_os_watchos.baseline, @@ -368,7 +368,7 @@ watchos_extension( extensionkit_extension = True, frameworks = [":fmwk_with_fmwk"], infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], minimum_os_version = common.min_os_watchos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -384,7 +384,7 @@ watchos_extension( entitlements = "//test/starlark_tests/resources:entitlements.plist", extensionkit_extension = True, infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], ipa_post_processor = "//test/starlark_tests/targets_under_test/apple:ipa_post_processor_verify_codesigning", minimum_os_version = common.min_os_watchos.baseline, @@ -402,7 +402,7 @@ watchos_extension( extensionkit_extension = True, frameworks = [":fmwk_with_imported_static_framework"], infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], ipa_post_processor = "//test/starlark_tests/targets_under_test/apple:ipa_post_processor_verify_codesigning", minimum_os_version = common.min_os_watchos.baseline, @@ -418,7 +418,7 @@ watchos_extension( extensionkit_extension = True, infoplists = [ "//test/starlark_tests/resources:Another.plist", - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], minimum_os_version = common.min_os_watchos.baseline, tags = common.fixture_tags, @@ -429,7 +429,7 @@ watchos_extension( bundle_id = "com.google.example.exappextension", extensionkit_extension = True, infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], minimum_os_version = common.min_os_watchos.arm64_support, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -652,6 +652,7 @@ watchos_extension( entitlements = "//test/starlark_tests/resources:entitlements.plist", infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-nsextension.plist", ], minimum_os_version = common.min_os_watchos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -718,6 +719,7 @@ watchos_extension( extensionkit_extension = True, infoplists = [ "//test/starlark_tests/resources:Info.plist", + "//test/starlark_tests/resources:Info-extensionkit.plist", ], minimum_os_version = common.min_os_watchos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", @@ -735,7 +737,7 @@ watchos_extension( extensionkit_extension = True, extensions = [":watchos_exappextension"], infoplists = [ - "//test/starlark_tests/resources:WatchosExtensionInfo.plist", + "//test/starlark_tests/resources:WatchosExtensionKitInfo.plist", ], minimum_os_version = common.min_os_watchos.baseline, provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision", diff --git a/test/starlark_tests/watchos_extensionkit_extension_tests.bzl b/test/starlark_tests/watchos_extensionkit_extension_tests.bzl index 35ea11d250..ff369e2a0b 100644 --- a/test/starlark_tests/watchos_extensionkit_extension_tests.bzl +++ b/test/starlark_tests/watchos_extensionkit_extension_tests.bzl @@ -136,8 +136,7 @@ def watchos_extensionkit_extension_test_suite(name): "DTXcode": "*", "DTXcodeBuild": "*", "MinimumOSVersion": common.min_os_watchos.baseline, - "NSExtension:NSExtensionAttributes:WKAppBundleIdentifier": "com.google.example", - "NSExtension:NSExtensionPointIdentifier": "com.apple.watchkit", + "EXAppExtensionAttributes:EXExtensionPointIdentifier": "com.apple.app-intents", "UIDeviceFamily:0": "4", }, tags = [name],