From eb1cabfb3b5971aac8039a2cbba8e2fe9ddbd2c0 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Tue, 5 Dec 2023 15:35:46 -0600 Subject: [PATCH 1/6] Run tvOS old & new in CI --- .github/workflows/continuous-integration.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index efcac5a65c1..457f41de708 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,22 +21,28 @@ jobs: - macos-13 xcode: - Xcode_14.0.1 - - Xcode_15.0 + - Xcode_15.0.1 destination: - 'platform=iOS Simulator,OS=16.0,name=iPhone 13' - 'platform=iOS Simulator,OS=17.0,name=iPhone 14' + - 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)' + - 'platform=tvOS Simulator,OS=17.0,name=Apple TV 4K (3rd generation) (at 1080p)' - 'platform=OS X' exclude: # Don't run old macOS with new Xcode - runner: macos-12 - xcode: Xcode_15.0 + xcode: Xcode_15.0.1 # Don't run new macOS with old Xcode - runner: macos-13 xcode: Xcode_14.0.1 - # Don't run old iOS simulator with new Xcode + # Don't run old iOS/tvOS simulator with new Xcode + - destination: 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)' + xcode: Xcode_15.0.1 - destination: 'platform=iOS Simulator,OS=16.0,name=iPhone 13' - xcode: Xcode_15.0 + xcode: Xcode_15.0.1 # Don't run new iOS simulator with old Xcode + - destination: 'platform=tvOS Simulator,OS=17.0,name=Apple TV 4K (3rd generation) (at 1080p)' + xcode: Xcode_14.0.1 - destination: 'platform=iOS Simulator,OS=17.0,name=iPhone 14' xcode: Xcode_14.0.1 steps: From 6aa9bb9f9d9b195d60cfad68cb9d01c17528aad6 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Tue, 5 Dec 2023 15:58:42 -0600 Subject: [PATCH 2/6] Set tvOS minimum v13 --- .../Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift | 3 ++- Package.swift | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift index d136fb40d3c..16e97829234 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift @@ -28,7 +28,8 @@ let package = Package( name: "aws-sdk-swift", platforms: [ .macOS(.v10_15), - .iOS(.v13) + .iOS(.v13), + .tvOS(.v13) ], products: [ .library(name: "AWSClientRuntime", targets: ["AWSClientRuntime"]) diff --git a/Package.swift b/Package.swift index 79450adc98b..38b9781f61a 100644 --- a/Package.swift +++ b/Package.swift @@ -28,7 +28,8 @@ let package = Package( name: "aws-sdk-swift", platforms: [ .macOS(.v10_15), - .iOS(.v13) + .iOS(.v13), + .tvOS(.v13) ], products: [ .library(name: "AWSClientRuntime", targets: ["AWSClientRuntime"]) From b2ddc97e0020beeda0a3f092b607a3cff316cbd8 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Tue, 5 Dec 2023 16:02:38 -0600 Subject: [PATCH 3/6] Fix comment --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 457f41de708..6bf7bf32e43 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -40,7 +40,7 @@ jobs: xcode: Xcode_15.0.1 - destination: 'platform=iOS Simulator,OS=16.0,name=iPhone 13' xcode: Xcode_15.0.1 - # Don't run new iOS simulator with old Xcode + # Don't run new iOS/tvOS simulator with old Xcode - destination: 'platform=tvOS Simulator,OS=17.0,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_14.0.1 - destination: 'platform=iOS Simulator,OS=17.0,name=iPhone 14' From 8003b109721928ec1963e3a7e6441a3cb720e99e Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Tue, 5 Dec 2023 17:19:59 -0600 Subject: [PATCH 4/6] Handle additional OSes in user agent tests --- .../UserAgent/AWSUserAgentMetadataTests.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Tests/Core/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift b/Tests/Core/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift index cf5f0d70ddc..b232f3e43be 100644 --- a/Tests/Core/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift +++ b/Tests/Core/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift @@ -105,6 +105,12 @@ class AWSUseragentMetadataTests: XCTestCase { expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/macos#11.4 lang/swift#9.9" case .iOS: expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/ios#11.4 lang/swift#9.9" + case .tvOS: + expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/tvos#11.4 lang/swift#9.9" + case .visionOS: + expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/visionos#11.4 lang/swift#9.9" + case .watchOS: + expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/watchgit add os#11.4 lang/swift#9.9" case .unknown: expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/unknown#11.4 lang/swift#9.9" default: From 5e9c5646f4eb6ca5080f02e8f7a44e4000a1460d Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Tue, 5 Dec 2023 17:22:51 -0600 Subject: [PATCH 5/6] Fix watch test --- .../UserAgent/AWSUserAgentMetadataTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Core/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift b/Tests/Core/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift index b232f3e43be..a59f02826a1 100644 --- a/Tests/Core/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift +++ b/Tests/Core/AWSClientRuntimeTests/UserAgent/AWSUserAgentMetadataTests.swift @@ -110,7 +110,7 @@ class AWSUseragentMetadataTests: XCTestCase { case .visionOS: expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/visionos#11.4 lang/swift#9.9" case .watchOS: - expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/watchgit add os#11.4 lang/swift#9.9" + expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/watchos#11.4 lang/swift#9.9" case .unknown: expected = "aws-sdk-swift/1.2.3 ua/2.0 api/test_service#1.2.3 os/unknown#11.4 lang/swift#9.9" default: From 87ea324cdba2e7044fe17406df1b088c49ecf5d9 Mon Sep 17 00:00:00 2001 From: Josh Elkins Date: Wed, 6 Dec 2023 10:03:43 -0600 Subject: [PATCH 6/6] Add watchOS platform minimum, revert latest Xcode version --- .github/workflows/continuous-integration.yml | 12 ++++++------ .../AWSSDKSwiftCLI/Resources/Package.Base.swift | 3 ++- Package.swift | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6bf7bf32e43..1ca9284495e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,7 +21,7 @@ jobs: - macos-13 xcode: - Xcode_14.0.1 - - Xcode_15.0.1 + - Xcode_15.0 destination: - 'platform=iOS Simulator,OS=16.0,name=iPhone 13' - 'platform=iOS Simulator,OS=17.0,name=iPhone 14' @@ -31,16 +31,16 @@ jobs: exclude: # Don't run old macOS with new Xcode - runner: macos-12 - xcode: Xcode_15.0.1 + xcode: Xcode_15.0 # Don't run new macOS with old Xcode - runner: macos-13 xcode: Xcode_14.0.1 - # Don't run old iOS/tvOS simulator with new Xcode + # Don't run old simulators with new Xcode - destination: 'platform=tvOS Simulator,OS=16.0,name=Apple TV 4K (at 1080p) (2nd generation)' - xcode: Xcode_15.0.1 + xcode: Xcode_15.0 - destination: 'platform=iOS Simulator,OS=16.0,name=iPhone 13' - xcode: Xcode_15.0.1 - # Don't run new iOS/tvOS simulator with old Xcode + xcode: Xcode_15.0 + # Don't run new simulators with old Xcode - destination: 'platform=tvOS Simulator,OS=17.0,name=Apple TV 4K (3rd generation) (at 1080p)' xcode: Xcode_14.0.1 - destination: 'platform=iOS Simulator,OS=17.0,name=iPhone 14' diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift index 16e97829234..668f742134d 100644 --- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift +++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift @@ -29,7 +29,8 @@ let package = Package( platforms: [ .macOS(.v10_15), .iOS(.v13), - .tvOS(.v13) + .tvOS(.v13), + .watchOS(.v6) ], products: [ .library(name: "AWSClientRuntime", targets: ["AWSClientRuntime"]) diff --git a/Package.swift b/Package.swift index 38b9781f61a..8d27ad85009 100644 --- a/Package.swift +++ b/Package.swift @@ -29,7 +29,8 @@ let package = Package( platforms: [ .macOS(.v10_15), .iOS(.v13), - .tvOS(.v13) + .tvOS(.v13), + .watchOS(.v6) ], products: [ .library(name: "AWSClientRuntime", targets: ["AWSClientRuntime"])