From 12f9512a198f92d6617a3487329c175dcb89fb02 Mon Sep 17 00:00:00 2001 From: Nick Bourdakos Date: Fri, 16 Jun 2023 17:36:31 -0700 Subject: [PATCH] Use IOS_LATEST for the test runner to prevent Xcode 14.3 issues PiperOrigin-RevId: 541053739 --- connections/clients/ios/BUILD | 4 ++-- connections/swift/NearbyConnections/BUILD | 4 ++-- connections/swift/NearbyCoreAdapter/BUILD | 4 ++-- internal/platform/implementation/apple/Tests/BUILD | 4 ++-- minimum_os.bzl | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/connections/clients/ios/BUILD b/connections/clients/ios/BUILD index b30e5c98..8f81359e 100644 --- a/connections/clients/ios/BUILD +++ b/connections/clients/ios/BUILD @@ -16,7 +16,7 @@ load("//tools/build_defs/apple:ios.bzl", "ios_unit_test") load("//tools/build_defs/swift:swift_library.bzl", "swift_library") -load("//third_party/nearby:minimum_os.bzl", "IOS_MINIMUM_OS", "IOS_MINIMUM_TEST_RUNNER") +load("//third_party/nearby:minimum_os.bzl", "IOS_LATEST_TEST_RUNNER", "IOS_MINIMUM_OS") licenses(["notice"]) @@ -73,7 +73,7 @@ swift_library( ios_unit_test( name = "BuildTests", minimum_os_version = IOS_MINIMUM_OS, - runner = IOS_MINIMUM_TEST_RUNNER, + runner = IOS_LATEST_TEST_RUNNER, deps = [ ":BuildTestsLib", ], diff --git a/connections/swift/NearbyConnections/BUILD b/connections/swift/NearbyConnections/BUILD index d828eebf..008e6358 100644 --- a/connections/swift/NearbyConnections/BUILD +++ b/connections/swift/NearbyConnections/BUILD @@ -14,7 +14,7 @@ load("//tools/build_defs/apple:ios.bzl", "ios_unit_test") load("//tools/build_defs/swift:swift_library.bzl", "swift_library") -load("//third_party/nearby:minimum_os.bzl", "IOS_MINIMUM_OS", "IOS_MINIMUM_TEST_RUNNER") +load("//third_party/nearby:minimum_os.bzl", "IOS_LATEST_TEST_RUNNER", "IOS_MINIMUM_OS") licenses(["notice"]) @@ -43,7 +43,7 @@ swift_library( ios_unit_test( name = "Tests", minimum_os_version = IOS_MINIMUM_OS, - runner = IOS_MINIMUM_TEST_RUNNER, + runner = IOS_LATEST_TEST_RUNNER, deps = [ ":TestsLib", ], diff --git a/connections/swift/NearbyCoreAdapter/BUILD b/connections/swift/NearbyCoreAdapter/BUILD index 5aebee41..d92ec9c2 100644 --- a/connections/swift/NearbyCoreAdapter/BUILD +++ b/connections/swift/NearbyCoreAdapter/BUILD @@ -14,7 +14,7 @@ load("//tools/build_defs/apple:ios.bzl", "ios_unit_test") load("//tools/build_defs/swift:swift_library.bzl", "swift_library") -load("//third_party/nearby:minimum_os.bzl", "IOS_MINIMUM_OS", "IOS_MINIMUM_TEST_RUNNER") +load("//third_party/nearby:minimum_os.bzl", "IOS_LATEST_TEST_RUNNER", "IOS_MINIMUM_OS") licenses(["notice"]) @@ -54,7 +54,7 @@ swift_library( ios_unit_test( name = "Tests", minimum_os_version = IOS_MINIMUM_OS, - runner = IOS_MINIMUM_TEST_RUNNER, + runner = IOS_LATEST_TEST_RUNNER, deps = [ ":TestsLib", ], diff --git a/internal/platform/implementation/apple/Tests/BUILD b/internal/platform/implementation/apple/Tests/BUILD index 16e7ef0d..12775041 100644 --- a/internal/platform/implementation/apple/Tests/BUILD +++ b/internal/platform/implementation/apple/Tests/BUILD @@ -13,7 +13,7 @@ # limitations under the License. load("//tools/build_defs/apple:ios.bzl", "ios_unit_test") -load("//third_party/nearby:minimum_os.bzl", "IOS_MINIMUM_OS", "IOS_MINIMUM_TEST_RUNNER") +load("//third_party/nearby:minimum_os.bzl", "IOS_LATEST_TEST_RUNNER", "IOS_MINIMUM_OS") licenses(["notice"]) @@ -49,7 +49,7 @@ objc_library( ios_unit_test( name = "PlatformTests", minimum_os_version = IOS_MINIMUM_OS, - runner = IOS_MINIMUM_TEST_RUNNER, + runner = IOS_LATEST_TEST_RUNNER, deps = [ ":PlatformTestslib", ], diff --git a/minimum_os.bzl b/minimum_os.bzl index c51a86e2..d708b89f 100644 --- a/minimum_os.bzl +++ b/minimum_os.bzl @@ -1,4 +1,4 @@ """Minimum OS version definitions and related test setup""" IOS_MINIMUM_OS = "13.7" -IOS_MINIMUM_TEST_RUNNER = "//testing/utp/ios:IPHONE_6S_13_7" +IOS_LATEST_TEST_RUNNER = "//testing/utp/ios:IOS_LATEST"