Update apple rules tests to use iOS >= 11, macOS >= 10.13, tvOS >= 11…

…, watchOS >= 4. (#2076) XCode 14 has officially dropped support for earlier versions (although it doesn't yet fail to build). Where necessary, swap out ios i386 platform for sim_arm64, since i386 is not supported in iOS 11 or later. PiperOrigin-RevId: 478777929 (cherry picked from commit 5f7edb8) --------- Co-authored-by: Googler <[email protected]> Co-authored-by: Nicholas Levin <[email protected]>
bazelbuild · Aug 16, 2023 · 1d73e06 · 1d73e06
1 parent 8740da7
commit 1d73e06
Show file tree

Hide file tree

Showing 21 changed files with 132 additions and 270 deletions.
diff --git a/examples/ios/HelloWorld/BUILD b/examples/ios/HelloWorld/BUILD
@@ -36,7 +36,7 @@ ios_application(
     ],
     infoplists = [":Info.plist"],
     launch_storyboard = "//examples/resources:Launch.storyboard",
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     version = ":HelloWorldVersion",
     deps = [":Sources"],
 )

diff --git a/examples/ios/PrenotCalculator/BUILD b/examples/ios/PrenotCalculator/BUILD
@@ -27,7 +27,7 @@ ios_application(
     bundle_id = "com.example.prenot-calculator",
     families = ["iphone"],
     infoplists = ["PrenotCalculator-Info.plist"],
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     deps = [":PrenotCalculator_library"],
 )
 
@@ -71,7 +71,7 @@ objc_library(
 
 ios_unit_test(
     name = "PrenotCalculatorTests",
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     deps = [":PrenotCalculatorTestsLib"],
 )
 

diff --git a/examples/ios/Squarer/BUILD b/examples/ios/Squarer/BUILD
@@ -17,22 +17,22 @@ objc_library(
 ios_unit_test(
     name = "SquarerTests",
     env = {"TEST_ENV_VAR": "test_value"},
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     deps = [":SquarerTestsLib"],
 )
 
 ios_unit_test(
     name = "SquarerTestsOrdered",
     env = {"TEST_ENV_VAR": "test_value"},
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
     deps = [":SquarerTestsLib"],
 )
 
 ios_unit_test(
     name = "SquarerTestsRandom",
     env = {"TEST_ENV_VAR": "test_value"},
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_random_runner",
     deps = [":SquarerTestsLib"],
 )
diff --git a/examples/ios/StickersApp/BUILD b/examples/ios/StickersApp/BUILD
@@ -24,7 +24,7 @@ ios_sticker_pack_extension(
         "ipad",
     ],
     infoplists = ["StickersExtension-Info.plist"],
-    minimum_os_version = "10.0",
+    minimum_os_version = "11.0",
     sticker_assets = glob(["Stickers.xcstickers/**"]),
     version = ":StickerAppVersion",
 )
@@ -39,7 +39,7 @@ ios_imessage_application(
         "ipad",
     ],
     infoplists = ["StickersApp-Info.plist"],
-    minimum_os_version = "10.0",
+    minimum_os_version = "11.0",
     version = ":StickerAppVersion",
 )
 

diff --git a/examples/macos/CommandLine/BUILD b/examples/macos/CommandLine/BUILD
@@ -24,7 +24,7 @@ macos_command_line_application(
     name = "CommandLine",
     bundle_id = "com.example.command-line",
     infoplists = [":Info.plist"],
-    minimum_os_version = "10.11",
+    minimum_os_version = "10.13",
     version = ":CommandLineVersion",
     deps = [":Sources"],
 )

diff --git a/examples/macos/CommandLineSwift/BUILD b/examples/macos/CommandLineSwift/BUILD
@@ -28,7 +28,7 @@ macos_command_line_application(
     name = "CommandLineSwift",
     bundle_id = "com.example.command-line-swift",
     infoplists = [":Info.plist"],
-    minimum_os_version = "10.11",
+    minimum_os_version = "10.13",
     version = ":CommandLineSwiftVersion",
     deps = [":Sources"],
 )

diff --git a/examples/macos/HelloToday/BUILD b/examples/macos/HelloToday/BUILD
@@ -52,7 +52,7 @@ macos_application(
         ":TodayExtension",
     ],
     infoplists = [":App-Info.plist"],
-    minimum_os_version = "10.11",
+    minimum_os_version = "10.13",
     version = ":HelloTodayVersion",
     deps = [":AppSources"],
 )
@@ -62,7 +62,7 @@ macos_extension(
     bundle_id = "com.example.hello-today.today-extension",
     entitlements = ":Ext-Entitlements.entitlements",
     infoplists = [":Ext-Info.plist"],
-    minimum_os_version = "10.11",
+    minimum_os_version = "10.13",
     version = ":HelloTodayVersion",
     deps = [":ExtSources"],
 )

diff --git a/examples/macos/HelloWorld/BUILD b/examples/macos/HelloWorld/BUILD
@@ -32,7 +32,7 @@ macos_application(
     app_icons = ["//examples/resources:MacAppIcon.xcassets"],
     bundle_id = "com.example.hello-world",
     infoplists = [":Info.plist"],
-    minimum_os_version = "10.11",
+    minimum_os_version = "10.13",
     version = ":HelloWorldVersion",
     deps = [":Sources"],
 )

diff --git a/examples/macos/HelloWorldSwift/BUILD b/examples/macos/HelloWorldSwift/BUILD
@@ -32,7 +32,7 @@ macos_application(
     app_icons = ["//examples/resources:MacAppIcon.xcassets"],
     bundle_id = "com.example.hello-world-swift",
     infoplists = [":Info.plist"],
-    minimum_os_version = "10.11",
+    minimum_os_version = "10.13",
     version = ":HelloWorldSwiftVersion",
     deps = [":Sources"],
 )

diff --git a/examples/macos/XPCServiceApp/BUILD b/examples/macos/XPCServiceApp/BUILD
@@ -42,7 +42,7 @@ macos_xpc_service(
     name = "XPCService",
     bundle_id = "com.example.xpc-service-app.xpc-service",
     infoplists = ["XPCServiceSources/Info.plist"],
-    minimum_os_version = "10.11",
+    minimum_os_version = "10.13",
     version = ":XPCServiceAppVersion",
     deps = [":XPCServiceLib"],
 )
@@ -52,7 +52,7 @@ macos_application(
     app_icons = ["//examples/resources:MacAppIcon.xcassets"],
     bundle_id = "com.example.xpc-service-app",
     infoplists = ["XPCServiceAppSources/Info.plist"],
-    minimum_os_version = "10.11",
+    minimum_os_version = "10.13",
     version = ":XPCServiceAppVersion",
     xpc_services = [":XPCService"],
     deps = [":XPCServiceAppLib"],

diff --git a/examples/multi_platform/Buttons/BUILD b/examples/multi_platform/Buttons/BUILD
@@ -98,7 +98,7 @@ ios_application(
         "ipad",
     ],
     infoplists = ["Buttons/Info.plist"],
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     watch_application = ":ButtonsWatch",
     deps = [
         ":ButtonsLib",
@@ -114,7 +114,7 @@ ios_extension(
         "ipad",
     ],
     infoplists = ["ButtonsExtension/Info.plist"],
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     deps = [":ButtonsExtensionLib"],
 )
 
@@ -129,20 +129,20 @@ ios_static_framework(
 
 ios_unit_test(
     name = "ButtonsTests",
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     test_host = ":Buttons",
     deps = [":ButtonsTestsLib"],
 )
 
 ios_unit_test(
     name = "ButtonsLogicTests",
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     deps = [":ButtonsTestsLib"],
 )
 
 ios_ui_test(
     name = "ButtonsUITests",
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     test_host = ":Buttons",
     deps = [":ButtonsUITestsLib"],
 )
@@ -179,15 +179,15 @@ watchos_application(
     bundle_id = "com.google.Buttons.watchkitapp",
     extension = ":ButtonsWatchExtension",
     infoplists = ["ButtonsWatch/Info.plist"],
-    minimum_os_version = "3.0",
+    minimum_os_version = "4.0",
     resources = ["ButtonsWatch/Base.lproj/Interface.storyboard"],
 )
 
 watchos_extension(
     name = "ButtonsWatchExtension",
     bundle_id = "com.google.Buttons.watchkitapp.watchkitextension",
     infoplists = ["ButtonsWatchExtension/Info.plist"],
-    minimum_os_version = "3.0",
+    minimum_os_version = "4.0",
     deps = [
         ":ButtonsWatchExtensionLib",
     ],
@@ -248,7 +248,7 @@ tvos_application(
     bundle_id = "com.google.ButtonsTV",
     extensions = [":ButtonsTVExtension"],
     infoplists = ["ButtonsTV/Info.plist"],
-    minimum_os_version = "10.2",
+    minimum_os_version = "11.0",
     deps = [
         ":ButtonsTVLib",
         ":ButtonsTVResources",
@@ -259,7 +259,7 @@ tvos_extension(
     name = "ButtonsTVExtension",
     bundle_id = "com.google.ButtonsTV.ButtonsTVExtension",
     infoplists = ["ButtonsTVExtension/Info.plist"],
-    minimum_os_version = "10.2",
+    minimum_os_version = "11.0",
     deps = [":ButtonsTVExtensionLib"],
 )
 
@@ -364,7 +364,7 @@ macos_unit_test(
 # Enable when macos_test_runner supports macOS UI Tests.
 # macos_ui_test(
 #     name = "ButtonsMacUITests",
-#     minimum_os_version = "10.11",
+#     minimum_os_version = "10.13",
 #     test_host = ":ButtonsMac",
 #     deps = [":ButtonsMacUITestsLib"],
 # )

diff --git a/examples/tvos/HelloWorld/BUILD b/examples/tvos/HelloWorld/BUILD
@@ -33,7 +33,7 @@ tvos_application(
     app_icons = ["//examples/resources:TVBrandAssets.xcassets"],
     bundle_id = "com.example.hello-world",
     infoplists = [":Info.plist"],
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     version = ":HelloWorldVersion",
     deps = [":Sources"],
 )

diff --git a/examples/watchos/HelloWorld/BUILD b/examples/watchos/HelloWorld/BUILD
@@ -63,7 +63,7 @@ ios_application(
     ],
     infoplists = [":Phone-Info.plist"],
     launch_storyboard = "//examples/resources:Launch.storyboard",
-    minimum_os_version = "9.0",
+    minimum_os_version = "11.0",
     version = ":HelloWorldVersion",
     watch_application = ":HelloWorld-WatchApplication",
     deps = [":PhoneSources"],
@@ -75,7 +75,7 @@ watchos_application(
     bundle_id = "com.example.hello-world.watch",
     extension = ":HelloWorld-WatchExtension",
     infoplists = [":WatchApp-Info.plist"],
-    minimum_os_version = "2.0",
+    minimum_os_version = "4.0",
     storyboards = [
         "WatchResources/Interface.storyboard",
     ],
@@ -86,7 +86,7 @@ watchos_extension(
     name = "HelloWorld-WatchExtension",
     bundle_id = "com.example.hello-world.watch.extension",
     infoplists = [":WatchExt-Info.plist"],
-    minimum_os_version = "2.0",
+    minimum_os_version = "4.0",
     version = ":HelloWorldVersion",
     deps = [":WatchSources"],
 )

diff --git a/test/BUILD b/test/BUILD
@@ -112,10 +112,6 @@ apple_multi_shell_test(
     size = "large",
     src = "ios_application_test.sh",
     configurations = IOS_CONFIGURATIONS,
-    data = [
-        "//test/testdata/binaries:empty_dylib",
-        "//test/testdata/binaries:empty_staticlib",
-    ],
 )
 
 apple_multi_shell_test(
@@ -143,10 +139,6 @@ apple_multi_shell_test(
     size = "medium",
     src = "ios_extension_test.sh",
     configurations = IOS_CONFIGURATIONS,
-    data = [
-        "//test/testdata/binaries:empty_dylib",
-        "//test/testdata/binaries:empty_staticlib",
-    ],
 )
 
 apple_multi_shell_test(
@@ -164,10 +156,6 @@ apple_multi_shell_test(
     size = "medium",
     src = "macos_application_test.sh",
     configurations = MACOS_CONFIGURATIONS,
-    data = [
-        "//test/testdata/binaries:empty_dylib",
-        "//test/testdata/binaries:empty_staticlib",
-    ],
 )
 
 apple_multi_shell_test(
@@ -264,7 +252,7 @@ apple_shell_test(
     size = "large",
     src = "ios_test_runner_unit_test.sh",
     args = [
-        "--ios_multi_cpus=i386,x86_64,sim_arm64",
+        "--ios_multi_cpus=sim_arm64,x86_64",
     ],
     flaky = 1,
     tags = common.skip_ci_tags,
@@ -285,7 +273,7 @@ apple_shell_test(
     size = "large",
     src = "ios_test_runner_ui_test.sh",
     args = [
-        "--ios_multi_cpus=i386,x86_64",
+        "--ios_multi_cpus=sim_arm64,x86_64",
     ],
 )