feat: adding vision os preview (#3898)

* feat: visionOS support (#3058) * fix readme typo and make instructions clearer (#3070) * fix: update xrOS --> visionOS in os directive checks * chore(build): fix integration tests * fix: Fixing Analytics, Storage and Predictions integration tests * fix: Fixing Push Notification tests. Also reverting some scheme changes. * chore: Updating README * chore: update ReadMe me to remove visionos-preview branch * chore: add visionOS to build and unit test jobs (#3900) * Update Amplify/Core/Configuration/Internal/Amplify+Reset.swift Co-authored-by: Sebastian Villena <[email protected]> * worked on review comments * fixed unit tests * remove the platform checks --------- Co-authored-by: Ian Saultz <[email protected]> Co-authored-by: Abhash Kumar Singh <[email protected]> Co-authored-by: Sebastian Villena <[email protected]>
aws-amplify · Oct 21, 2024 · f950c6c · f950c6c
1 parent 4fcda7e
commit f950c6c
Show file tree

Hide file tree

Showing 112 changed files with 768 additions and 395 deletions.
diff --git a/.github/composite_actions/get_platform_parameters/action.yml b/.github/composite_actions/get_platform_parameters/action.yml
@@ -34,14 +34,14 @@ runs:
       run: |
         INPUT_PLATFORM=${{ inputs.platform }}
         case $INPUT_PLATFORM in
-          iOS|tvOS|watchOS|macOS) ;;
+          iOS|tvOS|watchOS|macOS|visionOS) ;;
           *) echo "Unsupported platform: $INPUT_PLATFORM"; exit 1 ;;
         esac
       shell: bash
 
     - id: get-xcode-version
       run: |
-        LATEST_XCODE_VERSION=15.3.0
+        LATEST_XCODE_VERSION=16.0.0
         MINIMUM_XCODE_VERSION=15.0.1
 
         INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
@@ -66,35 +66,44 @@ runs:
 
         case $INPUT_PLATFORM/$INPUT_XCODE_VERSION in
           iOS/latest) 
-            DEVICE="iPhone 15"
-            OS_VERSION="17.4"
+            DEVICE="iPhone 16"
+            OS_VERSION="18.0"
             ;;
           iOS/*)
             DEVICE="iPhone 14"
             OS_VERSION="17.0.1"
             ;;
           tvOS/latest)
             DEVICE="Apple TV 4K (3rd generation)"
-            OS_VERSION="17.4"
+            OS_VERSION="18.0"
             ;;
           tvOS/*)
             DEVICE="Apple TV 4K (3rd generation)"
             OS_VERSION="17.0"
             ;;
           watchOS/latest)
-            DEVICE="Apple Watch Series 9 (45mm)"
-            OS_VERSION="10.4"
+            DEVICE="Apple Watch Series 10 (46mm)"
+            OS_VERSION="11.0"
             ;;
           watchOS/*)
             DEVICE="Apple Watch Series 8 (45mm)"
             OS_VERSION="10.0"
             ;;
+          visionOS/latest)
+            DEVICE="Apple Vision Pro"
+            OS_VERSION="2.0"
+            ;;
+          visionOS/*)
+            DEVICE="Apple Vision Pro"
+            OS_VERSION="1.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\",
+          \"visionOS\": \"platform=visionOS Simulator,name=$DEVICE,OS=$OS_VERSION\",
           \"macOS\": \"platform=macOS,arch=arm64\"
         }"
 
@@ -119,8 +128,8 @@ runs:
           "iOS": "iphonesimulator",
           "tvOS": "appletvsimulator",
           "watchOS": "watchsimulator",
+          "visionOS": "xrsimulator",
           "macOS": "macosx"
         }'
         echo "sdk=$(echo $SDK_MAPPING | jq -r .$INPUT_PLATFORM)" >> $GITHUB_OUTPUT
-      shell: bash
-
+      shell: bash
diff --git a/.github/workflows/build_amplify_swift_platforms.yml b/.github/workflows/build_amplify_swift_platforms.yml
@@ -27,6 +27,12 @@ on:
         required: true
         default: true
         type: boolean
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
   push:
     branches-ignore:
       - main
@@ -46,12 +52,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [iOS, macOS, tvOS, watchOS]
+        platform: [iOS, macOS, tvOS, watchOS, visionOS]
         exclude:
           - platform: ${{ github.event.inputs.ios == 'false' && 'iOS' || 'None' }}
           - platform: ${{ github.event.inputs.macos == 'false' && 'macOS' || 'None' }}
           - platform: ${{ github.event.inputs.tvos == 'false' && 'tvOS' || 'None' }}
           - platform: ${{ github.event.inputs.watchos == 'false' && 'watchOS' || 'None' }}
+          - platform: ${{ github.event.inputs.visionos == 'false' && 'visionOS' || 'None' }}
     uses: ./.github/workflows/build_scheme.yml
     with:
       scheme: Amplify-Package

diff --git a/.github/workflows/build_scheme.yml b/.github/workflows/build_scheme.yml
@@ -16,7 +16,7 @@ on:
 
       os-runner:
         type: string
-        default: 'macos-latest'
+        default: 'macos-15'
 
       save_build_cache:
         type: boolean

diff --git 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-15'
       scheme:
         description: 'The scheme to run the tests'
         required: true

diff --git a/.github/workflows/run_unit_tests_platforms.yml b/.github/workflows/run_unit_tests_platforms.yml
@@ -24,7 +24,7 @@ on:
       os-runner:
         description: 'runs-on input'
         type: string
-        default: 'macos-latest'
+        default: 'macos-15'
 
 permissions:
     contents: read
@@ -35,12 +35,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [iOS, macOS, tvOS, watchOS]
+        platform: [iOS, macOS, tvOS, watchOS, visionOS]
         exclude:
           - platform: ${{ github.event.inputs.ios == 'false' && 'iOS' || 'None' }}
           - platform: ${{ github.event.inputs.macos == 'false' && 'macOS' || 'None' }}
           - platform: ${{ github.event.inputs.tvos == 'false' && 'tvOS' || 'None' }}
           - platform: ${{ github.event.inputs.watchos == 'false' && 'watchOS' || 'None' }}
+          - platform: ${{ github.event.inputs.visionos == 'false' && 'visionOS' || 'None' }}
     uses: ./.github/workflows/run_unit_tests.yml
     with:
       scheme: ${{ inputs.scheme }}

diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
@@ -28,6 +28,12 @@ on:
         required: true
         default: true
         type: boolean
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
   push:
     branches-ignore:
       - main

diff --git a/.github/workflows/unit_test_amplify.yml b/.github/workflows/unit_test_amplify.yml
@@ -22,6 +22,11 @@ on:
         required: true
         default: true
         type: boolean
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean        
 
 permissions:
     contents: read

diff --git a/.github/workflows/unit_test_analytics.yml b/.github/workflows/unit_test_analytics.yml
@@ -22,7 +22,12 @@ on:
         required: true
         default: true
         type: boolean
-
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
 permissions:
     contents: read
 

diff --git a/.github/workflows/unit_test_api.yml b/.github/workflows/unit_test_api.yml
@@ -22,6 +22,11 @@ on:
         required: true
         default: true
         type: boolean
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
 
 permissions:
     contents: read

diff --git a/.github/workflows/unit_test_auth.yml b/.github/workflows/unit_test_auth.yml
@@ -22,7 +22,12 @@ on:
         required: true
         default: true
         type: boolean
-
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
 permissions:
     contents: read
 

diff --git a/.github/workflows/unit_test_core.yml b/.github/workflows/unit_test_core.yml
@@ -22,7 +22,12 @@ on:
         required: true
         default: true
         type: boolean
-
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
 permissions:
     contents: read
 

diff --git a/.github/workflows/unit_test_datastore.yml b/.github/workflows/unit_test_datastore.yml
@@ -22,7 +22,12 @@ on:
         required: true
         default: true
         type: boolean
-
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
 permissions:
     contents: read
 

diff --git a/.github/workflows/unit_test_geo.yml b/.github/workflows/unit_test_geo.yml
@@ -22,6 +22,11 @@ on:
         required: true
         default: true
         type: boolean
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
 
 permissions:
     contents: read

diff --git a/.github/workflows/unit_test_internal_pinpoint.yml b/.github/workflows/unit_test_internal_pinpoint.yml
@@ -22,6 +22,11 @@ on:
         required: true
         default: true
         type: boolean
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
 
 permissions:
     contents: read

diff --git a/.github/workflows/unit_test_logging.yml b/.github/workflows/unit_test_logging.yml
@@ -22,7 +22,12 @@ on:
         required: true
         default: true
         type: boolean
-
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
 permissions:
     contents: read
 

diff --git a/.github/workflows/unit_test_predictions.yml b/.github/workflows/unit_test_predictions.yml
@@ -22,7 +22,12 @@ on:
         required: true
         default: true
         type: boolean
-
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
 permissions:
     contents: read
 

diff --git a/.github/workflows/unit_test_push_notifications.yml b/.github/workflows/unit_test_push_notifications.yml
@@ -22,7 +22,12 @@ on:
         required: true
         default: true
         type: boolean
-
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
 permissions:
     contents: read
 

diff --git a/.github/workflows/unit_test_storage.yml b/.github/workflows/unit_test_storage.yml
@@ -22,7 +22,12 @@ on:
         required: true
         default: true
         type: boolean
-
+      visionos:
+        description: 'ᯅ visionOS'
+        required: true
+        default: true
+        type: boolean 
+
 permissions:
     contents: read
 

diff --git a/Amplify/Categories/Auth/AuthCategory+ClientBehavior.swift b/Amplify/Categories/Auth/AuthCategory+ClientBehavior.swift
@@ -36,7 +36,7 @@ extension AuthCategory: AuthCategoryBehavior {
         return try await plugin.signIn(username: username, password: password, options: options)
     }
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
     public func signInWithWebUI(
         presentationAnchor: AuthUIPresentationAnchor? = nil,
         options: AuthWebUISignInRequest.Options? = nil) async throws -> AuthSignInResult {

diff --git a/Amplify/Categories/Auth/AuthCategoryBehavior.swift b/Amplify/Categories/Auth/AuthCategoryBehavior.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import AuthenticationServices
 public typealias AuthUIPresentationAnchor = ASPresentationAnchor
 #endif
@@ -66,7 +66,7 @@ public protocol AuthCategoryBehavior: AuthCategoryUserBehavior, AuthCategoryDevi
                 password: String?,
                 options: AuthSignInRequest.Options?) async throws -> AuthSignInResult
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
     /// SignIn using pre configured web UI.
     ///
     /// Calling this method will always launch the Auth plugin's default web user interface

diff --git a/Amplify/Categories/Auth/Request/AuthSignOutRequest.swift b/Amplify/Categories/Auth/Request/AuthSignOutRequest.swift
@@ -32,7 +32,7 @@ public extension AuthSignOutRequest {
         /// SignOut the user from all devices. Check the plugin specific definition on what global signOut means.
         public let globalSignOut: Bool
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
         /// Provide a presentation anchor if you have signedIn using `signInWithWebUI`. The signOut webUI will be presented
         /// in the presentation anchor provided.
         public let presentationAnchorForWebUI: AuthUIPresentationAnchor?
@@ -54,7 +54,7 @@ public extension AuthSignOutRequest {
 
 }
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 extension AuthSignOutRequest.Options {
     public static func presentationAnchor(_ anchor: AuthUIPresentationAnchor) -> AuthSignOutRequest.Options {
         return AuthSignOutRequest.Options(presentationAnchor: anchor)

diff --git a/Amplify/Categories/Auth/Request/AuthWebUISignInRequest.swift b/Amplify/Categories/Auth/Request/AuthWebUISignInRequest.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import Foundation
 
 /// Request to initiate sign in using a web UI.

diff --git a/Amplify/Core/Configuration/Internal/Amplify+Reset.swift b/Amplify/Core/Configuration/Internal/Amplify+Reset.swift
@@ -51,8 +51,8 @@ extension Amplify {
         ModelListDecoderRegistry.reset()
         ModelProviderRegistry.reset()
         log.verbose("Resetting ModelRegistry, ModelListDecoderRegistry, ModelProviderRegistry finished")
-
-#if os(iOS)
+        
+#if os(iOS) && !os(visionOS)
         await MainActor.run {
             devMenu = nil
         }

diff --git a/Amplify/Core/Support/DeviceInfo.swift b/Amplify/Core/Support/DeviceInfo.swift
@@ -118,7 +118,9 @@ public struct DeviceInfo {
     ///
     /// - Tag: DeviceInfo.screenBounds
     public var screenBounds: CGRect {
-    #if canImport(WatchKit)
+    #if os(visionOS)
+        .zero
+    #elseif canImport(WatchKit)
         .zero
     #elseif canImport(UIKit)
         UIScreen.main.nativeBounds