From df7e457ab64c1fcdcef917aa9b5af65939a586ed Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Mon, 29 Apr 2024 19:45:21 -0400 Subject: [PATCH 01/21] feat: update sqlite.swift dependency to 0.15.3 --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 2be2cf993d..cd4f91e3f0 100644 --- a/Package.resolved +++ b/Package.resolved @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/stephencelis/SQLite.swift.git", "state" : { - "revision" : "e78ae0220e17525a15ac68c697a155eb7a672a8e", - "version" : "0.15.0" + "revision" : "a95fc6df17d108bd99210db5e8a9bac90fe984b8", + "version" : "0.15.3" } }, { diff --git a/Package.swift b/Package.swift index c26132df6f..e27a4ac4b5 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let platforms: [SupportedPlatform] = [ ] let dependencies: [Package.Dependency] = [ .package(url: "https://github.com/awslabs/aws-sdk-swift.git", exact: "0.36.1"), - .package(url: "https://github.com/stephencelis/SQLite.swift.git", exact: "0.15.0"), + .package(url: "https://github.com/stephencelis/SQLite.swift.git", exact: "0.15.3"), .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"), .package(url: "https://github.com/aws-amplify/amplify-swift-utils-notifications.git", from: "1.1.0") ] From 1ecb3420699a204afd2bdcb23cc1d537d4da398f Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 09:50:58 -0400 Subject: [PATCH 02/21] pin to sqlite.swift 15.0 for swift 5.7 support --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index cd4f91e3f0..2be2cf993d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/stephencelis/SQLite.swift.git", "state" : { - "revision" : "a95fc6df17d108bd99210db5e8a9bac90fe984b8", - "version" : "0.15.3" + "revision" : "e78ae0220e17525a15ac68c697a155eb7a672a8e", + "version" : "0.15.0" } }, { diff --git a/Package.swift b/Package.swift index e27a4ac4b5..c26132df6f 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let platforms: [SupportedPlatform] = [ ] let dependencies: [Package.Dependency] = [ .package(url: "https://github.com/awslabs/aws-sdk-swift.git", exact: "0.36.1"), - .package(url: "https://github.com/stephencelis/SQLite.swift.git", exact: "0.15.3"), + .package(url: "https://github.com/stephencelis/SQLite.swift.git", exact: "0.15.0"), .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"), .package(url: "https://github.com/aws-amplify/amplify-swift-utils-notifications.git", from: "1.1.0") ] From e47abb42efbdcb7fa336e3bce4ae4fd27b2b0c4a Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:17:52 -0400 Subject: [PATCH 03/21] bump to swift 5.9 and back to sqlite 0.15.3 --- .../get_platform_parameters/action.yml | 12 ++++++------ Package.resolved | 4 ++-- Package.swift | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index c9e8e61e07..730f9a94d0 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -38,9 +38,9 @@ runs: - id: get-xcode-version run: | - LATEST_XCODE_VERSION=14.3.1 - MINIMUM_XCODE_VERSION_IOS_MAC=14.1.0 - MINIMUM_XCODE_VERSION_WATCH_TV=14.3.1 + LATEST_XCODE_VERSION=15.3.0 + MINIMUM_XCODE_VERSION_IOS_MAC=15.0.0 + MINIMUM_XCODE_VERSION_WATCH_TV=15.0.0 INPUT_XCODE_VERSION=${{ inputs.xcode_version }} @@ -76,9 +76,9 @@ runs: "macOS": "platform=macOS,arch=x86_64" }, "latest": { - "iOS": "platform=iOS Simulator,name=iPhone 14,OS=16.4", - "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=16.4", - "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.4", + "iOS": "platform=iOS Simulator,name=iPhone 15,OS=17.4", + "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=17.4", + "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=10.4", "macOS": "platform=macOS,arch=x86_64" } }' diff --git a/Package.resolved b/Package.resolved index 2be2cf993d..cd4f91e3f0 100644 --- a/Package.resolved +++ b/Package.resolved @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/stephencelis/SQLite.swift.git", "state" : { - "revision" : "e78ae0220e17525a15ac68c697a155eb7a672a8e", - "version" : "0.15.0" + "revision" : "a95fc6df17d108bd99210db5e8a9bac90fe984b8", + "version" : "0.15.3" } }, { diff --git a/Package.swift b/Package.swift index c26132df6f..5028b7fdda 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.7 +// swift-tools-version:5.9 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -10,7 +10,7 @@ let platforms: [SupportedPlatform] = [ ] let dependencies: [Package.Dependency] = [ .package(url: "https://github.com/awslabs/aws-sdk-swift.git", exact: "0.36.1"), - .package(url: "https://github.com/stephencelis/SQLite.swift.git", exact: "0.15.0"), + .package(url: "https://github.com/stephencelis/SQLite.swift.git", exact: "0.15.3"), .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"), .package(url: "https://github.com/aws-amplify/amplify-swift-utils-notifications.git", from: "1.1.0") ] From 86b872949ce32922eaac95bda76653c11a4f49c9 Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:23:16 -0400 Subject: [PATCH 04/21] use macos-latest. currently macos-14 arm64 --- .../build_minimum_supported_swift_platforms.yml | 2 +- .github/workflows/build_scheme.yml | 2 +- .github/workflows/canary.yml | 4 ++-- .github/workflows/integ_test_push_notifications.yml | 2 +- .github/workflows/release_kickoff.yml | 4 ++-- .github/workflows/run_integration_tests.yml | 2 +- .github/workflows/run_unit_tests.yml | 2 +- .github/workflows/stress_test.yml | 12 ++++++------ 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_minimum_supported_swift_platforms.yml b/.github/workflows/build_minimum_supported_swift_platforms.yml index 0e0522a479..c728f9fa99 100644 --- a/.github/workflows/build_minimum_supported_swift_platforms.yml +++ b/.github/workflows/build_minimum_supported_swift_platforms.yml @@ -27,7 +27,7 @@ jobs: uses: ./.github/workflows/build_scheme.yml with: scheme: Amplify-Build - os-runner: ${{ (matrix.platform == 'tvOS' || matrix.platform == 'watchOS') && 'macos-13' || 'macos-12' }} + os-runner: macos-latest xcode-version: 'minimum' platform: ${{ matrix.platform }} save_build_cache: false diff --git a/.github/workflows/build_scheme.yml b/.github/workflows/build_scheme.yml index 1ec3b433fc..df802858ee 100644 --- a/.github/workflows/build_scheme.yml +++ b/.github/workflows/build_scheme.yml @@ -16,7 +16,7 @@ on: os-runner: type: string - default: 'macos-13' + default: 'macos-latest' save_build_cache: type: boolean diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 9b1631d149..26055fa5d3 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -15,11 +15,11 @@ jobs: strategy: matrix: include: - - os: macos-13 + - os: macos-latest xcode-version: 14.3.1 device: iPhone 14 Pro version: 16.4 - - os: macos-12 + - os: macos-latest xcode-version: 14.1 device: iPhone 13 Pro version: 16.1 diff --git a/.github/workflows/integ_test_push_notifications.yml b/.github/workflows/integ_test_push_notifications.yml index ff8c2c6a2a..89cfa8d756 100644 --- a/.github/workflows/integ_test_push_notifications.yml +++ b/.github/workflows/integ_test_push_notifications.yml @@ -26,7 +26,7 @@ permissions: jobs: push-notification-integration-tests: name: ${{ matrix.platform }} Tests | PushNotificationHostApp - runs-on: macos-13 + runs-on: macos-latest timeout-minutes: 30 environment: IntegrationTest strategy: diff --git a/.github/workflows/release_kickoff.yml b/.github/workflows/release_kickoff.yml index 86145a487c..76fc248335 100644 --- a/.github/workflows/release_kickoff.yml +++ b/.github/workflows/release_kickoff.yml @@ -1,5 +1,5 @@ # Creates a PR to push main to release branch to kick-off the release workflow -name: Release Amplify iOS +name: Release Amplify iOS on: workflow_dispatch: @@ -10,7 +10,7 @@ permissions: jobs: release: name: Release - runs-on: macos-12 + runs-on: macos-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 36adfa4645..6d7ffc993d 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -4,7 +4,7 @@ on: inputs: os-runner: type: string - default: 'macos-13' + default: 'macos-latest' scheme: description: 'The scheme to run the tests' required: true diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index c3ef4fc588..3ba913a2c1 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -39,7 +39,7 @@ permissions: jobs: unit-tests: name: ${{ inputs.platform }} Tests | ${{ inputs.scheme }} - runs-on: macos-13 + runs-on: macos-latest timeout-minutes: ${{ inputs.timeout-minutes }} steps: - name: Checkout repository diff --git a/.github/workflows/stress_test.yml b/.github/workflows/stress_test.yml index 32764beef5..7c9aa6692e 100644 --- a/.github/workflows/stress_test.yml +++ b/.github/workflows/stress_test.yml @@ -14,7 +14,7 @@ concurrency: jobs: prepare-for-test: - runs-on: macos-13 + runs-on: macos-latest environment: IntegrationTest outputs: destination: ${{ steps.platform.outputs.destination }} @@ -40,7 +40,7 @@ jobs: auth-stress-test: needs: prepare-for-test - runs-on: macos-13 + runs-on: macos-latest environment: IntegrationTest env: DESTINATION: ${{ needs.prepare-for-test.outputs.destination }} @@ -71,7 +71,7 @@ jobs: geo-stress-test: needs: prepare-for-test - runs-on: macos-13 + runs-on: macos-latest environment: IntegrationTest env: DESTINATION: ${{ needs.prepare-for-test.outputs.destination }} @@ -102,7 +102,7 @@ jobs: storage-stress-test: needs: prepare-for-test - runs-on: macos-13 + runs-on: macos-latest environment: IntegrationTest env: DESTINATION: ${{ needs.prepare-for-test.outputs.destination }} @@ -133,7 +133,7 @@ jobs: datastore-stress-test: needs: prepare-for-test - runs-on: macos-13 + runs-on: macos-latest environment: IntegrationTest env: DESTINATION: ${{ needs.prepare-for-test.outputs.destination }} @@ -164,7 +164,7 @@ jobs: graphql-api-stress-test: needs: prepare-for-test - runs-on: macos-13 + runs-on: macos-latest environment: IntegrationTest env: DESTINATION: ${{ needs.prepare-for-test.outputs.destination }} From d5518c12802ecee190c152a8a8606b2296d6b124 Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:36:03 -0400 Subject: [PATCH 05/21] bump min to xcode 15.0.1 for macos-latest --- .github/composite_actions/get_platform_parameters/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index 730f9a94d0..86dda8c526 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -39,8 +39,8 @@ runs: - id: get-xcode-version run: | LATEST_XCODE_VERSION=15.3.0 - MINIMUM_XCODE_VERSION_IOS_MAC=15.0.0 - MINIMUM_XCODE_VERSION_WATCH_TV=15.0.0 + MINIMUM_XCODE_VERSION_IOS_MAC=15.0.1 + MINIMUM_XCODE_VERSION_WATCH_TV=15.0.1 INPUT_XCODE_VERSION=${{ inputs.xcode_version }} From dc7704e9f32bee3709cface4321bd2fcf4b997ba Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:56:35 -0400 Subject: [PATCH 06/21] use 3rd gen apple tv for latest destination --- .github/composite_actions/get_platform_parameters/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index 86dda8c526..857c13c0c1 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -77,7 +77,7 @@ runs: }, "latest": { "iOS": "platform=iOS Simulator,name=iPhone 15,OS=17.4", - "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=17.4", + "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=17.4", "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=10.4", "macOS": "platform=macOS,arch=x86_64" } From 00c6e896a9091db4d68a5515892a979fb3ea0671 Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:29:56 -0400 Subject: [PATCH 07/21] use macos-13 for coreml vision framework unit tests --- .github/workflows/run_unit_tests.yml | 5 ++++- .github/workflows/run_unit_tests_platforms.yml | 7 ++++++- .github/workflows/unit_test_predictions.yml | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index 3ba913a2c1..966ad732fc 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -32,6 +32,9 @@ on: required: false type: string default: '-test-iterations 3 -retry-tests-on-failure' + runner: + description: 'runs-on input' + type: string permissions: contents: read @@ -39,7 +42,7 @@ permissions: jobs: unit-tests: name: ${{ inputs.platform }} Tests | ${{ inputs.scheme }} - runs-on: macos-latest + runs-on: ${{ inputs.runner }} timeout-minutes: ${{ inputs.timeout-minutes }} steps: - name: Checkout repository diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml index 852cbd1b12..2e25311e36 100644 --- a/.github/workflows/run_unit_tests_platforms.yml +++ b/.github/workflows/run_unit_tests_platforms.yml @@ -21,6 +21,10 @@ on: required: false type: string default: '-test-iterations 3 -retry-tests-on-failure' + runner: + description: 'runs-on input' + type: string + default: 'macos-latest' permissions: contents: read @@ -43,4 +47,5 @@ jobs: platform: ${{ matrix.platform }} generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }} timeout-minutes: ${{ inputs.timeout-minutes }} - test_iterations_flags: ${{ inputs.test_iterations_flags }} \ No newline at end of file + test_iterations_flags: ${{ inputs.test_iterations_flags }} + runner: ${{ inputs.runner }} \ No newline at end of file diff --git a/.github/workflows/unit_test_predictions.yml b/.github/workflows/unit_test_predictions.yml index 3d382e65a3..00ec16d922 100644 --- a/.github/workflows/unit_test_predictions.yml +++ b/.github/workflows/unit_test_predictions.yml @@ -36,3 +36,4 @@ jobs: uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: CoreMLPredictionsPlugin + runner: 'macos-13' From 5c6a077c78e4487b7f66481dd9e5a2c727ed30ba Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:38:32 -0400 Subject: [PATCH 08/21] increase timeout in failing storage tests --- .../Internal/DefaultStorageTransferDatabaseTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/DefaultStorageTransferDatabaseTests.swift b/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/DefaultStorageTransferDatabaseTests.swift index 127c151229..e749505709 100644 --- a/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/DefaultStorageTransferDatabaseTests.swift +++ b/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/DefaultStorageTransferDatabaseTests.swift @@ -217,7 +217,7 @@ class DefaultStorageTransferDatabaseTests: XCTestCase { } expectation.fulfill() } - waitForExpectations(timeout: 1) + waitForExpectations(timeout: 3) } /// Given: A DefaultStorageTransferDatabase @@ -228,7 +228,7 @@ class DefaultStorageTransferDatabaseTests: XCTestCase { database.prepareForBackground() { expectation.fulfill() } - waitForExpectations(timeout: 1) + waitForExpectations(timeout: 3) } /// Given: The StorageTransferDatabase Type From 0ea801f925abd60c46ce4daf0ea3a85263c14cb1 Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 12:01:36 -0400 Subject: [PATCH 09/21] rename runner input to os-runner --- .github/workflows/run_unit_tests.yml | 4 ++-- .github/workflows/run_unit_tests_platforms.yml | 4 ++-- .github/workflows/unit_test_predictions.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index 966ad732fc..d071290a38 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -32,7 +32,7 @@ on: required: false type: string default: '-test-iterations 3 -retry-tests-on-failure' - runner: + os-runner: description: 'runs-on input' type: string @@ -42,7 +42,7 @@ permissions: jobs: unit-tests: name: ${{ inputs.platform }} Tests | ${{ inputs.scheme }} - runs-on: ${{ inputs.runner }} + runs-on: ${{ inputs.os-runner }} timeout-minutes: ${{ inputs.timeout-minutes }} steps: - name: Checkout repository diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml index 2e25311e36..f69bbc28b1 100644 --- a/.github/workflows/run_unit_tests_platforms.yml +++ b/.github/workflows/run_unit_tests_platforms.yml @@ -21,7 +21,7 @@ on: required: false type: string default: '-test-iterations 3 -retry-tests-on-failure' - runner: + os-runner: description: 'runs-on input' type: string default: 'macos-latest' @@ -48,4 +48,4 @@ jobs: generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }} timeout-minutes: ${{ inputs.timeout-minutes }} test_iterations_flags: ${{ inputs.test_iterations_flags }} - runner: ${{ inputs.runner }} \ No newline at end of file + runner: ${{ inputs.os-runner }} \ No newline at end of file diff --git a/.github/workflows/unit_test_predictions.yml b/.github/workflows/unit_test_predictions.yml index 00ec16d922..8d5f627b5c 100644 --- a/.github/workflows/unit_test_predictions.yml +++ b/.github/workflows/unit_test_predictions.yml @@ -36,4 +36,4 @@ jobs: uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: CoreMLPredictionsPlugin - runner: 'macos-13' + os-runner: 'macos-13' From 2ed88bf230b0e1e7538892f5481bd0107eb4fa4a Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 12:27:22 -0400 Subject: [PATCH 10/21] watchos 9.4 min for CI --- .github/composite_actions/get_platform_parameters/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index 857c13c0c1..9fa928a9c5 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -72,7 +72,7 @@ runs: "minimum": { "iOS": "platform=iOS Simulator,name=iPhone 14,OS=16.1", "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.1", - "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.1", + "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.4", "macOS": "platform=macOS,arch=x86_64" }, "latest": { From 0b9a4936751654319e4bd50a4c2c71bb8aaf801d Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Tue, 30 Apr 2024 12:47:18 -0400 Subject: [PATCH 11/21] use os-runner input name --- .github/workflows/run_unit_tests_platforms.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml index f69bbc28b1..972a4e64dd 100644 --- a/.github/workflows/run_unit_tests_platforms.yml +++ b/.github/workflows/run_unit_tests_platforms.yml @@ -48,4 +48,4 @@ jobs: generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }} timeout-minutes: ${{ inputs.timeout-minutes }} test_iterations_flags: ${{ inputs.test_iterations_flags }} - runner: ${{ inputs.os-runner }} \ No newline at end of file + os-runner: ${{ inputs.os-runner }} \ No newline at end of file From 3ac5befc95fb7bcbd6998120263e6036ddb1fe58 Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Tue, 30 Apr 2024 13:56:51 -0400 Subject: [PATCH 12/21] setting macos-13 for predictions unit tests --- .github/workflows/build_minimum_supported_swift_platforms.yml | 2 +- .github/workflows/unit_test.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_minimum_supported_swift_platforms.yml b/.github/workflows/build_minimum_supported_swift_platforms.yml index c728f9fa99..7f6052abfc 100644 --- a/.github/workflows/build_minimum_supported_swift_platforms.yml +++ b/.github/workflows/build_minimum_supported_swift_platforms.yml @@ -27,7 +27,7 @@ jobs: uses: ./.github/workflows/build_scheme.yml with: scheme: Amplify-Build - os-runner: macos-latest + os-runner: 'macos-latest' xcode-version: 'minimum' platform: ${{ matrix.platform }} save_build_cache: false diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 1e733c2060..20bcae11bb 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -77,6 +77,7 @@ jobs: with: scheme: ${{ matrix.scheme }} generate_coverage_report: ${{ vars.DISABLE_COVERAGE_REPORT != 'true' }} + os-runner: ${{ matrix.scheme == 'CoreMLPredictionsPlugin' && 'macos-13' || 'macos-latest' }} report-coverage: if: ${{ vars.DISABLE_COVERAGE_REPORT != 'true' }} From ba8efd6d1fb2fbedf7f634f4ac2023cdc7ef5921 Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:43:58 -0400 Subject: [PATCH 13/21] using 15.2 for corepredictions tests --- .../get_platform_parameters/action.yml | 18 ++++++++---------- .github/workflows/run_unit_tests_platforms.yml | 3 ++- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index 9fa928a9c5..6c5dd3760f 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -39,8 +39,7 @@ runs: - id: get-xcode-version run: | LATEST_XCODE_VERSION=15.3.0 - MINIMUM_XCODE_VERSION_IOS_MAC=15.0.1 - MINIMUM_XCODE_VERSION_WATCH_TV=15.0.1 + MINIMUM_XCODE_VERSION=15.0.1 INPUT_XCODE_VERSION=${{ inputs.xcode_version }} @@ -48,13 +47,7 @@ runs: latest) XCODE_VERSION=$LATEST_XCODE_VERSION ;; minimum) - INPUT_PLATFORM=${{ inputs.platform }} - case $INPUT_PLATFORM in - iOS|macOS) - XCODE_VERSION=$MINIMUM_XCODE_VERSION_IOS_MAC ;; - tvOS|watchOS) - XCODE_VERSION=$MINIMUM_XCODE_VERSION_WATCH_TV ;; - esac ;; + XCODE_VERSION=$MINIMUM_XCODE_VERSION ;; *) XCODE_VERSION=$INPUT_XCODE_VERSION ;; esac @@ -84,7 +77,12 @@ runs: }' if [ -z "$INPUT_DESTINATION" ]; then - DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"$INPUT_XCODE_VERSION\".$INPUT_PLATFORM") + case $INPUT_XCODE_VERSION in + latest|minimum) + DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"$INPUT_XCODE_VERSION\".$INPUT_PLATFORM") ;; + *) + DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"latest\".$INPUT_PLATFORM") ;; + esac else DESTINATION=$INPUT_DESTINATION fi diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml index 972a4e64dd..edfd321c9b 100644 --- a/.github/workflows/run_unit_tests_platforms.yml +++ b/.github/workflows/run_unit_tests_platforms.yml @@ -48,4 +48,5 @@ jobs: generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }} timeout-minutes: ${{ inputs.timeout-minutes }} test_iterations_flags: ${{ inputs.test_iterations_flags }} - os-runner: ${{ inputs.os-runner }} \ No newline at end of file + os-runner: ${{ inputs.os-runner }} + xcode_version: ${{ inputs.os-runner == 'macos-13' && '15.2' || 'latest' }} \ No newline at end of file From f6318c2d39d7874635103c02ef37b5234b0cd66e Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:40:00 -0400 Subject: [PATCH 14/21] Using macos-13 in integration tests --- .../composite_actions/get_platform_parameters/action.yml | 6 +++--- .github/workflows/integ_test_push_notifications.yml | 3 ++- .github/workflows/run_integration_tests.yml | 6 +++--- .github/workflows/unit_test.yml | 1 - .github/workflows/unit_test_predictions.yml | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index 6c5dd3760f..ab28693b87 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -63,8 +63,8 @@ runs: DESTINATION_MAPPING='{ "minimum": { - "iOS": "platform=iOS Simulator,name=iPhone 14,OS=16.1", - "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=16.1", + "iOS": "platform=iOS Simulator,name=iPhone 14,OS=17.0", + "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=16.4", "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.4", "macOS": "platform=macOS,arch=x86_64" }, @@ -81,7 +81,7 @@ runs: latest|minimum) DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"$INPUT_XCODE_VERSION\".$INPUT_PLATFORM") ;; *) - DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"latest\".$INPUT_PLATFORM") ;; + DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"minimum\".$INPUT_PLATFORM") ;; esac else DESTINATION=$INPUT_DESTINATION diff --git a/.github/workflows/integ_test_push_notifications.yml b/.github/workflows/integ_test_push_notifications.yml index 89cfa8d756..10e403811a 100644 --- a/.github/workflows/integ_test_push_notifications.yml +++ b/.github/workflows/integ_test_push_notifications.yml @@ -26,7 +26,7 @@ permissions: jobs: push-notification-integration-tests: name: ${{ matrix.platform }} Tests | PushNotificationHostApp - runs-on: macos-latest + runs-on: macos-13 timeout-minutes: 30 environment: IntegrationTest strategy: @@ -48,6 +48,7 @@ jobs: uses: ./.github/composite_actions/get_platform_parameters with: platform: ${{ matrix.platform }} + xcode_version: 'minimum' - name: Create the test configuration directory run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/ diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 6d7ffc993d..21577fc43c 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -4,7 +4,7 @@ on: inputs: os-runner: type: string - default: 'macos-latest' + default: 'macos-13' scheme: description: 'The scheme to run the tests' required: true @@ -17,8 +17,8 @@ on: required: false type: string xcode_version: - description: 'The verion of Xcode used to run these tests' - default: 'latest' + description: 'The version of Xcode used to run these tests' + default: 'minimum' type: string destination: default: '' diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 20bcae11bb..1e733c2060 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -77,7 +77,6 @@ jobs: with: scheme: ${{ matrix.scheme }} generate_coverage_report: ${{ vars.DISABLE_COVERAGE_REPORT != 'true' }} - os-runner: ${{ matrix.scheme == 'CoreMLPredictionsPlugin' && 'macos-13' || 'macos-latest' }} report-coverage: if: ${{ vars.DISABLE_COVERAGE_REPORT != 'true' }} diff --git a/.github/workflows/unit_test_predictions.yml b/.github/workflows/unit_test_predictions.yml index 8d5f627b5c..3d382e65a3 100644 --- a/.github/workflows/unit_test_predictions.yml +++ b/.github/workflows/unit_test_predictions.yml @@ -36,4 +36,3 @@ jobs: uses: ./.github/workflows/run_unit_tests_platforms.yml with: scheme: CoreMLPredictionsPlugin - os-runner: 'macos-13' From ecbe107712292025385397434ca255fc4a53761a Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:01:40 -0400 Subject: [PATCH 15/21] disabling coreml unit tests --- .../CoreMLNaturalLanguageAdapterTests.swift | 5 +++-- .../DependencyTests/CoreMLVisionAdapterTests.swift | 14 ++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLNaturalLanguageAdapterTests.swift b/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLNaturalLanguageAdapterTests.swift index 0adea26595..71d847cbb7 100644 --- a/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLNaturalLanguageAdapterTests.swift +++ b/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLNaturalLanguageAdapterTests.swift @@ -52,6 +52,7 @@ class CoreMLNaturalLanguageAdapterTests: XCTestCase { /// - Then: /// - I should get back correct tokens /// +#if !os(watchOS) && !os(iOS) func testSyntaxToken() { let text = "The ripe taste of cheese improves with age." let result = coreMLNaturalLanguageAdapter.getSyntaxTokens(for: text) @@ -64,7 +65,7 @@ class CoreMLNaturalLanguageAdapterTests: XCTestCase { "First word in the input should be determiner" ) } - +#endif /// Test syntax token with invalid text /// /// - Given: CoreML Adapter @@ -88,7 +89,7 @@ class CoreMLNaturalLanguageAdapterTests: XCTestCase { /// - Then: /// - I should get back valid result /// -#if !os(watchOS) +#if !os(watchOS) && !os(iOS) func testEntityToken() { let text = "The American Red Cross was established in Washington, D.C., by Clara Barton." let result = coreMLNaturalLanguageAdapter.getEntities(for: text) diff --git a/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLVisionAdapterTests.swift b/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLVisionAdapterTests.swift index fc8bf9c4a6..bb4327c079 100644 --- a/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLVisionAdapterTests.swift +++ b/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLVisionAdapterTests.swift @@ -17,19 +17,20 @@ class CoreMLVisionAdapterTests: XCTestCase { coreMLVisionAdapter = CoreMLVisionAdapter() } - func testDetectLabels() throws { + func testDetectText() throws { let url = try XCTUnwrap( - Bundle.module.url(forResource: "people", withExtension: "jpg", subdirectory: "TestImages") + Bundle.module.url(forResource: "screenshotWithText", withExtension: "png", subdirectory: "TestImages") ) - let result = try coreMLVisionAdapter.detectLabels(url) + let result = try coreMLVisionAdapter.detectText(url) XCTAssertNotNil(result, "The result should be nil") } - func testDetectText() throws { +#if !os(macOS) + func testDetectLabels() throws { let url = try XCTUnwrap( - Bundle.module.url(forResource: "screenshotWithText", withExtension: "png", subdirectory: "TestImages") + Bundle.module.url(forResource: "people", withExtension: "jpg", subdirectory: "TestImages") ) - let result = try coreMLVisionAdapter.detectText(url) + let result = try coreMLVisionAdapter.detectLabels(url) XCTAssertNotNil(result, "The result should be nil") } @@ -41,5 +42,6 @@ class CoreMLVisionAdapterTests: XCTestCase { XCTAssertNotNil(result, "The result should be nil") XCTAssertTrue(result?.entities.isEmpty != true, "The result should contain values for the image provided.") } +#endif } #endif From 896bc001a7dd676173cae748828ead3d9239b13f Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:05:48 -0400 Subject: [PATCH 16/21] increasing storage's timeout in tests --- .../Internal/DefaultStorageTransferDatabaseTests.swift | 4 ++-- .../Support/Internal/StorageServiceSessionDelegateTests.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/DefaultStorageTransferDatabaseTests.swift b/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/DefaultStorageTransferDatabaseTests.swift index e749505709..1a3722c373 100644 --- a/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/DefaultStorageTransferDatabaseTests.swift +++ b/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/DefaultStorageTransferDatabaseTests.swift @@ -217,7 +217,7 @@ class DefaultStorageTransferDatabaseTests: XCTestCase { } expectation.fulfill() } - waitForExpectations(timeout: 3) + waitForExpectations(timeout: 5) } /// Given: A DefaultStorageTransferDatabase @@ -228,7 +228,7 @@ class DefaultStorageTransferDatabaseTests: XCTestCase { database.prepareForBackground() { expectation.fulfill() } - waitForExpectations(timeout: 3) + waitForExpectations(timeout: 5) } /// Given: The StorageTransferDatabase Type diff --git a/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/StorageServiceSessionDelegateTests.swift b/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/StorageServiceSessionDelegateTests.swift index b8498a0387..ad4ffbd8d2 100644 --- a/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/StorageServiceSessionDelegateTests.swift +++ b/AmplifyPlugins/Storage/Tests/AWSS3StoragePluginTests/Support/Internal/StorageServiceSessionDelegateTests.swift @@ -164,7 +164,7 @@ class StorageServiceSessionDelegateTests: XCTestCase { ) delegate.urlSession(.shared, task: task, didCompleteWithError: error) - waitForExpectations(timeout: 1) + waitForExpectations(timeout: 5) XCTAssertEqual(storageTask.status, .unknown) XCTAssertEqual(service.unregisterCount, 0) } From 4a42859fca94ac25d3626b6a939e64502a6283a4 Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Tue, 30 Apr 2024 18:08:35 -0400 Subject: [PATCH 17/21] Removing CoreMLPlugin tests --- .../get_platform_parameters/action.yml | 6 +++--- .github/workflows/unit_test.yml | 6 ++---- .../CoreMLNaturalLanguageAdapterTests.swift | 5 ++--- .../DependencyTests/CoreMLVisionAdapterTests.swift | 14 ++++++-------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index ab28693b87..2b01f58d75 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -63,9 +63,9 @@ runs: DESTINATION_MAPPING='{ "minimum": { - "iOS": "platform=iOS Simulator,name=iPhone 14,OS=17.0", - "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=16.4", - "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=9.4", + "iOS": "platform=iOS Simulator,name=iPhone 14,OS=17.0.1", + "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=17.0", + "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=10.0", "macOS": "platform=macOS,arch=x86_64" }, "latest": { diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 1e733c2060..454c08bec9 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -70,8 +70,7 @@ jobs: AWSPredictionsPlugin, AWSPinpointAnalyticsPlugin, AWSPinpointPushNotificationsPlugin, - AWSS3StoragePlugin, - CoreMLPredictionsPlugin + AWSS3StoragePlugin ] uses: ./.github/workflows/run_unit_tests_platforms.yml with: @@ -96,8 +95,7 @@ jobs: { scheme: AWSPredictionsPlugin, flags: 'Predictions_plugin_unit_test,unit_tests' }, { scheme: AWSPinpointAnalyticsPlugin, flags: 'Analytics_plugin_unit_test,unit_tests' }, { scheme: AWSPinpointPushNotificationsPlugin, flags: 'PushNotifications_plugin_unit_test,unit_tests' }, - { scheme: AWSS3StoragePlugin, flags: 'Storage_plugin_unit_test,unit_tests' }, - { scheme: CoreMLPredictionsPlugin, flags: 'CoreMLPredictions_plugin_unit_test,unit_tests' } + { scheme: AWSS3StoragePlugin, flags: 'Storage_plugin_unit_test,unit_tests' } ] uses: ./.github/workflows/upload_coverage_report.yml with: diff --git a/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLNaturalLanguageAdapterTests.swift b/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLNaturalLanguageAdapterTests.swift index 71d847cbb7..0adea26595 100644 --- a/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLNaturalLanguageAdapterTests.swift +++ b/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLNaturalLanguageAdapterTests.swift @@ -52,7 +52,6 @@ class CoreMLNaturalLanguageAdapterTests: XCTestCase { /// - Then: /// - I should get back correct tokens /// -#if !os(watchOS) && !os(iOS) func testSyntaxToken() { let text = "The ripe taste of cheese improves with age." let result = coreMLNaturalLanguageAdapter.getSyntaxTokens(for: text) @@ -65,7 +64,7 @@ class CoreMLNaturalLanguageAdapterTests: XCTestCase { "First word in the input should be determiner" ) } -#endif + /// Test syntax token with invalid text /// /// - Given: CoreML Adapter @@ -89,7 +88,7 @@ class CoreMLNaturalLanguageAdapterTests: XCTestCase { /// - Then: /// - I should get back valid result /// -#if !os(watchOS) && !os(iOS) +#if !os(watchOS) func testEntityToken() { let text = "The American Red Cross was established in Washington, D.C., by Clara Barton." let result = coreMLNaturalLanguageAdapter.getEntities(for: text) diff --git a/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLVisionAdapterTests.swift b/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLVisionAdapterTests.swift index bb4327c079..fc8bf9c4a6 100644 --- a/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLVisionAdapterTests.swift +++ b/AmplifyPlugins/Predictions/Tests/CoreMLPredictionsPluginUnitTests/DependencyTests/CoreMLVisionAdapterTests.swift @@ -17,20 +17,19 @@ class CoreMLVisionAdapterTests: XCTestCase { coreMLVisionAdapter = CoreMLVisionAdapter() } - func testDetectText() throws { + func testDetectLabels() throws { let url = try XCTUnwrap( - Bundle.module.url(forResource: "screenshotWithText", withExtension: "png", subdirectory: "TestImages") + Bundle.module.url(forResource: "people", withExtension: "jpg", subdirectory: "TestImages") ) - let result = try coreMLVisionAdapter.detectText(url) + let result = try coreMLVisionAdapter.detectLabels(url) XCTAssertNotNil(result, "The result should be nil") } -#if !os(macOS) - func testDetectLabels() throws { + func testDetectText() throws { let url = try XCTUnwrap( - Bundle.module.url(forResource: "people", withExtension: "jpg", subdirectory: "TestImages") + Bundle.module.url(forResource: "screenshotWithText", withExtension: "png", subdirectory: "TestImages") ) - let result = try coreMLVisionAdapter.detectLabels(url) + let result = try coreMLVisionAdapter.detectText(url) XCTAssertNotNil(result, "The result should be nil") } @@ -42,6 +41,5 @@ class CoreMLVisionAdapterTests: XCTestCase { XCTAssertNotNil(result, "The result should be nil") XCTAssertTrue(result?.entities.isEmpty != true, "The result should contain values for the image provided.") } -#endif } #endif From 8bba8294901b932464eefe4db41904fd33b6bdfb Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Wed, 1 May 2024 13:24:22 -0400 Subject: [PATCH 18/21] fix: fixing watchos integration tests --- .../integ_test_push_notifications.yml | 3 +- .github/workflows/run_integration_tests.yml | 4 +- .../APIHostApp.xcodeproj/project.pbxproj | 63 ------ .../project.pbxproj | 21 -- .../AuthHostApp.xcodeproj/project.pbxproj | 14 -- .../project.pbxproj | 196 ------------------ .../GeoHostApp.xcodeproj/project.pbxproj | 21 -- .../project.pbxproj | 28 --- .../project.pbxproj | 91 +------- .../StorageHostApp.xcodeproj/project.pbxproj | 33 +-- 10 files changed, 16 insertions(+), 458 deletions(-) diff --git a/.github/workflows/integ_test_push_notifications.yml b/.github/workflows/integ_test_push_notifications.yml index 10e403811a..89cfa8d756 100644 --- a/.github/workflows/integ_test_push_notifications.yml +++ b/.github/workflows/integ_test_push_notifications.yml @@ -26,7 +26,7 @@ permissions: jobs: push-notification-integration-tests: name: ${{ matrix.platform }} Tests | PushNotificationHostApp - runs-on: macos-13 + runs-on: macos-latest timeout-minutes: 30 environment: IntegrationTest strategy: @@ -48,7 +48,6 @@ jobs: uses: ./.github/composite_actions/get_platform_parameters with: platform: ${{ matrix.platform }} - xcode_version: 'minimum' - name: Create the test configuration directory run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/ diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index 21577fc43c..cf7e5d57df 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -4,7 +4,7 @@ on: inputs: os-runner: type: string - default: 'macos-13' + default: 'macos-latest' scheme: description: 'The scheme to run the tests' required: true @@ -18,7 +18,7 @@ on: type: string xcode_version: description: 'The version of Xcode used to run these tests' - default: 'minimum' + default: 'latest' type: string destination: default: '' diff --git a/AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj index 15f0bc7a05..7df889764d 100644 --- a/AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj +++ b/AmplifyPlugins/API/Tests/APIHostApp/APIHostApp.xcodeproj/project.pbxproj @@ -377,20 +377,11 @@ 681B35A52A4396F00074F369 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35A42A4396F00074F369 /* Amplify */; }; 681B35A72A4396F00074F369 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35A62A4396F00074F369 /* AWSAPIPlugin */; }; 681B35A92A4396F00074F369 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35A82A4396F00074F369 /* AWSCognitoAuthPlugin */; }; - 681B35AB2A4396F90074F369 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35AA2A4396F90074F369 /* Amplify */; }; - 681B35AD2A4396F90074F369 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35AC2A4396F90074F369 /* AWSAPIPlugin */; }; - 681B35AF2A4396F90074F369 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35AE2A4396F90074F369 /* AWSCognitoAuthPlugin */; }; - 681B35B12A4397000074F369 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35B02A4397000074F369 /* Amplify */; }; - 681B35B32A4397000074F369 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35B22A4397000074F369 /* AWSAPIPlugin */; }; - 681B35B52A4397000074F369 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35B42A4397000074F369 /* AWSCognitoAuthPlugin */; }; 681B35BA2A43970A0074F369 /* RESTWithIAMIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21698BC728899BC8004BD994 /* RESTWithIAMIntegrationTests.swift */; }; 681B35BB2A43970A0074F369 /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE6F28E7451D0000C36A /* AsyncTesting.swift */; }; 681B35BC2A43970A0074F369 /* TestConfigHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 395906B828AC4C3A004B96B1 /* TestConfigHelper.swift */; }; 681B35BD2A43970A0074F369 /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE7128E7451D0000C36A /* XCTestCase+AsyncTesting.swift */; }; 681B35BE2A43970A0074F369 /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE7028E7451D0000C36A /* AsyncExpectation.swift */; }; - 681B35C92A4397180074F369 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35C82A4397180074F369 /* Amplify */; }; - 681B35CB2A4397180074F369 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35CA2A4397180074F369 /* AWSAPIPlugin */; }; - 681B35CD2A4397180074F369 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B35CC2A4397180074F369 /* AWSCognitoAuthPlugin */; }; 681DFE7228E7451E0000C36A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE6F28E7451D0000C36A /* AsyncTesting.swift */; }; 681DFE7328E7451E0000C36A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE6F28E7451D0000C36A /* AsyncTesting.swift */; }; 681DFE7428E7451E0000C36A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE7028E7451D0000C36A /* AsyncExpectation.swift */; }; @@ -878,9 +869,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 681B35AD2A4396F90074F369 /* AWSAPIPlugin in Frameworks */, - 681B35AB2A4396F90074F369 /* Amplify in Frameworks */, - 681B35AF2A4396F90074F369 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -888,9 +876,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 681B35B32A4397000074F369 /* AWSAPIPlugin in Frameworks */, - 681B35B12A4397000074F369 /* Amplify in Frameworks */, - 681B35B52A4397000074F369 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -898,9 +883,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 681B35CB2A4397180074F369 /* AWSAPIPlugin in Frameworks */, - 681B35C92A4397180074F369 /* Amplify in Frameworks */, - 681B35CD2A4397180074F369 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1745,9 +1727,6 @@ ); name = AWSAPIPluginFunctionalTestsWatch; packageProductDependencies = ( - 681B35AA2A4396F90074F369 /* Amplify */, - 681B35AC2A4396F90074F369 /* AWSAPIPlugin */, - 681B35AE2A4396F90074F369 /* AWSCognitoAuthPlugin */, ); productName = AWSAPIPluginFunctionalTests; productReference = 681B35892A43962D0074F369 /* AWSAPIPluginFunctionalTestsWatch.xctest */; @@ -1769,9 +1748,6 @@ ); name = AWSAPIPluginGraphQLLambdaAuthTestsWatch; packageProductDependencies = ( - 681B35B02A4397000074F369 /* Amplify */, - 681B35B22A4397000074F369 /* AWSAPIPlugin */, - 681B35B42A4397000074F369 /* AWSCognitoAuthPlugin */, ); productName = AWSAPIPluginGraphQLLambdaAuthTests; productReference = 681B35A12A4396CF0074F369 /* AWSAPIPluginGraphQLLambdaAuthTestsWatch.xctest */; @@ -1793,9 +1769,6 @@ ); name = AWSAPIPluginRESTIAMTestsWatch; packageProductDependencies = ( - 681B35C82A4397180074F369 /* Amplify */, - 681B35CA2A4397180074F369 /* AWSAPIPlugin */, - 681B35CC2A4397180074F369 /* AWSCognitoAuthPlugin */, ); productName = AWSAPIPluginRESTIAMTests; productReference = 681B35C52A43970A0074F369 /* AWSAPIPluginRESTIAMTestsWatch.xctest */; @@ -3887,42 +3860,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSCognitoAuthPlugin; }; - 681B35AA2A4396F90074F369 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 681B35AC2A4396F90074F369 /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 681B35AE2A4396F90074F369 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 681B35B02A4397000074F369 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 681B35B22A4397000074F369 /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 681B35B42A4397000074F369 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 681B35C82A4397180074F369 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 681B35CA2A4397180074F369 /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 681B35CC2A4397180074F369 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 21E73E6328898D7800D7DB7E /* Project object */; diff --git a/AmplifyPlugins/Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj/project.pbxproj index ea8650abb3..561868fad5 100644 --- a/AmplifyPlugins/Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj/project.pbxproj +++ b/AmplifyPlugins/Analytics/Tests/AnalyticsHostApp/AnalyticsHostApp.xcodeproj/project.pbxproj @@ -29,9 +29,6 @@ 68DBE9592A3B6EAE002B73E3 /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697229519DEC0074B63A /* XCTestCase+AsyncTesting.swift */; }; 68DBE95A2A3B6EAE002B73E3 /* AWSPinpointAnalyticsPluginIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6857647828AE95ED000CE2E9 /* AWSPinpointAnalyticsPluginIntegrationTests.swift */; }; 68DBE95B2A3B6EAE002B73E3 /* TestConfigHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6857648828AE9951000CE2E9 /* TestConfigHelper.swift */; }; - 68DBE9662A3B6F2A002B73E3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9652A3B6F2A002B73E3 /* Amplify */; }; - 68DBE9682A3B6F2A002B73E3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9672A3B6F2A002B73E3 /* AWSCognitoAuthPlugin */; }; - 68DBE96A2A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68DBE9692A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin */; }; 9737697629519E050074B63A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697029519DEC0074B63A /* AsyncTesting.swift */; }; 9737697729519E050074B63A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697129519DEC0074B63A /* AsyncExpectation.swift */; }; 9737697829519E050074B63A /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9737697229519DEC0074B63A /* XCTestCase+AsyncTesting.swift */; }; @@ -134,9 +131,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68DBE9662A3B6F2A002B73E3 /* Amplify in Frameworks */, - 68DBE96A2A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin in Frameworks */, - 68DBE9682A3B6F2A002B73E3 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -332,9 +326,6 @@ ); name = AWSPinpointAnalyticsPluginIntegrationTestsWatch; packageProductDependencies = ( - 68DBE9652A3B6F2A002B73E3 /* Amplify */, - 68DBE9672A3B6F2A002B73E3 /* AWSCognitoAuthPlugin */, - 68DBE9692A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin */, ); productName = AWSPinpointAnalyticsPluginIntegrationTests; productReference = 68DBE9622A3B6EAE002B73E3 /* AWSPinpointAnalyticsPluginIntegrationTestsWatch.xctest */; @@ -1118,18 +1109,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSPinpointAnalyticsPlugin; }; - 68DBE9652A3B6F2A002B73E3 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 68DBE9672A3B6F2A002B73E3 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 68DBE9692A3B6F2A002B73E3 /* AWSPinpointAnalyticsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSPinpointAnalyticsPlugin; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 6857645428AE94D9000CE2E9 /* Project object */; diff --git a/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.pbxproj index 5d10a33c39..efe5f198a7 100644 --- a/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.pbxproj +++ b/AmplifyPlugins/Auth/Tests/AuthHostApp/AuthHostApp.xcodeproj/project.pbxproj @@ -100,8 +100,6 @@ 681B76BB2A3CBBAE004B59D9 /* AuthConfirmResetPasswordTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97829202286E41FA000DE190 /* AuthConfirmResetPasswordTests.swift */; }; 681B76BC2A3CBBAE004B59D9 /* AuthDeleteUserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4821B2F1286B5F74000EC1D7 /* AuthDeleteUserTests.swift */; }; 681B76BF2A3CBBAE004B59D9 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 485CB5AE27B61EAA006CCEC7 /* README.md */; }; - 681B76C62A3CBE11004B59D9 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681B76C52A3CBE11004B59D9 /* Amplify */; }; - 681B76C82A3CBE11004B59D9 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681B76C72A3CBE11004B59D9 /* AWSCognitoAuthPlugin */; }; 681DFEAB28E747B80000C36A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEA828E747B80000C36A /* AsyncTesting.swift */; }; 681DFEAC28E747B80000C36A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEA928E747B80000C36A /* AsyncExpectation.swift */; }; 681DFEAD28E747B80000C36A /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEAA28E747B80000C36A /* XCTestCase+AsyncTesting.swift */; }; @@ -257,8 +255,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 681B76C62A3CBE11004B59D9 /* Amplify in Frameworks */, - 681B76C82A3CBE11004B59D9 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -591,8 +587,6 @@ ); name = AuthIntegrationTestsWatch; packageProductDependencies = ( - 681B76C52A3CBE11004B59D9 /* Amplify */, - 681B76C72A3CBE11004B59D9 /* AWSCognitoAuthPlugin */, ); productName = AuthIntegrationTests; productReference = 681B76C42A3CBBAE004B59D9 /* AuthIntegrationTestsWatch.xctest */; @@ -1481,14 +1475,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSCognitoAuthPlugin; }; - 681B76C52A3CBE11004B59D9 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 681B76C72A3CBE11004B59D9 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; B4B9F45728F47C0A004F346F /* Amplify */ = { isa = XCSwiftPackageProductDependency; productName = Amplify; diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/DataStoreHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/DataStoreHostApp.xcodeproj/project.pbxproj index f6fd20640b..034c36dfdf 100644 --- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/DataStoreHostApp.xcodeproj/project.pbxproj +++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/DataStoreHostApp.xcodeproj/project.pbxproj @@ -640,10 +640,6 @@ 681DFE9628E746FE0000C36A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE8128E746C10000C36A /* AsyncExpectation.swift */; }; 681DFE9728E746FE0000C36A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFE8028E746C10000C36A /* AsyncTesting.swift */; }; 682D184B2A43DEF400BD034E /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 682D184A2A43DEF400BD034E /* XCTest.framework */; }; - 682D184D2A43DF9E00BD034E /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 682D184C2A43DF9E00BD034E /* Amplify */; }; - 682D184F2A43DFB700BD034E /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 682D184E2A43DFB700BD034E /* AWSAPIPlugin */; }; - 682D18512A43DFB700BD034E /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 682D18502A43DFB700BD034E /* AWSCognitoAuthPlugin */; }; - 682D18532A43DFB700BD034E /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 682D18522A43DFB700BD034E /* AWSDataStorePlugin */; }; 68826CD12A439C2F005E85A7 /* DataStoreHostAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2118212F289BFB4B001B5945 /* DataStoreHostAppApp.swift */; }; 68826CD22A439C2F005E85A7 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21182131289BFB4B001B5945 /* ContentView.swift */; }; 68826CD42A43A149005E85A7 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68826CD32A43A149005E85A7 /* Amplify */; }; @@ -1018,22 +1014,6 @@ 68826E782A43A1DB005E85A7 /* AWSDataStoreCategoryPluginAuthIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFA92289BFE4E00B32A39 /* AWSDataStoreCategoryPluginAuthIntegrationTests.swift */; }; 68826E792A43A1DB005E85A7 /* TodoCustomOwnerImplicit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFA9C289BFE4E00B32A39 /* TodoCustomOwnerImplicit.swift */; }; 68826E7A2A43A1DB005E85A7 /* AWSDataStoreCategoryPluginAuthOwnerIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFAA0289BFE4E00B32A39 /* AWSDataStoreCategoryPluginAuthOwnerIntegrationTests.swift */; }; - 68826E852A43A224005E85A7 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E842A43A224005E85A7 /* Amplify */; }; - 68826E872A43A224005E85A7 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E862A43A224005E85A7 /* AWSAPIPlugin */; }; - 68826E892A43A224005E85A7 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E882A43A224005E85A7 /* AWSCognitoAuthPlugin */; }; - 68826E8B2A43A224005E85A7 /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E8A2A43A224005E85A7 /* AWSDataStorePlugin */; }; - 68826E8F2A43A238005E85A7 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E8E2A43A238005E85A7 /* Amplify */; }; - 68826E912A43A238005E85A7 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E902A43A238005E85A7 /* AWSAPIPlugin */; }; - 68826E932A43A238005E85A7 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E922A43A238005E85A7 /* AWSCognitoAuthPlugin */; }; - 68826E952A43A238005E85A7 /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E942A43A238005E85A7 /* AWSDataStorePlugin */; }; - 68826E992A43A251005E85A7 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E982A43A251005E85A7 /* Amplify */; }; - 68826E9B2A43A251005E85A7 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E9A2A43A251005E85A7 /* AWSAPIPlugin */; }; - 68826E9D2A43A251005E85A7 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E9C2A43A251005E85A7 /* AWSCognitoAuthPlugin */; }; - 68826E9F2A43A251005E85A7 /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826E9E2A43A251005E85A7 /* AWSDataStorePlugin */; }; - 68826EAD2A43A280005E85A7 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68826EAC2A43A280005E85A7 /* Amplify */; }; - 68826EAF2A43A280005E85A7 /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826EAE2A43A280005E85A7 /* AWSAPIPlugin */; }; - 68826EB12A43A280005E85A7 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826EB02A43A280005E85A7 /* AWSCognitoAuthPlugin */; }; - 68826EB32A43A280005E85A7 /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68826EB22A43A280005E85A7 /* AWSDataStorePlugin */; }; 68E9EB1D2A448C23001F713D /* Record.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFCC4289C06E300B32A39 /* Record.swift */; }; 68E9EB1E2A448C23001F713D /* PostEditor5+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFCF3289C06E300B32A39 /* PostEditor5+Schema.swift */; }; 68E9EB1F2A448C23001F713D /* UserFollowers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFC95289C06E300B32A39 /* UserFollowers.swift */; }; @@ -1313,14 +1293,6 @@ 68E9EC3C2A448C47001F713D /* PrivatePrivateUPIAMPost+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFAD9289BFE4E00B32A39 /* PrivatePrivateUPIAMPost+Schema.swift */; }; 68E9EC3D2A448C47001F713D /* GroupUPPost+Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFAAA289BFE4E00B32A39 /* GroupUPPost+Schema.swift */; }; 68E9EC3E2A448C47001F713D /* AWSDataStoreMultiAuthSingleRuleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21BBFAA4289BFE4E00B32A39 /* AWSDataStoreMultiAuthSingleRuleTests.swift */; }; - 68E9EC4B2A448C87001F713D /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68E9EC4A2A448C87001F713D /* Amplify */; }; - 68E9EC4D2A448C87001F713D /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68E9EC4C2A448C87001F713D /* AWSAPIPlugin */; }; - 68E9EC4F2A448C87001F713D /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68E9EC4E2A448C87001F713D /* AWSCognitoAuthPlugin */; }; - 68E9EC512A448C87001F713D /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68E9EC502A448C87001F713D /* AWSDataStorePlugin */; }; - 68E9EC532A448C8D001F713D /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 68E9EC522A448C8D001F713D /* Amplify */; }; - 68E9EC552A448C8D001F713D /* AWSAPIPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68E9EC542A448C8D001F713D /* AWSAPIPlugin */; }; - 68E9EC572A448C8D001F713D /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68E9EC562A448C8D001F713D /* AWSCognitoAuthPlugin */; }; - 68E9EC592A448C8D001F713D /* AWSDataStorePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68E9EC582A448C8D001F713D /* AWSDataStorePlugin */; }; 970333C5295C5B160019981E /* DataStoreStressBaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970333C4295C5B160019981E /* DataStoreStressBaseTest.swift */; }; 970333E3295CCE490019981E /* AmplifyModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970333DF295CCE490019981E /* AmplifyModels.swift */; }; 970333E4295CCE490019981E /* PostStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970333E0295CCE490019981E /* PostStatus.swift */; }; @@ -2352,10 +2324,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68826E872A43A224005E85A7 /* AWSAPIPlugin in Frameworks */, - 68826E852A43A224005E85A7 /* Amplify in Frameworks */, - 68826E892A43A224005E85A7 /* AWSCognitoAuthPlugin in Frameworks */, - 68826E8B2A43A224005E85A7 /* AWSDataStorePlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2363,10 +2331,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68826E912A43A238005E85A7 /* AWSAPIPlugin in Frameworks */, - 68826E8F2A43A238005E85A7 /* Amplify in Frameworks */, - 68826E932A43A238005E85A7 /* AWSCognitoAuthPlugin in Frameworks */, - 68826E952A43A238005E85A7 /* AWSDataStorePlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2374,10 +2338,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68826E9B2A43A251005E85A7 /* AWSAPIPlugin in Frameworks */, - 68826E992A43A251005E85A7 /* Amplify in Frameworks */, - 68826E9D2A43A251005E85A7 /* AWSCognitoAuthPlugin in Frameworks */, - 68826E9F2A43A251005E85A7 /* AWSDataStorePlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2385,10 +2345,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 682D184F2A43DFB700BD034E /* AWSAPIPlugin in Frameworks */, - 682D184D2A43DF9E00BD034E /* Amplify in Frameworks */, - 682D18512A43DFB700BD034E /* AWSCognitoAuthPlugin in Frameworks */, - 682D18532A43DFB700BD034E /* AWSDataStorePlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2396,10 +2352,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68826EAF2A43A280005E85A7 /* AWSAPIPlugin in Frameworks */, - 68826EAD2A43A280005E85A7 /* Amplify in Frameworks */, - 68826EB12A43A280005E85A7 /* AWSCognitoAuthPlugin in Frameworks */, - 68826EB32A43A280005E85A7 /* AWSDataStorePlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2407,10 +2359,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68E9EC4D2A448C87001F713D /* AWSAPIPlugin in Frameworks */, - 68E9EC4B2A448C87001F713D /* Amplify in Frameworks */, - 68E9EC4F2A448C87001F713D /* AWSCognitoAuthPlugin in Frameworks */, - 68E9EC512A448C87001F713D /* AWSDataStorePlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2418,10 +2366,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68E9EC552A448C8D001F713D /* AWSAPIPlugin in Frameworks */, - 68E9EC532A448C8D001F713D /* Amplify in Frameworks */, - 68E9EC572A448C8D001F713D /* AWSCognitoAuthPlugin in Frameworks */, - 68E9EC592A448C8D001F713D /* AWSDataStorePlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4256,10 +4200,6 @@ ); name = AWSDataStorePluginAuthIAMTestsWatch; packageProductDependencies = ( - 68826E842A43A224005E85A7 /* Amplify */, - 68826E862A43A224005E85A7 /* AWSAPIPlugin */, - 68826E882A43A224005E85A7 /* AWSCognitoAuthPlugin */, - 68826E8A2A43A224005E85A7 /* AWSDataStorePlugin */, ); productName = AWSDataStorePluginAuthIAMTests; productReference = 68826CEF2A43A1B0005E85A7 /* AWSDataStorePluginAuthIAMTestsWatch.xctest */; @@ -4281,10 +4221,6 @@ ); name = AWSDataStorePluginCPKTestsWatch; packageProductDependencies = ( - 68826E8E2A43A238005E85A7 /* Amplify */, - 68826E902A43A238005E85A7 /* AWSAPIPlugin */, - 68826E922A43A238005E85A7 /* AWSCognitoAuthPlugin */, - 68826E942A43A238005E85A7 /* AWSDataStorePlugin */, ); productName = AWSDataStorePluginCPKTests; productReference = 68826D622A43A1BA005E85A7 /* AWSDataStorePluginCPKTestsWatch.xctest */; @@ -4306,10 +4242,6 @@ ); name = AWSDataStorePluginLazyLoadTestsWatch; packageProductDependencies = ( - 68826E982A43A251005E85A7 /* Amplify */, - 68826E9A2A43A251005E85A7 /* AWSAPIPlugin */, - 68826E9C2A43A251005E85A7 /* AWSCognitoAuthPlugin */, - 68826E9E2A43A251005E85A7 /* AWSDataStorePlugin */, ); productName = AWSDataStorePluginLazyLoadTests; productReference = 68826DF92A43A1C3005E85A7 /* AWSDataStorePluginLazyLoadTestsWatch.xctest */; @@ -4331,10 +4263,6 @@ ); name = AWSDataStorePluginV2TestsWatch; packageProductDependencies = ( - 682D184C2A43DF9E00BD034E /* Amplify */, - 682D184E2A43DFB700BD034E /* AWSAPIPlugin */, - 682D18502A43DFB700BD034E /* AWSCognitoAuthPlugin */, - 682D18522A43DFB700BD034E /* AWSDataStorePlugin */, ); productName = AWSDataStorePluginV2Tests; productReference = 68826E642A43A1D1005E85A7 /* AWSDataStorePluginV2TestsWatch.xctest */; @@ -4356,10 +4284,6 @@ ); name = AWSDataStorePluginAuthCognitoTestsWatch; packageProductDependencies = ( - 68826EAC2A43A280005E85A7 /* Amplify */, - 68826EAE2A43A280005E85A7 /* AWSAPIPlugin */, - 68826EB02A43A280005E85A7 /* AWSCognitoAuthPlugin */, - 68826EB22A43A280005E85A7 /* AWSDataStorePlugin */, ); productName = AWSDataStorePluginAuthCognitoTests; productReference = 68826E812A43A1DB005E85A7 /* AWSDataStorePluginAuthCognitoTestsWatch.xctest */; @@ -4381,10 +4305,6 @@ ); name = AWSDataStorePluginIntegrationTestsWatch; packageProductDependencies = ( - 68E9EC4A2A448C87001F713D /* Amplify */, - 68E9EC4C2A448C87001F713D /* AWSAPIPlugin */, - 68E9EC4E2A448C87001F713D /* AWSCognitoAuthPlugin */, - 68E9EC502A448C87001F713D /* AWSDataStorePlugin */, ); productName = AWSDataStorePluginIntegrationTests; productReference = 68E9EBFA2A448C23001F713D /* AWSDataStorePluginIntegrationTestsWatch.xctest */; @@ -4406,10 +4326,6 @@ ); name = AWSDataStorePluginMultiAuthTestsWatch; packageProductDependencies = ( - 68E9EC522A448C8D001F713D /* Amplify */, - 68E9EC542A448C8D001F713D /* AWSAPIPlugin */, - 68E9EC562A448C8D001F713D /* AWSCognitoAuthPlugin */, - 68E9EC582A448C8D001F713D /* AWSDataStorePlugin */, ); productName = AWSDataStorePluginMultiAuthTests; productReference = 68E9EC452A448C47001F713D /* AWSDataStorePluginMultiAuthTestsWatch.xctest */; @@ -7651,22 +7567,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSDataStorePlugin; }; - 682D184C2A43DF9E00BD034E /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 682D184E2A43DFB700BD034E /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 682D18502A43DFB700BD034E /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 682D18522A43DFB700BD034E /* AWSDataStorePlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSDataStorePlugin; - }; 68826CD32A43A149005E85A7 /* Amplify */ = { isa = XCSwiftPackageProductDependency; productName = Amplify; @@ -7683,102 +7583,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSDataStorePlugin; }; - 68826E842A43A224005E85A7 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 68826E862A43A224005E85A7 /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 68826E882A43A224005E85A7 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 68826E8A2A43A224005E85A7 /* AWSDataStorePlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSDataStorePlugin; - }; - 68826E8E2A43A238005E85A7 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 68826E902A43A238005E85A7 /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 68826E922A43A238005E85A7 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 68826E942A43A238005E85A7 /* AWSDataStorePlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSDataStorePlugin; - }; - 68826E982A43A251005E85A7 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 68826E9A2A43A251005E85A7 /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 68826E9C2A43A251005E85A7 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 68826E9E2A43A251005E85A7 /* AWSDataStorePlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSDataStorePlugin; - }; - 68826EAC2A43A280005E85A7 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 68826EAE2A43A280005E85A7 /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 68826EB02A43A280005E85A7 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 68826EB22A43A280005E85A7 /* AWSDataStorePlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSDataStorePlugin; - }; - 68E9EC4A2A448C87001F713D /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 68E9EC4C2A448C87001F713D /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 68E9EC4E2A448C87001F713D /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 68E9EC502A448C87001F713D /* AWSDataStorePlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSDataStorePlugin; - }; - 68E9EC522A448C8D001F713D /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 68E9EC542A448C8D001F713D /* AWSAPIPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSAPIPlugin; - }; - 68E9EC562A448C8D001F713D /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 68E9EC582A448C8D001F713D /* AWSDataStorePlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSDataStorePlugin; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 21182124289BFB4B001B5945 /* Project object */; diff --git a/AmplifyPlugins/Geo/Tests/GeoHostApp/GeoHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/Geo/Tests/GeoHostApp/GeoHostApp.xcodeproj/project.pbxproj index d5fc06bfce..7bd83879ae 100644 --- a/AmplifyPlugins/Geo/Tests/GeoHostApp/GeoHostApp.xcodeproj/project.pbxproj +++ b/AmplifyPlugins/Geo/Tests/GeoHostApp/GeoHostApp.xcodeproj/project.pbxproj @@ -22,9 +22,6 @@ 685777FE2A3CC0D8001CE5C1 /* AWSLocationGeoPluginIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97DB824628233A1D00FC2228 /* AWSLocationGeoPluginIntegrationTests.swift */; }; 685777FF2A3CC0D8001CE5C1 /* TestConfigHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97DB82542823466800FC2228 /* TestConfigHelper.swift */; }; 685778022A3CC0D8001CE5C1 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 97DB8244282339D200FC2228 /* README.md */; }; - 6857780B2A3CC0ED001CE5C1 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 6857780A2A3CC0ED001CE5C1 /* Amplify */; }; - 6857780D2A3CC0ED001CE5C1 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6857780C2A3CC0ED001CE5C1 /* AWSCognitoAuthPlugin */; }; - 6857780F2A3CC0ED001CE5C1 /* AWSLocationGeoPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6857780E2A3CC0ED001CE5C1 /* AWSLocationGeoPlugin */; }; 685778102A3CC1F4001CE5C1 /* GeoHostAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD223128230B98001AFCC1 /* GeoHostAppApp.swift */; }; 685778112A3CC1F9001CE5C1 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD223328230B98001AFCC1 /* ContentView.swift */; }; 978B1D6429515FFB0079E55A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978B1D5E29515DEF0079E55A /* AsyncTesting.swift */; }; @@ -124,9 +121,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6857780F2A3CC0ED001CE5C1 /* AWSLocationGeoPlugin in Frameworks */, - 6857780B2A3CC0ED001CE5C1 /* Amplify in Frameworks */, - 6857780D2A3CC0ED001CE5C1 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -308,9 +302,6 @@ ); name = AWSLocationGeoPluginIntegrationTestsWatch; packageProductDependencies = ( - 6857780A2A3CC0ED001CE5C1 /* Amplify */, - 6857780C2A3CC0ED001CE5C1 /* AWSCognitoAuthPlugin */, - 6857780E2A3CC0ED001CE5C1 /* AWSLocationGeoPlugin */, ); productName = AWSLocationGeoPluginIntegrationTests; productReference = 685778072A3CC0D8001CE5C1 /* AWSLocationGeoPluginIntegrationTestsWatch.xctest */; @@ -1177,18 +1168,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSCognitoAuthPlugin; }; - 6857780A2A3CC0ED001CE5C1 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 6857780C2A3CC0ED001CE5C1 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 6857780E2A3CC0ED001CE5C1 /* AWSLocationGeoPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSLocationGeoPlugin; - }; B44DCFA228F48EDD007FEC7C /* Amplify */ = { isa = XCSwiftPackageProductDependency; productName = Amplify; diff --git a/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostApp.xcodeproj/project.pbxproj index ddd6cfb305..7de7bad8f7 100644 --- a/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostApp.xcodeproj/project.pbxproj +++ b/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostApp.xcodeproj/project.pbxproj @@ -38,14 +38,10 @@ 6875F98D2A3CD258001C9AAF /* PushNotificationHostAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6084F1AE2967B87200434CBF /* PushNotificationHostAppUITests.swift */; }; 6875F98E2A3CD258001C9AAF /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6084F1C32968AA3A00434CBF /* Notification.swift */; }; 6875F9912A3CD258001C9AAF /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 6084F1BF2968A7ED00434CBF /* README.md */; }; - 6875F9992A3CD284001C9AAF /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F9982A3CD284001C9AAF /* Amplify */; }; - 6875F99B2A3CD284001C9AAF /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F99A2A3CD284001C9AAF /* AWSCognitoAuthPlugin */; }; - 6875F99D2A3CD284001C9AAF /* AWSPinpointPushNotificationsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F99C2A3CD284001C9AAF /* AWSPinpointPushNotificationsPlugin */; }; 6875F99F2A3CD31D001C9AAF /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F99E2A3CD31D001C9AAF /* Amplify */; }; 6875F9A12A3CD31D001C9AAF /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F9A02A3CD31D001C9AAF /* AWSCognitoAuthPlugin */; }; 6875F9A32A3CD31D001C9AAF /* AWSPinpointPushNotificationsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F9A22A3CD31D001C9AAF /* AWSPinpointPushNotificationsPlugin */; }; 6875F9A52A3CD37D001C9AAF /* AWSPinpointAnalyticsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F9A42A3CD37D001C9AAF /* AWSPinpointAnalyticsPlugin */; }; - 6875F9A72A3CD39C001C9AAF /* AWSPinpointAnalyticsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F9A62A3CD39C001C9AAF /* AWSPinpointAnalyticsPlugin */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -137,10 +133,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6875F9992A3CD284001C9AAF /* Amplify in Frameworks */, - 6875F9A72A3CD39C001C9AAF /* AWSPinpointAnalyticsPlugin in Frameworks */, - 6875F99D2A3CD284001C9AAF /* AWSPinpointPushNotificationsPlugin in Frameworks */, - 6875F99B2A3CD284001C9AAF /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -333,10 +325,6 @@ ); name = PushNotificationWatchTests; packageProductDependencies = ( - 6875F9982A3CD284001C9AAF /* Amplify */, - 6875F99A2A3CD284001C9AAF /* AWSCognitoAuthPlugin */, - 6875F99C2A3CD284001C9AAF /* AWSPinpointPushNotificationsPlugin */, - 6875F9A62A3CD39C001C9AAF /* AWSPinpointAnalyticsPlugin */, ); productName = PushNotificationHostAppUITests; productReference = 6875F9952A3CD258001C9AAF /* PushNotificationWatchTests.xctest */; @@ -1057,18 +1045,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSPluginsCore; }; - 6875F9982A3CD284001C9AAF /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 6875F99A2A3CD284001C9AAF /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 6875F99C2A3CD284001C9AAF /* AWSPinpointPushNotificationsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSPinpointPushNotificationsPlugin; - }; 6875F99E2A3CD31D001C9AAF /* Amplify */ = { isa = XCSwiftPackageProductDependency; productName = Amplify; @@ -1085,10 +1061,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSPinpointAnalyticsPlugin; }; - 6875F9A62A3CD39C001C9AAF /* AWSPinpointAnalyticsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSPinpointAnalyticsPlugin; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 60F60D872965040600B2D13D /* Project object */; diff --git a/AmplifyPlugins/Predictions/Tests/PredictionsHostApp/PredictionsHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/Predictions/Tests/PredictionsHostApp/PredictionsHostApp.xcodeproj/project.pbxproj index cdd34b7658..b8f9ed9229 100644 --- a/AmplifyPlugins/Predictions/Tests/PredictionsHostApp/PredictionsHostApp.xcodeproj/project.pbxproj +++ b/AmplifyPlugins/Predictions/Tests/PredictionsHostApp/PredictionsHostApp.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ 6875F91E2A3CCCB7001C9AAF /* testImageLabels.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 9054235F291425630000D108 /* testImageLabels.jpg */; }; 6875F91F2A3CCCB7001C9AAF /* testImageEntities.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 90542362291425630000D108 /* testImageEntities.jpg */; }; 6875F9202A3CCCB7001C9AAF /* testImageTextAll.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 90542361291425630000D108 /* testImageTextAll.jpg */; }; + 68C1547A2BE2B11A003C4CF8 /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 68C154792BE2B11A003C4CF8 /* CoreMLPredictionsPlugin */; }; 902830062914027000897087 /* PredictionsHostAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 902830052914027000897087 /* PredictionsHostAppApp.swift */; }; 902830082914027000897087 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 902830072914027000897087 /* ContentView.swift */; }; 9028300A2914027100897087 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 902830092914027100897087 /* Assets.xcassets */; }; @@ -52,18 +53,6 @@ 90542370291425630000D108 /* testImageCeleb.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 90542363291425630000D108 /* testImageCeleb.jpg */; }; 90542371291425630000D108 /* testImageTextForms.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 90542364291425630000D108 /* testImageTextForms.jpg */; }; 90542372291425630000D108 /* audio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 90542365291425630000D108 /* audio.wav */; }; - 90CF304A2AD47A71006B6FF3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30492AD47A71006B6FF3 /* Amplify */; }; - 90CF304C2AD47A74006B6FF3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF304B2AD47A74006B6FF3 /* Amplify */; }; - 90CF304E2AD47A78006B6FF3 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF304D2AD47A78006B6FF3 /* Amplify */; }; - 90CF30502AD47B0E006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF304F2AD47B0E006B6FF3 /* AWSCognitoAuthPlugin */; }; - 90CF30522AD47B0E006B6FF3 /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30512AD47B0E006B6FF3 /* AWSPredictionsPlugin */; }; - 90CF30542AD47B0E006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30532AD47B0E006B6FF3 /* CoreMLPredictionsPlugin */; }; - 90CF30562AD47B19006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30552AD47B19006B6FF3 /* AWSCognitoAuthPlugin */; }; - 90CF30582AD47B19006B6FF3 /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30572AD47B19006B6FF3 /* AWSPredictionsPlugin */; }; - 90CF305A2AD47B19006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF30592AD47B19006B6FF3 /* CoreMLPredictionsPlugin */; }; - 90CF305C2AD47B24006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF305B2AD47B24006B6FF3 /* AWSCognitoAuthPlugin */; }; - 90CF305E2AD47B24006B6FF3 /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF305D2AD47B24006B6FF3 /* AWSPredictionsPlugin */; }; - 90CF30602AD47B24006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 90CF305F2AD47B24006B6FF3 /* CoreMLPredictionsPlugin */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -127,6 +116,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 68C1547A2BE2B11A003C4CF8 /* CoreMLPredictionsPlugin in Frameworks */, 681D7D8B2A42710F00F7C310 /* Amplify in Frameworks */, 681D7D8F2A42710F00F7C310 /* AWSPredictionsPlugin in Frameworks */, 681D7D8D2A42710F00F7C310 /* AWSCognitoAuthPlugin in Frameworks */, @@ -137,10 +127,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 90CF30602AD47B24006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */, - 90CF304E2AD47A78006B6FF3 /* Amplify in Frameworks */, - 90CF305E2AD47B24006B6FF3 /* AWSPredictionsPlugin in Frameworks */, - 90CF305C2AD47B24006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -159,10 +145,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 90CF30542AD47B0E006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */, - 90CF304A2AD47A71006B6FF3 /* Amplify in Frameworks */, - 90CF30522AD47B0E006B6FF3 /* AWSPredictionsPlugin in Frameworks */, - 90CF30502AD47B0E006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -170,10 +152,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 90CF305A2AD47B19006B6FF3 /* CoreMLPredictionsPlugin in Frameworks */, - 90CF304C2AD47A74006B6FF3 /* Amplify in Frameworks */, - 90CF30582AD47B19006B6FF3 /* AWSPredictionsPlugin in Frameworks */, - 90CF30562AD47B19006B6FF3 /* AWSCognitoAuthPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -316,6 +294,7 @@ 681D7D8A2A42710F00F7C310 /* Amplify */, 681D7D8C2A42710F00F7C310 /* AWSCognitoAuthPlugin */, 681D7D8E2A42710F00F7C310 /* AWSPredictionsPlugin */, + 68C154792BE2B11A003C4CF8 /* CoreMLPredictionsPlugin */, ); productName = "NewApp Watch App"; productReference = 6875F8F02A3CCC84001C9AAF /* PredictionsWatchApp.app */; @@ -336,10 +315,6 @@ ); name = AWSPredictionsPluginIntegrationTestsWatch; packageProductDependencies = ( - 90CF304D2AD47A78006B6FF3 /* Amplify */, - 90CF305B2AD47B24006B6FF3 /* AWSCognitoAuthPlugin */, - 90CF305D2AD47B24006B6FF3 /* AWSPredictionsPlugin */, - 90CF305F2AD47B24006B6FF3 /* CoreMLPredictionsPlugin */, ); productName = AWSPredictionsPluginIntegrationTests; productReference = 6875F9242A3CCCB7001C9AAF /* AWSPredictionsPluginIntegrationTestsWatch.xctest */; @@ -384,10 +359,6 @@ ); name = CoreMLPredictionsPluginIntegrationTests; packageProductDependencies = ( - 90CF30492AD47A71006B6FF3 /* Amplify */, - 90CF304F2AD47B0E006B6FF3 /* AWSCognitoAuthPlugin */, - 90CF30512AD47B0E006B6FF3 /* AWSPredictionsPlugin */, - 90CF30532AD47B0E006B6FF3 /* CoreMLPredictionsPlugin */, ); productName = CoreMLPredictionsPluginIntegrationTests; productReference = 90283033291402D500897087 /* CoreMLPredictionsPluginIntegrationTests.xctest */; @@ -408,10 +379,6 @@ ); name = AWSPredictionsPluginIntegrationTests; packageProductDependencies = ( - 90CF304B2AD47A74006B6FF3 /* Amplify */, - 90CF30552AD47B19006B6FF3 /* AWSCognitoAuthPlugin */, - 90CF30572AD47B19006B6FF3 /* AWSPredictionsPlugin */, - 90CF30592AD47B19006B6FF3 /* CoreMLPredictionsPlugin */, ); productName = AWSPredictionsPluginIntegrationTests; productReference = 903555F829141355004B83C2 /* AWSPredictionsPluginIntegrationTests.xctest */; @@ -1140,6 +1107,10 @@ isa = XCSwiftPackageProductDependency; productName = AWSPredictionsPlugin; }; + 68C154792BE2B11A003C4CF8 /* CoreMLPredictionsPlugin */ = { + isa = XCSwiftPackageProductDependency; + productName = CoreMLPredictionsPlugin; + }; 9028304B2914042800897087 /* Amplify */ = { isa = XCSwiftPackageProductDependency; productName = Amplify; @@ -1156,54 +1127,6 @@ isa = XCSwiftPackageProductDependency; productName = CoreMLPredictionsPlugin; }; - 90CF30492AD47A71006B6FF3 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 90CF304B2AD47A74006B6FF3 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 90CF304D2AD47A78006B6FF3 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 90CF304F2AD47B0E006B6FF3 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 90CF30512AD47B0E006B6FF3 /* AWSPredictionsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSPredictionsPlugin; - }; - 90CF30532AD47B0E006B6FF3 /* CoreMLPredictionsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = CoreMLPredictionsPlugin; - }; - 90CF30552AD47B19006B6FF3 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 90CF30572AD47B19006B6FF3 /* AWSPredictionsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSPredictionsPlugin; - }; - 90CF30592AD47B19006B6FF3 /* CoreMLPredictionsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = CoreMLPredictionsPlugin; - }; - 90CF305B2AD47B24006B6FF3 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 90CF305D2AD47B24006B6FF3 /* AWSPredictionsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSPredictionsPlugin; - }; - 90CF305F2AD47B24006B6FF3 /* CoreMLPredictionsPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = CoreMLPredictionsPlugin; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 90282FFA2914027000897087 /* Project object */; diff --git a/AmplifyPlugins/Storage/Tests/StorageHostApp/StorageHostApp.xcodeproj/project.pbxproj b/AmplifyPlugins/Storage/Tests/StorageHostApp/StorageHostApp.xcodeproj/project.pbxproj index f3330c56ef..c363202fbf 100644 --- a/AmplifyPlugins/Storage/Tests/StorageHostApp/StorageHostApp.xcodeproj/project.pbxproj +++ b/AmplifyPlugins/Storage/Tests/StorageHostApp/StorageHostApp.xcodeproj/project.pbxproj @@ -9,9 +9,6 @@ /* Begin PBXBuildFile section */ 0311113528EBED6500D58441 /* Tests.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0311113428EBED6500D58441 /* Tests.xcconfig */; }; 031BC3F328EC9B2C0047B2E8 /* AppIcon.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 031BC3F228EC9B2C0047B2E8 /* AppIcon.xcassets */; }; - 488C2A732BAE04DC009AD2BA /* AWSS3StoragePluginRemoveIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 488C2A722BAE04DC009AD2BA /* AWSS3StoragePluginRemoveIntegrationTests.swift */; }; - 488C2A752BAFCA7C009AD2BA /* AWSS3StoragePluginListObjectsIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 488C2A742BAFCA7C009AD2BA /* AWSS3StoragePluginListObjectsIntegrationTests.swift */; }; - 488C2A772BAFD4B3009AD2BA /* AWSS3StoragePluginGetURLIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 488C2A762BAFD4B3009AD2BA /* AWSS3StoragePluginGetURLIntegrationTests.swift */; }; 21D165C32BBEF329001E3D4B /* amplify_outputs.json in Resources */ = {isa = PBXBuildFile; fileRef = 21D165C22BBEF329001E3D4B /* amplify_outputs.json */; }; 21D165C42BBEF329001E3D4B /* amplify_outputs.json in Resources */ = {isa = PBXBuildFile; fileRef = 21D165C22BBEF329001E3D4B /* amplify_outputs.json */; }; 21F7630D2BD6B8640048845A /* AWSS3StoragePluginAccelerateIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 565DF16F2953BAEA000DCCF7 /* AWSS3StoragePluginAccelerateIntegrationTests.swift */; }; @@ -34,6 +31,9 @@ 21F7631E2BD6B8640048845A /* XCTestCase+AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEB128E748270000C36A /* XCTestCase+AsyncTesting.swift */; }; 21F7631F2BD6B8640048845A /* AWSS3StoragePluginOptionsUsabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684FB08128BEAF8E00C8A6EB /* AWSS3StoragePluginOptionsUsabilityTests.swift */; }; 21F763202BD6B8640048845A /* TestConfigHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684FB09D28BEAFE700C8A6EB /* TestConfigHelper.swift */; }; + 488C2A732BAE04DC009AD2BA /* AWSS3StoragePluginRemoveIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 488C2A722BAE04DC009AD2BA /* AWSS3StoragePluginRemoveIntegrationTests.swift */; }; + 488C2A752BAFCA7C009AD2BA /* AWSS3StoragePluginListObjectsIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 488C2A742BAFCA7C009AD2BA /* AWSS3StoragePluginListObjectsIntegrationTests.swift */; }; + 488C2A772BAFD4B3009AD2BA /* AWSS3StoragePluginGetURLIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 488C2A762BAFD4B3009AD2BA /* AWSS3StoragePluginGetURLIntegrationTests.swift */; }; 56043E9329FC4D33003E3424 /* amplifyconfiguration.json in Resources */ = {isa = PBXBuildFile; fileRef = D5C0382101A0E23943FDF4CB /* amplifyconfiguration.json */; }; 562B9AA42A0D703700A96FC6 /* AWSS3StoragePluginRequestRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 562B9AA32A0D703700A96FC6 /* AWSS3StoragePluginRequestRecorder.swift */; }; 562B9AA52A0D734E00A96FC6 /* AWSS3StoragePluginRequestRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 562B9AA32A0D703700A96FC6 /* AWSS3StoragePluginRequestRecorder.swift */; }; @@ -61,9 +61,6 @@ 681D7D6E2A42647200F7C310 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681D7D6D2A42647200F7C310 /* Amplify */; }; 681D7D702A42647200F7C310 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681D7D6F2A42647200F7C310 /* AWSCognitoAuthPlugin */; }; 681D7D722A42647200F7C310 /* AWSS3StoragePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681D7D712A42647200F7C310 /* AWSS3StoragePlugin */; }; - 681D7D772A4264D200F7C310 /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 681D7D762A4264D200F7C310 /* Amplify */; }; - 681D7D792A4264D200F7C310 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681D7D782A4264D200F7C310 /* AWSCognitoAuthPlugin */; }; - 681D7D7B2A4264D200F7C310 /* AWSS3StoragePlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 681D7D7A2A4264D200F7C310 /* AWSS3StoragePlugin */; }; 681D7D852A426FF500F7C310 /* amplifyconfiguration.json in Resources */ = {isa = PBXBuildFile; fileRef = D5C0382101A0E23943FDF4CB /* amplifyconfiguration.json */; }; 681DFEB228E748270000C36A /* AsyncTesting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEAF28E748270000C36A /* AsyncTesting.swift */; }; 681DFEB328E748270000C36A /* AsyncExpectation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 681DFEB028E748270000C36A /* AsyncExpectation.swift */; }; @@ -135,13 +132,13 @@ 0311113428EBED6500D58441 /* Tests.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Tests.xcconfig; sourceTree = ""; }; 0311113828EBEEA700D58441 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = ""; }; 031BC3F228EC9B2C0047B2E8 /* AppIcon.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = AppIcon.xcassets; sourceTree = ""; }; - 488C2A722BAE04DC009AD2BA /* AWSS3StoragePluginRemoveIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AWSS3StoragePluginRemoveIntegrationTests.swift; sourceTree = ""; }; - 488C2A742BAFCA7C009AD2BA /* AWSS3StoragePluginListObjectsIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AWSS3StoragePluginListObjectsIntegrationTests.swift; sourceTree = ""; }; - 488C2A762BAFD4B3009AD2BA /* AWSS3StoragePluginGetURLIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AWSS3StoragePluginGetURLIntegrationTests.swift; sourceTree = ""; }; 21D165C02BBEDF0A001E3D4B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 21D165C22BBEF329001E3D4B /* amplify_outputs.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = amplify_outputs.json; sourceTree = ""; }; 21F763262BD6B8640048845A /* AWSS3StoragePluginGen2IntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AWSS3StoragePluginGen2IntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 21F763272BD6B8950048845A /* AWSS3StoragePluginGen2IntegrationTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AWSS3StoragePluginGen2IntegrationTests.xctestplan; sourceTree = ""; }; + 488C2A722BAE04DC009AD2BA /* AWSS3StoragePluginRemoveIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AWSS3StoragePluginRemoveIntegrationTests.swift; sourceTree = ""; }; + 488C2A742BAFCA7C009AD2BA /* AWSS3StoragePluginListObjectsIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AWSS3StoragePluginListObjectsIntegrationTests.swift; sourceTree = ""; }; + 488C2A762BAFD4B3009AD2BA /* AWSS3StoragePluginGetURLIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AWSS3StoragePluginGetURLIntegrationTests.swift; sourceTree = ""; }; 562B9AA32A0D703700A96FC6 /* AWSS3StoragePluginRequestRecorder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AWSS3StoragePluginRequestRecorder.swift; sourceTree = ""; }; 565DF16F2953BAEA000DCCF7 /* AWSS3StoragePluginAccelerateIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AWSS3StoragePluginAccelerateIntegrationTests.swift; sourceTree = ""; }; 681D7D392A42637700F7C310 /* StorageWatchApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StorageWatchApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -202,9 +199,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 681D7D772A4264D200F7C310 /* Amplify in Frameworks */, - 681D7D792A4264D200F7C310 /* AWSCognitoAuthPlugin in Frameworks */, - 681D7D7B2A4264D200F7C310 /* AWSS3StoragePlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -435,9 +429,6 @@ ); name = AWSS3StoragePluginIntegrationTestsWatch; packageProductDependencies = ( - 681D7D762A4264D200F7C310 /* Amplify */, - 681D7D782A4264D200F7C310 /* AWSCognitoAuthPlugin */, - 681D7D7A2A4264D200F7C310 /* AWSS3StoragePlugin */, ); productName = AWSS3StoragePluginIntegrationTests; productReference = 681D7D6C2A4263E500F7C310 /* AWSS3StoragePluginIntegrationTestsWatch.xctest */; @@ -1306,18 +1297,6 @@ isa = XCSwiftPackageProductDependency; productName = AWSS3StoragePlugin; }; - 681D7D762A4264D200F7C310 /* Amplify */ = { - isa = XCSwiftPackageProductDependency; - productName = Amplify; - }; - 681D7D782A4264D200F7C310 /* AWSCognitoAuthPlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSCognitoAuthPlugin; - }; - 681D7D7A2A4264D200F7C310 /* AWSS3StoragePlugin */ = { - isa = XCSwiftPackageProductDependency; - productName = AWSS3StoragePlugin; - }; B4A5B59A2919730700D873D2 /* Amplify */ = { isa = XCSwiftPackageProductDependency; productName = Amplify; From a9f65058994345a0f4d8e11b9195a59a3c41232c Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Thu, 2 May 2024 12:03:06 -0400 Subject: [PATCH 19/21] fixing push notification integration tests --- .../get_platform_parameters/action.yml | 58 +++++++++++------ .github/workflows/canary.yml | 14 ++--- .../LocalServer/index.mjs | 13 ++++ .../LocalServer.swift | 7 ++- .../PushNotificationHostAppUITests.swift | 63 +++++++++++++++++-- 5 files changed, 122 insertions(+), 33 deletions(-) diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml index 2b01f58d75..7ac2d4f612 100644 --- a/.github/composite_actions/get_platform_parameters/action.yml +++ b/.github/composite_actions/get_platform_parameters/action.yml @@ -17,6 +17,9 @@ outputs: destination: description: "The destination associated with the given platform and Xcode version" value: ${{ steps.get-destination.outputs.destination }} + device: + description: "The device name used in the destination" + value: ${{ steps.get-destination.outputs.device }} sdk: description: "The SDK associated with the given platform" value: ${{ steps.get-sdk.outputs.sdk }} @@ -61,28 +64,42 @@ runs: INPUT_DESTINATION='${{ inputs.destination }}' INPUT_XCODE_VERSION=${{ inputs.xcode_version }} - DESTINATION_MAPPING='{ - "minimum": { - "iOS": "platform=iOS Simulator,name=iPhone 14,OS=17.0.1", - "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=17.0", - "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=10.0", - "macOS": "platform=macOS,arch=x86_64" - }, - "latest": { - "iOS": "platform=iOS Simulator,name=iPhone 15,OS=17.4", - "tvOS": "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=17.4", - "watchOS": "platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=10.4", - "macOS": "platform=macOS,arch=x86_64" - } - }' + case $INPUT_PLATFORM/$INPUT_XCODE_VERSION in + iOS/latest) + DEVICE="iPhone 15" + OS_VERSION="17.4" + ;; + iOS/*) + DEVICE="iPhone 14" + OS_VERSION="17.0.1" + ;; + tvOS/latest) + DEVICE="Apple TV 4K (3rd generation)" + OS_VERSION="17.4" + ;; + tvOS/*) + DEVICE="Apple TV 4K (3rd generation)" + OS_VERSION="17.0" + ;; + watchOS/latest) + DEVICE="Apple Watch Series 9 (45mm)" + OS_VERSION="10.4" + ;; + watchOS/*) + DEVICE="Apple Watch Series 8 (45mm)" + OS_VERSION="10.0" + ;; + esac + + DESTINATION_MAPPING="{ + \"iOS\": \"platform=iOS Simulator,name=$DEVICE,OS=$OS_VERSION\", + \"tvOS\": \"platform=tvOS Simulator,name=$DEVICE,OS=$OS_VERSION\", + \"watchOS\": \"platform=watchOS Simulator,name=$DEVICE,OS=$OS_VERSION\", + \"macOS\": \"platform=macOS,arch=arm64\" + }" if [ -z "$INPUT_DESTINATION" ]; then - case $INPUT_XCODE_VERSION in - latest|minimum) - DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"$INPUT_XCODE_VERSION\".$INPUT_PLATFORM") ;; - *) - DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".\"minimum\".$INPUT_PLATFORM") ;; - esac + DESTINATION=$(echo $DESTINATION_MAPPING | jq -r ".$INPUT_PLATFORM") else DESTINATION=$INPUT_DESTINATION fi @@ -92,6 +109,7 @@ runs: exit 1 fi echo "destination=$DESTINATION" >> $GITHUB_OUTPUT + echo "device=$DEVICE" >> $GITHUB_OUTPUT shell: bash - id: get-sdk diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 26055fa5d3..1de1725fd1 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -16,13 +16,13 @@ jobs: matrix: include: - os: macos-latest - xcode-version: 14.3.1 - device: iPhone 14 Pro - version: 16.4 + xcode-version: 15.3.0 + device: iPhone 15 + version: 17.4 - os: macos-latest - xcode-version: 14.1 - device: iPhone 13 Pro - version: 16.1 + xcode-version: 15.0.1 + device: iPhone 14 + version: 17.0.1 name: Canary Test - Xcode ${{ matrix.xcode-version }} runs-on: ${{ matrix.os }} steps: @@ -39,7 +39,7 @@ jobs: run: amplify init --quickstart --frontend ios - name: Setup Ruby - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0 + uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: ruby-version: '3.2.1' bundler-cache: true diff --git a/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/LocalServer/index.mjs b/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/LocalServer/index.mjs index 7ce996c1ce..7283e7c862 100644 --- a/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/LocalServer/index.mjs +++ b/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/LocalServer/index.mjs @@ -69,6 +69,19 @@ app.post('/uninstall', async (req, res) => { } }) +app.post('/boot', async (req, res) => { + console.log("POST /boot ") + const { deviceId } = req.body + try { + const cmd = `xcrun simctl --set testing bootstatus ${deviceId} -b` + await run(cmd) + res.send("Done") + } catch (error) { + console.error("Failed to boot the device", error) + res.sendStatus(500) + } +}) + app.listen(9293, () => { console.log("Starting server") }) diff --git a/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostAppUITests/LocalServer.swift b/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostAppUITests/LocalServer.swift index 6d7b245f70..03dc306481 100644 --- a/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostAppUITests/LocalServer.swift +++ b/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostAppUITests/LocalServer.swift @@ -13,6 +13,7 @@ enum LocalServer { case notifications(PinpointNotification) case uninstall(String) + case boot(String) } extension LocalServer { @@ -20,6 +21,7 @@ extension LocalServer { switch self { case .notifications: return "POST" case .uninstall: return "POST" + case .boot: return "POST" } } @@ -27,6 +29,7 @@ extension LocalServer { switch self { case .notifications: return "/notifications" case .uninstall: return "/uninstall" + case .boot: return "/boot" } } @@ -36,12 +39,14 @@ extension LocalServer { return try? JSONEncoder().encode(notification) case let .uninstall(deviceId): return try? JSONEncoder().encode(["deviceId": deviceId]) + case let .boot(deviceId): + return try? JSONEncoder().encode(["deviceId": deviceId]) } } var additionalRequestHeaders: [String: String]? { switch self { - case .notifications, .uninstall: + case .notifications, .uninstall, .boot: return ["Content-Type": "application/json"] } } diff --git a/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostAppUITests/PushNotificationHostAppUITests.swift b/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostAppUITests/PushNotificationHostAppUITests.swift index fbf25d42eb..21729ac2e1 100644 --- a/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostAppUITests/PushNotificationHostAppUITests.swift +++ b/AmplifyPlugins/Notifications/Push/Tests/PushNotificationHostApp/PushNotificationHostAppUITests/PushNotificationHostAppUITests.swift @@ -24,8 +24,10 @@ final class PushNotificationHostAppUITests: XCTestCase { return identifier }() - override func setUpWithError() throws { + @MainActor + override func setUp() async throws { continueAfterFailure = false + try await bootDevice() #if os(iOS) XCUIDevice.shared.orientation = .portrait #endif @@ -64,7 +66,12 @@ final class PushNotificationHostAppUITests: XCTestCase { let identifyUserButton = app.buttons["Identify User"] if identifyUserButton.waitForExistence(timeout: timeout) { + #if os(tvOS) + identifyUserButton.select(direction: .vertical) + #else identifyUserButton.tap() + #endif + } else { XCTFail("Failed to find 'Identify User' button") } @@ -84,7 +91,12 @@ final class PushNotificationHostAppUITests: XCTestCase { let registerDeviceButton = app.buttons["Register Device"] if registerDeviceButton.waitForExistence(timeout: timeout) { + #if os(tvOS) + registerDeviceButton.select(direction: .vertical) + #else registerDeviceButton.tap() + #endif + } else { XCTFail("Failed to find 'Register Device' button") } @@ -235,7 +247,12 @@ final class PushNotificationHostAppUITests: XCTestCase { private func initAmplify() { let initAmplifyButton = app.buttons["Init Amplify"] if initAmplifyButton.waitForExistence(timeout: timeout) { + #if os(tvOS) + initAmplifyButton.select(direction: .vertical) + #else initAmplifyButton.tap() + #endif + } else { XCTFail("Failed to find `Init Amplify` button") } @@ -249,7 +266,14 @@ final class PushNotificationHostAppUITests: XCTestCase { #endif if alert.waitForExistence(timeout: timeout) { XCTAssertTrue(anyElementContains(text: "Would Like to Send You Notifications", scope: alert).exists) + #if os(tvOS) + alert.buttons["Allow"].firstMatch.select(direction: .horizontal) + #elseif os(watchOS) + alert.swipeUp() alert.buttons["Allow"].tap() + #else + alert.buttons["Allow"].tap() + #endif } } @@ -282,6 +306,12 @@ final class PushNotificationHostAppUITests: XCTestCase { XCTAssertTrue((response as! HTTPURLResponse).statusCode < 300, "Failed to uninstall the App") } + private func bootDevice() async throws { + let request = LocalServer.boot(deviceIdentifier!).urlRequest + let (_, response) = try await URLSession.shared.data(for: request) + XCTAssertTrue((response as! HTTPURLResponse).statusCode < 300, "Failed to boot the device") + } + private func pressHomeButton() { XCUIDevice.shared.press(XCUIDevice.Button.home) let springboard = XCUIApplication.homeScreen @@ -314,18 +344,41 @@ final class PushNotificationHostAppUITests: XCTestCase { #if os(tvOS) extension XCUIElement { - func tap() { - XCUIRemote.shared.select(self) + func select(direction: Direction) { + XCUIRemote.shared.select(self, direction: direction) + } +} + +enum Direction { + case horizontal + case vertical + + func next() -> XCUIRemote.Button { + switch self { + case .horizontal: + return .right + case .vertical: + return .down + } + } + + func previous() -> XCUIRemote.Button { + switch self { + case .horizontal: + return .left + case .vertical: + return .up + } } } extension XCUIRemote { - func select(_ element: XCUIElement) { + func select(_ element: XCUIElement, direction: Direction) { let app = XCUIApplication() var isEndReached = false while !element.hasFocus { let previousElement = app.focusedElement - press(isEndReached ? .up : .down) + press(isEndReached ? direction.previous() : direction.next()) if previousElement == app.focusedElement { if isEndReached { XCTFail("Element \(element) was not found.") From 88ae6524a6ae2398187ee5127321df32bebd9736 Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Thu, 2 May 2024 13:40:58 -0400 Subject: [PATCH 20/21] Updating README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d335796bc1..b71913566b 100644 --- a/README.md +++ b/README.md @@ -59,10 +59,10 @@ Amplify requires the following Xcode versions, according to the targeted platfor | Platform | Xcode Version | | -------------:| ------------: | -| iOS | 14.1+ | -| macOS | 14.1+ | -| tvOS | 14.3+ | -| watchOS | 14.3+ | +| iOS | 15+ | +| macOS | 15+ | +| tvOS | 15+ | +| watchOS | 15+ | | visionOS | 15 beta 2+ | | For more detailed instructions, follow the getting started guides in our [documentation site](https://docs.amplify.aws/lib/q/platform/ios) | From 07d7d76e63039b89b7f7439dd0f0e1900815f93a Mon Sep 17 00:00:00 2001 From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com> Date: Thu, 2 May 2024 13:51:19 -0400 Subject: [PATCH 21/21] Removing unnecessary condition --- .github/workflows/run_unit_tests_platforms.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml index edfd321c9b..972a4e64dd 100644 --- a/.github/workflows/run_unit_tests_platforms.yml +++ b/.github/workflows/run_unit_tests_platforms.yml @@ -48,5 +48,4 @@ jobs: generate_coverage_report: ${{ github.event_name != 'workflow_dispatch' && matrix.platform == 'iOS' && inputs.generate_coverage_report }} timeout-minutes: ${{ inputs.timeout-minutes }} test_iterations_flags: ${{ inputs.test_iterations_flags }} - os-runner: ${{ inputs.os-runner }} - xcode_version: ${{ inputs.os-runner == 'macos-13' && '15.2' || 'latest' }} \ No newline at end of file + os-runner: ${{ inputs.os-runner }} \ No newline at end of file