Update minimum_os_version for XCTest support in Xcode 15.3. Add additional references to common.bzl test targets where it's convenient.

This leaves the "examples" targets alone, as we're assuming that they should be documentation.

PiperOrigin-RevId: 611539077

Author: nglevin

test/starlark_tests/apple_static_xcframework_import_tests.bzl

@@ -218,7 +218,7 @@ def apple_static_xcframework_import_test_suite(name):
             "-[SharedClass doSomethingShared]",
             "_OBJC_CLASS_$_SharedClass",
         ],
-        macho_load_commands_contain = ["cmd LC_VERSION_MIN_TVOS"],
+        macho_load_commands_contain = ["cmd LC_BUILD_VERSION", "platform TVOSSIMULATOR"],
         tags = [name],
     )
 

test/starlark_tests/common.bzl

@@ -23,14 +23,14 @@ _fixture_tags = [
     "notap",
 ]
 
-# The current baseline for iOS is version 12.0, based on Xcode 15's minimum version
+# The current baseline for iOS is version 13.0, based on Xcode 15.3's minimum version for XCTest.
 _min_os_ios = struct(
     app_intents_support = "16.0",
     appclip_support = "14.0",
     arm_sim_support = "14.0",
-    baseline = "12.0",
+    baseline = "13.0",
     oldest_supported = "12.0",
-    nplus1 = "13.0",
+    nplus1 = "14.0",
     stable_swift_abi = "12.2",
     widget_configuration_intents_support = "16.0",
 )
@@ -41,14 +41,13 @@ _min_os_macos = struct(
     baseline = "10.13",
 )
 
-# The current baseline for tvOS is version 12.0, based on Xcode 15's minimum version.
-# introduced.
+# The current baseline for tvOS is version 13.0, based on Xcode 15.3's minimum version for XCTest.
 _min_os_tvos = struct(
     app_intents_support = "16.0",
     arm_sim_support = "14.0",
-    baseline = "12.0",
+    baseline = "13.0",
     oldest_supported = "12.0",
-    nplus1 = "13.0",
+    nplus1 = "14.0",
     stable_swift_abi = "12.2",
 )
 

test/starlark_tests/ios_framework_tests.bzl

@@ -628,10 +628,10 @@ def ios_framework_test_suite(name):
         name = "{}_app_with_baseline_min_os_and_nplus1_fmwk_produces_error".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/ios:app_with_baseline_min_os_and_nplus1_fmwk",
         expected_error = """
-ERROR: minimum_os_version 13.0 on the framework //test/starlark_tests/targets_under_test/ios:fmwk_min_os_nplus1 is too high compared to //test/starlark_tests/targets_under_test/ios:app_with_baseline_min_os_and_nplus1_fmwk's minimum_os_version of 12.0
+ERROR: minimum_os_version {framework_version} on the framework //test/starlark_tests/targets_under_test/ios:fmwk_min_os_nplus1 is too high compared to //test/starlark_tests/targets_under_test/ios:app_with_baseline_min_os_and_nplus1_fmwk's minimum_os_version of {app_version}
 
 Please address the minimum_os_version on framework //test/starlark_tests/targets_under_test/ios:fmwk_min_os_nplus1 to match //test/starlark_tests/targets_under_test/ios:app_with_baseline_min_os_and_nplus1_fmwk's minimum_os_version.
-""",
+""".format(app_version = common.min_os_ios.baseline, framework_version = common.min_os_ios.nplus1),
         tags = [name],
     )
 
@@ -641,10 +641,10 @@ Please address the minimum_os_version on framework //test/starlark_tests/targets
         name = "{}_app_with_baseline_min_os_and_nplus1_transitive_data_fmwk_produces_error".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/ios:app_with_nplus1_framework_objc_lib_using_data",
         expected_error = """
-ERROR: minimum_os_version 13.0 on the framework //test/starlark_tests/targets_under_test/ios:fmwk_min_os_nplus1 is too high compared to //test/starlark_tests/targets_under_test/ios:app_with_nplus1_framework_objc_lib_using_data's minimum_os_version of 12.0
+ERROR: minimum_os_version {framework_version} on the framework //test/starlark_tests/targets_under_test/ios:fmwk_min_os_nplus1 is too high compared to //test/starlark_tests/targets_under_test/ios:app_with_nplus1_framework_objc_lib_using_data's minimum_os_version of {app_version}
 
 Please address the minimum_os_version on framework //test/starlark_tests/targets_under_test/ios:fmwk_min_os_nplus1 to match //test/starlark_tests/targets_under_test/ios:app_with_nplus1_framework_objc_lib_using_data's minimum_os_version.
-""",
+""".format(app_version = common.min_os_ios.baseline, framework_version = common.min_os_ios.nplus1),
         tags = [name],
     )
 

test/starlark_tests/targets_under_test/ios/BUILD

@@ -1009,7 +1009,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     deps = [
@@ -1151,7 +1151,7 @@ ios_extension(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     deps = [
@@ -1647,7 +1647,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":dynamic_fmwk_depending_swift_lib",
@@ -1803,7 +1803,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":swift_static_without_module_interfaces_fmwk_depending_lib",
@@ -1844,7 +1844,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":swift_static_fmwk_depending_swift_lib",
@@ -1966,7 +1966,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":dynamic_objc_xcframework_depending_swift_lib",
@@ -2076,7 +2076,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":dynamic_swift_xcframework_depending_swift_lib",
@@ -2147,7 +2147,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":static_fmwk_depending_swift_lib",
@@ -2232,7 +2232,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":swift_static_xcframework_depending_objc_lib",
@@ -2273,7 +2273,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":swift_static_xcframework_without_swiftmodule_depending_objc_lib",
@@ -2324,7 +2324,7 @@ ios_application(
     bundle_id = "com.google.example",
     families = ["iphone"],
     infoplists = ["//test/starlark_tests/resources:Info.plist"],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":static_xcframework_depending_swift_lib",
@@ -2387,7 +2387,7 @@ ios_application(
     bundle_id = "com.google.example",
     families = ["iphone"],
     infoplists = ["//test/starlark_tests/resources:Info.plist"],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     tags = common.fixture_tags,
     deps = [
         ":static_swift_xcframework_depending_swift_lib",

test/starlark_tests/targets_under_test/tvos/BUILD

@@ -113,7 +113,7 @@ tvos_application(
     bundle_id = "com.google.example",
     extensions = [":swift_ext"],
     infoplists = ["//test/starlark_tests/resources:Info.plist"],
-    minimum_os_version = common.min_os_tvos.baseline,
+    minimum_os_version = common.min_os_tvos.oldest_supported,  # Before the stable Swift ABI
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     deps = ["//test/starlark_tests/resources:objc_main_lib"],
@@ -135,7 +135,7 @@ tvos_extension(
     bundle_id = "com.google.example.ext",
     entitlements = "//test/starlark_tests/resources:entitlements.plist",
     infoplists = ["//test/starlark_tests/resources:Info.plist"],
-    minimum_os_version = common.min_os_tvos.baseline,
+    minimum_os_version = common.min_os_tvos.oldest_supported,  # Before the stable Swift ABI
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     deps = [
@@ -320,7 +320,7 @@ tvos_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_tvos.baseline,
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     deps = [
@@ -1077,7 +1077,7 @@ tvos_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_tvos.baseline,
+    minimum_os_version = common.min_os_tvos.oldest_supported,  # Before the stable Swift ABI
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     deps = [":swift_lib"],
@@ -1089,7 +1089,7 @@ tvos_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_tvos.baseline,
+    minimum_os_version = common.min_os_tvos.oldest_supported,  # Before the stable Swift ABI
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     deps = [":objc_to_swift_lib"],
@@ -1275,7 +1275,7 @@ tvos_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_tvos.baseline,
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     deps = [
@@ -1291,7 +1291,7 @@ tvos_framework(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.nplus1,
+    minimum_os_version = common.min_os_tvos.nplus1,
     tags = common.fixture_tags,
     deps = [
         "//test/starlark_tests/resources:basic_bundle_lib",

test/starlark_tests/targets_under_test/watchos/BUILD

@@ -312,7 +312,7 @@ watchos_application(
     infoplists = [
         "//test/starlark_tests/resources:WatchosAppInfo.plist",
     ],
-    minimum_os_version = "6.0",
+    minimum_os_version = common.min_os_watchos.baseline,
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     resources = [
         "//test/starlark_tests/resources:example_filegroup",
@@ -357,7 +357,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     watch_application = ":watchos_app_no_swift",
@@ -391,7 +391,7 @@ ios_application(
     infoplists = [
         "//test/starlark_tests/resources:Info.plist",
     ],
-    minimum_os_version = common.min_os_ios.baseline,
+    minimum_os_version = common.min_os_ios.oldest_supported,  # Before the stable Swift ABI
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
     watch_application = ":watchos_app_swift",
@@ -503,7 +503,7 @@ watchos_application(
     infoplists = [
         "//test/starlark_tests/resources:WatchosAppInfo.plist",
     ],
-    minimum_os_version = "6.0",
+    minimum_os_version = common.min_os_watchos.stable_swift_abi,
     provisioning_profile = "//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     tags = common.fixture_tags,
 )

test/starlark_tests/tvos_framework_tests.bzl

@@ -349,10 +349,10 @@ def tvos_framework_test_suite(name):
         name = "{}_app_with_baseline_min_os_and_nplus1_fmwk_produces_error".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/tvos:app_with_baseline_min_os_and_nplus1_fmwk",
         expected_error = """
-ERROR: minimum_os_version 13.0 on the framework //test/starlark_tests/targets_under_test/tvos:fmwk_min_os_nplus1 is too high compared to //test/starlark_tests/targets_under_test/tvos:app_with_baseline_min_os_and_nplus1_fmwk's minimum_os_version of 12.0
+ERROR: minimum_os_version {framework_version} on the framework //test/starlark_tests/targets_under_test/tvos:fmwk_min_os_nplus1 is too high compared to //test/starlark_tests/targets_under_test/tvos:app_with_baseline_min_os_and_nplus1_fmwk's minimum_os_version of {app_version}
 
 Please address the minimum_os_version on framework //test/starlark_tests/targets_under_test/tvos:fmwk_min_os_nplus1 to match //test/starlark_tests/targets_under_test/tvos:app_with_baseline_min_os_and_nplus1_fmwk's minimum_os_version.
-""",
+""".format(app_version = common.min_os_tvos.baseline, framework_version = common.min_os_tvos.nplus1),
         tags = [name],
     )
 
@@ -362,10 +362,10 @@ Please address the minimum_os_version on framework //test/starlark_tests/targets
         name = "{}_app_with_baseline_min_os_and_nplus1_transitive_data_fmwk_produces_error".format(name),
         target_under_test = "//test/starlark_tests/targets_under_test/tvos:app_with_nplus1_framework_objc_lib_using_data",
         expected_error = """
-ERROR: minimum_os_version 13.0 on the framework //test/starlark_tests/targets_under_test/tvos:fmwk_min_os_nplus1 is too high compared to //test/starlark_tests/targets_under_test/tvos:app_with_nplus1_framework_objc_lib_using_data's minimum_os_version of 12.0
+ERROR: minimum_os_version {framework_version} on the framework //test/starlark_tests/targets_under_test/tvos:fmwk_min_os_nplus1 is too high compared to //test/starlark_tests/targets_under_test/tvos:app_with_nplus1_framework_objc_lib_using_data's minimum_os_version of {app_version}
 
 Please address the minimum_os_version on framework //test/starlark_tests/targets_under_test/tvos:fmwk_min_os_nplus1 to match //test/starlark_tests/targets_under_test/tvos:app_with_nplus1_framework_objc_lib_using_data's minimum_os_version.
-""",
+""".format(app_version = common.min_os_tvos.baseline, framework_version = common.min_os_tvos.nplus1),
         tags = [name],
     )
 

test/starlark_tests/watchos_application_swift_tests.bzl

@@ -121,7 +121,7 @@ def watchos_application_swift_test_suite(name):
             "bundle/Payload/companion.app/Watch/app.app/app",
             "bundle/Payload/companion.app/Watch/app.app/PlugIns/ext.appex/Info.plist",
             "bundle/Payload/companion.app/Watch/app.app/PlugIns/ext.appex/ext",
-            "bundle/SwiftSupport/iphoneos/libswiftCore.dylib",
+            "bundle/SwiftSupport/watchos/libswiftCore.dylib",
             "bundle/WatchKitSupport2/WK",
             "dossier/manifest.json",
         ],

test/testdata/binaries/BUILD

@@ -2,6 +2,10 @@ load(
     "//apple:apple_binary.bzl",
     "apple_binary",
 )
+load(
+    "//test/starlark_tests:common.bzl",
+    "common",
+)
 
 package(
     default_visibility = ["//test:__subpackages__"],
@@ -12,7 +16,7 @@ licenses(["notice"])
 apple_binary(
     name = "empty_tvos_dylib",
     binary_type = "dylib",
-    minimum_os_version = "12.0",
+    minimum_os_version = common.min_os_tvos.baseline,
     platform_type = "tvos",
     deps = [":dummy_lib"],
 )