feat: visionOS support

.circleci/config.yml

@@ -15,6 +15,9 @@ parameters:
   watchos-destination:
     type: string
     default: platform=watchOS Simulator,name=Apple Watch Series 8 (45mm),OS=latest
+  visionos-destination:
+    type: string
+    default: name=Apple Vision Pro
 
 orbs:
   aws-cli: circleci/[email protected]
@@ -178,6 +181,17 @@ jobs:
       - 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
+  build_amplify_visionos_spm:
+    <<: *defaults
+    macos:
+      xcode: '15.0.0'
+    steps:
+      - shallow_checkout
+      - make_artifacts_directory
+      - run:
+          name: Build amplify for visionOS SPM
+          command: xcodebuild build -scheme Amplify-Package -sdk xros1.0 -destination "<< pipeline.parameters.visionos-destination >>" | tee "artifacts/build-Ampify-for-visionos-SPM.log" | xcpretty
+
 
   unit_test:
     <<: *defaults
@@ -284,6 +298,7 @@ deploy_requires: &deploy_requires
     - build_amplify_macos_spm
     - build_amplify_tvos_spm
     - build_amplify_watchos_spm
+    - build_amplify_visionos_spm
     - ios_unit_test_amplify
     - ios_unit_test_awspluginscore
     - ios_unit_test_analytics
@@ -328,6 +343,17 @@ deploy_requires: &deploy_requires
     - watchos_unit_test_push_notifications
     - watchos_unit_test_storage
     - watchos_unit_test_predictions
+    - visionos_unit_test_amplify
+    - visionos_unit_test_awspluginscore
+    - visionos_unit_test_analytics
+    - visionos_unit_test_api
+    - visionos_unit_test_auth
+    - visionos_unit_test_datastore
+    - visionos_unit_test_geo
+    - visionos_unit_test_push_notifications
+    - visionos_unit_test_internal_pinpoint
+    - visionos_unit_test_storage
+    - visionos_unit_test_predictions
     - fortify_scan
 
 workflows:
@@ -351,6 +377,9 @@ workflows:
       - build_amplify_watchos_spm:
           requires:
             - fortify_scan
+      - build_amplify_visionos_spm:
+          requires:
+            - fortify_scan
       - unit_test:
           name: ios_unit_test_amplify
           scheme: Amplify
@@ -681,6 +710,94 @@ workflows:
           xcode-version: '14.3.0'
           requires:
             - build_amplify_watchos_spm
+      - unit_test:
+          name: visionos_unit_test_amplify
+          scheme: Amplify
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_awspluginscore
+          scheme: AWSPluginsCore
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_analytics
+          scheme: AWSPinpointAnalyticsPlugin
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_api
+          scheme: AWSAPIPlugin
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_auth
+          scheme: AWSCognitoAuthPlugin
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_datastore
+          scheme: AWSDataStorePlugin
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_geo
+          scheme: AWSLocationGeoPlugin
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_internal_pinpoint
+          scheme: InternalAWSPinpointUnitTests
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_push_notifications
+          scheme: AWSPinpointPushNotificationsPlugin
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_storage
+          scheme: AWSS3StoragePlugin
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
+      - unit_test:
+          name: visionos_unit_test_predictions
+          scheme: AWSPredictionsPlugin
+          sdk: xros1.0
+          destination: << pipeline.parameters.visionos-destination >>
+          xcode-version: '15.0.0'
+          requires:
+            - build_amplify_visionos_spm
       - deploy:
           name: deploy unstable
           <<: *deploy_requires

.swiftpm/xcode/xcshareddata/xcschemes/AWSAPIPlugin.xcscheme

@@ -49,6 +49,9 @@
                ReferencedContainer = "container:">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "AWSRESTOperationTests/testGetReturnsOperation()">
+               </Test>
                <Test
                   Identifier = "AWSRESTOperationTests/testRESTOperationConstructURLFailure()">
                </Test>

.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme

@@ -517,6 +517,9 @@
                ReferencedContainer = "container:">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "ModelCompareTests/testTodosAreEqualWithSameEmbeddedableCollection()">
+               </Test>
                <Test
                   Identifier = "MutationEventExtensionsTest">
                </Test>
@@ -561,6 +564,11 @@
                BlueprintName = "AmplifyTests"
                ReferencedContainer = "container:">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "ModelCodableTests/testToJSON()">
+               </Test>
+            </SkippedTests>
          </TestableReference>
          <TestableReference
             skipped = "NO">

.swiftpm/xcode/xcshareddata/xcschemes/Amplify.xcscheme

@@ -67,6 +67,9 @@
                <Test
                   Identifier = "DataStoreCategoryConfigurationTests/testPreconditionFailureInvokingWithMultiplePlugins()">
                </Test>
+               <Test
+                  Identifier = "ModelCodableTests/testToJSON()">
+               </Test>
                <Test
                   Identifier = "StorageCategoryConfigurationTests">
                </Test>

Amplify/Core/Configuration/Internal/Amplify+Reset.swift

@@ -52,7 +52,7 @@ extension Amplify {
         ModelProviderRegistry.reset()
         log.verbose("Resetting ModelRegistry, ModelListDecoderRegistry, ModelProviderRegistry finished")
 
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
         await MainActor.run {
             devMenu = nil
         }

Amplify/Core/Support/DeviceInfo.swift

@@ -117,7 +117,9 @@ public struct DeviceInfo {
     ///
     /// - Tag: DeviceInfo.screenBounds
     public var screenBounds: CGRect {
-    #if canImport(WatchKit)
+    #if os(xrOS)
+        .zero
+    #elseif canImport(WatchKit)
         .zero
     #elseif canImport(UIKit)
         UIScreen.main.nativeBounds

Amplify/DevMenu/Amplify+DevMenu.swift

@@ -9,7 +9,7 @@ import Foundation
 
 /// Extension of `Amplify` for supporting Developer Menu feature
 extension Amplify {
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
     static var devMenu: AmplifyDevMenu?
 
     @MainActor
@@ -30,7 +30,7 @@ extension Amplify {
 
     /// Returns a `PersistentLoggingPlugin` if developer menu feature is enabled in debug mode
     static func getLoggingCategoryPlugin(loggingPlugin: LoggingCategoryPlugin) -> LoggingCategoryPlugin {
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
 #if DEBUG
         if isDevMenuEnabled() {
             return PersistentLoggingPlugin(plugin: loggingPlugin)

Amplify/DevMenu/AmplifyDevMenu.swift

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
 import Foundation
 import SwiftUI
 import UIKit

Amplify/DevMenu/View/DetailViewFactory.swift

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
 import SwiftUI
 
 /// A factory to create detail views based on `DevMenuItemType`

Amplify/DevMenu/View/DevMenuList.swift

@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
 import SwiftUI
 
 /// View containing a list of developer menu items

Amplify/DevMenu/View/IssueReporter.swift

@@ -6,14 +6,14 @@
 //
 
 import SwiftUI
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
 import UIKit
 #elseif canImport(AppKit)
 import AppKit
 #endif
 
 /// Issue report screen in developer menu
-#if os(iOS)
+#if os(iOS) && !os(xrOS)
 struct IssueReporter: View {
     @State var issueDescription: String = ""
     @State var includeLogs = true

AmplifyPlugins/API/Sources/AWSAPIPlugin/AWSAPIPluginsCore.swift

@@ -18,7 +18,7 @@ import AWSClientRuntime
 // Things that came directly from AWSCore or depended on something from AWSCore
 // TODO: Consolidate this to AWSPluginsCore for all other plugins to use.
 struct AWSAPIPluginsCore {
-    static let version = "1.16.1"
+    static let version = "visionos-preview-0.0.1"
 
     static var platformMapping: [Platform: String] = [:]