feat: Adding support for tvOS and watchOS (#3051)

* feat: Adding support for tvOS and watchOS (#3032)
* test: Adding unit and integration tests for tvOS and watchOS (#3036)
* chore: Updating README (#3050)
---------

Co-authored-by: Chris Ameter <[email protected]>

Author: sebaland

.circleci/config.yml

@@ -9,6 +9,12 @@ parameters:
   macos-destination:
     type: string
     default: platform=macOS,arch=x86_64
+  tvos-destination:
+    type: string
+    default: platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=latest
+  watchos-destination:
+    type: string
+    default: platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=latest
 
 orbs:
   aws-cli: circleci/[email protected]
@@ -97,6 +103,7 @@ orbs:
 defaults: &defaults
   macos:
     xcode: '14.0.0'
+  resource_class: macos.x86.medium.gen2
   environment:
     BUNDLE_JOBS: 4
     BUNDLE_RETRY: 3
@@ -151,6 +158,26 @@ jobs:
       - run:
           name: Build amplify for macos SPM
           command: xcodebuild build -scheme Amplify-Package -sdk macosx -destination "<< pipeline.parameters.macos-destination >>" | tee "artifacts/build-Ampify-for-macos-SPM.log" | xcpretty
+  build_amplify_tvos_spm:
+    <<: *defaults
+    macos:
+      xcode: '14.3.0'
+    steps:
+      - shallow_checkout
+      - make_artifacts_directory
+      - run:
+          name: Build amplify for tvOS SPM
+          command: xcodebuild build -scheme Amplify-Package -sdk appletvsimulator -destination "<< pipeline.parameters.tvos-destination >>" | tee "artifacts/build-Ampify-for-tvos-SPM.log" | xcpretty
+  build_amplify_watchos_spm:
+    <<: *defaults
+    macos:
+      xcode: '14.3.0'
+    steps:
+      - shallow_checkout
+      - make_artifacts_directory
+      - run:
+          name: Build amplify for watchOS SPM
+          command: xcodebuild build -scheme Amplify-Package -sdk watchsimulator -destination "<< pipeline.parameters.watchos-destination >>" | tee "artifacts/build-Ampify-for-watchos-SPM.log" | xcpretty
 
   unit_test:
     <<: *defaults
@@ -164,6 +191,8 @@ jobs:
         type: string
       destination:
         type: string
+    macos:
+      xcode: <<parameters.xcode-version>>
     description: << parameters.scheme >> unit test
     steps:
       - shallow_checkout
@@ -253,6 +282,8 @@ deploy_requires: &deploy_requires
   requires:
     - build_amplify_ios_spm
     - build_amplify_macos_spm
+    - build_amplify_tvos_spm
+    - build_amplify_watchos_spm
     - ios_unit_test_amplify
     - ios_unit_test_awspluginscore
     - ios_unit_test_analytics
@@ -275,6 +306,28 @@ deploy_requires: &deploy_requires
     - macos_unit_test_push_notifications
     - macos_unit_test_storage
     - macos_unit_test_predictions
+    - tvos_unit_test_amplify
+    - tvos_unit_test_awspluginscore
+    - tvos_unit_test_analytics
+    - tvos_unit_test_api
+    - tvos_unit_test_auth
+    - tvos_unit_test_datastore
+    - tvos_unit_test_geo
+    - tvos_unit_test_internal_pinpoint
+    - tvos_unit_test_push_notifications
+    - tvos_unit_test_storage
+    - tvos_unit_test_predictions
+    - watchos_unit_test_amplify
+    - watchos_unit_test_awspluginscore
+    - watchos_unit_test_analytics
+    - watchos_unit_test_api
+    - watchos_unit_test_auth
+    - watchos_unit_test_datastore
+    - watchos_unit_test_geo
+    - watchos_unit_test_internal_pinpoint
+    - watchos_unit_test_push_notifications
+    - watchos_unit_test_storage
+    - watchos_unit_test_predictions
     - fortify_scan
 
 workflows:
@@ -292,6 +345,12 @@ workflows:
       - build_amplify_macos_spm:
           requires:
             - fortify_scan
+      - build_amplify_tvos_spm:
+          requires:
+            - fortify_scan
+      - build_amplify_watchos_spm:
+          requires:
+            - fortify_scan
       - unit_test:
           name: ios_unit_test_amplify
           scheme: Amplify
@@ -446,6 +505,182 @@ workflows:
           destination: << pipeline.parameters.macos-destination >>
           requires:
             - build_amplify_macos_spm
+      - unit_test:
+          name: tvos_unit_test_amplify
+          scheme: Amplify
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_awspluginscore
+          scheme: AWSPluginsCore
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_analytics
+          scheme: AWSPinpointAnalyticsPlugin
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_api
+          scheme: AWSAPIPlugin
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_auth
+          scheme: AWSCognitoAuthPlugin
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_datastore
+          scheme: AWSDataStorePlugin
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_geo
+          scheme: AWSLocationGeoPlugin
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_internal_pinpoint
+          scheme: InternalAWSPinpointUnitTests
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_push_notifications
+          scheme: AWSPinpointPushNotificationsPlugin
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_storage
+          scheme: AWSS3StoragePlugin
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: tvos_unit_test_predictions
+          scheme: AWSPredictionsPlugin
+          sdk: appletvsimulator
+          destination: << pipeline.parameters.tvos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_tvos_spm
+      - unit_test:
+          name: watchos_unit_test_amplify
+          scheme: Amplify
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_awspluginscore
+          scheme: AWSPluginsCore
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_analytics
+          scheme: AWSPinpointAnalyticsPlugin
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_api
+          scheme: AWSAPIPlugin
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_auth
+          scheme: AWSCognitoAuthPlugin
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_datastore
+          scheme: AWSDataStorePlugin
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_geo
+          scheme: AWSLocationGeoPlugin
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_internal_pinpoint
+          scheme: InternalAWSPinpointUnitTests
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_push_notifications
+          scheme: AWSPinpointPushNotificationsPlugin
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_storage
+          scheme: AWSS3StoragePlugin
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
+      - unit_test:
+          name: watchos_unit_test_predictions
+          scheme: AWSPredictionsPlugin
+          sdk: watchsimulator
+          destination: << pipeline.parameters.watchos-destination >>
+          xcode-version: '14.3.0'
+          requires:
+            - build_amplify_watchos_spm
       - deploy:
           name: deploy unstable
           <<: *deploy_requires

.github/workflows/integ_test_analytics.yml

@@ -1,4 +1,4 @@
-name: Integration Tests | Amalytics
+name: Integration Tests | Analytics
 on:
   workflow_dispatch:
   workflow_call:
@@ -8,7 +8,7 @@ permissions:
     contents: read
 
 jobs:
-  analytics-integration-test:
+  analytics-integration-test-iOS:
     runs-on: macos-12
     environment: IntegrationTest
     steps:
@@ -32,3 +32,59 @@ jobs:
         with:
           project_path: ./AmplifyPlugins/Analytics/Tests/AnalyticsHostApp
           scheme: AWSPinpointAnalyticsPluginIntegrationTests
+
+  analytics-integration-test-tvOS:
+    runs-on: macos-13
+    environment: IntegrationTest
+    steps:
+      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        with:
+          persist-credentials: false
+
+      - name: Make directory
+        run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
+
+      - name: Copy integration test resouces
+        uses: ./.github/composite_actions/download_test_configuration
+        with:
+          resource_subfolder: analytics
+          aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws_region: ${{ secrets.AWS_REGION }}
+          aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG_V2 }}
+
+      - name: Run Integration test
+        uses: ./.github/composite_actions/run_xcodebuild_test
+        with:
+          project_path: ./AmplifyPlugins/Analytics/Tests/AnalyticsHostApp
+          scheme: AWSPinpointAnalyticsPluginIntegrationTests
+          destination: platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=latest
+          sdk: appletvsimulator
+          xcode_path: '/Applications/Xcode_14.3.app'
+
+  analytics-integration-test-watchOS:
+    runs-on: macos-13
+    environment: IntegrationTest
+    steps:
+      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        with:
+          persist-credentials: false
+
+      - name: Make directory
+        run: mkdir -p ~/.aws-amplify/amplify-ios/testconfiguration/
+
+      - name: Copy integration test resouces
+        uses: ./.github/composite_actions/download_test_configuration
+        with:
+          resource_subfolder: analytics
+          aws_role_to_assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws_region: ${{ secrets.AWS_REGION }}
+          aws_s3_bucket: ${{ secrets.AWS_S3_BUCKET_INTEG_V2 }}
+
+      - name: Run Integration test
+        uses: ./.github/composite_actions/run_xcodebuild_test
+        with:
+          project_path: ./AmplifyPlugins/Analytics/Tests/AnalyticsHostApp
+          scheme: AWSPinpointAnalyticsPluginIntegrationTestsWatch
+          destination: platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=latest
+          sdk: watchsimulator
+          xcode_path: '/Applications/Xcode_14.3.app'