fix: swift 6 warnings

Amplify/Amplify.swift

@@ -20,44 +20,83 @@
 /// available at initialization.
 ///
 /// - Tag: Amplify
-public class Amplify {
+public class Amplify: @unchecked Sendable {
 
     /// If `true`, `configure()` has already been invoked, and subsequent calls to `configure` will throw a
     /// ConfigurationError.amplifyAlreadyConfigured error.
     ///
     /// - Tag: Amplify.isConfigured
-    static var isConfigured = false
+    private static let isConfiguredAtomic = AtomicValue<Bool>(initialValue: false)
+    static var isConfigured: Bool {
+        get { isConfiguredAtomic.get() }
+        set { isConfiguredAtomic.set(newValue) }
+    }
 
     // Storage for the categories themselves, which will be instantiated during configuration, and cleared during reset.
-    // It is not supported to mutate these category properties. They are `var` to support the `reset()` method for
-    // ease of testing.
+    // All category properties are protected with AtomicValue for thread safety.
 
     /// - Tag: Amplify.Analytics
-    public static internal(set) var Analytics = AnalyticsCategory()
+    private static let analyticsAtomic = AtomicValue<AnalyticsCategory>(initialValue: AnalyticsCategory())
+    public static internal(set) var Analytics: AnalyticsCategory {
+        get { analyticsAtomic.get() }
+        set { analyticsAtomic.set(newValue) }
+    }
 
     /// - Tag: Amplify.API
-    public static internal(set) var API: APICategory = APICategory()
+    private static let apiAtomic = AtomicValue<APICategory>(initialValue: APICategory())
+    public static internal(set) var API: APICategory {
+        get { apiAtomic.get() }
+        set { apiAtomic.set(newValue) }
+    }
 
     /// - Tag: Amplify.Auth
-    public static internal(set) var Auth = AuthCategory()
+    private static let authAtomic = AtomicValue<AuthCategory>(initialValue: AuthCategory())
+    public static internal(set) var Auth: AuthCategory {
+        get { authAtomic.get() }
+        set { authAtomic.set(newValue) }
+    }
 
     /// - Tag: Amplify.DataStore
-    public static internal(set) var DataStore = DataStoreCategory()
+    private static let dataStoreAtomic = AtomicValue<DataStoreCategory>(initialValue: DataStoreCategory())
+    public static internal(set) var DataStore: DataStoreCategory {
+        get { dataStoreAtomic.get() }
+        set { dataStoreAtomic.set(newValue) }
+    }
 
     /// - Tag: Amplify.Geo
-    public static internal(set) var Geo = GeoCategory()
+    private static let geoAtomic = AtomicValue<GeoCategory>(initialValue: GeoCategory())
+    public static internal(set) var Geo: GeoCategory {
+        get { geoAtomic.get() }
+        set { geoAtomic.set(newValue) }
+    }
 
     /// - Tag: Amplify.Hub
-    public static internal(set) var Hub = HubCategory()
+    private static let hubAtomic = AtomicValue<HubCategory>(initialValue: HubCategory())
+    public static internal(set) var Hub: HubCategory {
+        get { hubAtomic.get() }
+        set { hubAtomic.set(newValue) }
+    }
 
     /// - Tag: Amplify.Notifications
-    public static internal(set) var Notifications = NotificationsCategory()
+    private static let notificationsAtomic = AtomicValue<NotificationsCategory>(initialValue: NotificationsCategory())
+    public static internal(set) var Notifications: NotificationsCategory {
+        get { notificationsAtomic.get() }
+        set { notificationsAtomic.set(newValue) }
+    }
 
     /// - Tag: Amplify.Predictions
-    public static internal(set) var Predictions = PredictionsCategory()
+    private static let predictionsAtomic = AtomicValue<PredictionsCategory>(initialValue: PredictionsCategory())
+    public static internal(set) var Predictions: PredictionsCategory {
+        get { predictionsAtomic.get() }
+        set { predictionsAtomic.set(newValue) }
+    }
 
     /// - Tag: Amplify.Storage
-    public static internal(set) var Storage = StorageCategory()
+    private static let storageAtomic = AtomicValue<StorageCategory>(initialValue: StorageCategory())
+    public static internal(set) var Storage: StorageCategory {
+        get { storageAtomic.get() }
+        set { storageAtomic.set(newValue) }
+    }
 
     /// Special case category. We protect this with an AtomicValue because it is used by reset()
     /// methods during setup & teardown of tests
@@ -79,7 +118,7 @@
     ///
     /// - Parameter plugin: The plugin to add
     /// - Tag: Amplify.add_plugin
     public static func add<P: Plugin>(plugin: P) throws {
         log.debug("Adding plugin: \(plugin))")
         switch plugin {
         case let plugin as AnalyticsCategoryPlugin:

Amplify/Categories/Auth/AuthCategory+UserBehavior.swift

@@ -9,7 +9,10 @@ import Foundation
 
 extension AuthCategory: AuthCategoryUserBehavior {
 
-    public func getCurrentUser() async throws -> AuthUser {
+    /// Retrieve the current logged in user
+    ///
+    /// - Returns: Current logged in user
+    public func getCurrentUser() async throws -> any AuthUser {
         try await plugin.getCurrentUser()
     }
 

Amplify/Categories/Auth/AuthCategoryUserBehavior.swift

@@ -9,9 +9,10 @@ import Foundation
 
 public protocol AuthCategoryUserBehavior: AnyObject {
 
-    /// Returns the currently logged in user.
+    /// Retrieve the current logged in user
     ///
-    func getCurrentUser() async throws -> AuthUser
+    /// - Returns: Current logged in user
+    func getCurrentUser() async throws -> any AuthUser
 
     /// Fetch user attributes for the current user.
     ///

Amplify/Categories/Auth/Models/AuthCodeDeliveryDetails.swift

@@ -26,3 +26,5 @@ public struct AuthCodeDeliveryDetails {
 }
 
 extension AuthCodeDeliveryDetails: Equatable {}
+
+extension AuthCodeDeliveryDetails: Sendable {}

Amplify/Categories/Auth/Models/AuthDevice.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// Device used by the user to sign in
-public protocol AuthDevice {
+public protocol AuthDevice: Sendable {
 
     /// Device id
     var id: String { get }

Amplify/Categories/Auth/Models/AuthFactorType.swift

@@ -25,3 +25,5 @@ public enum AuthFactorType: String {
     case webAuthn
 #endif
 }
+
+extension AuthFactorType: Sendable { }

Amplify/Categories/Auth/Models/AuthSession.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// Defines the auth session behavior
-public protocol AuthSession {
+public protocol AuthSession: Sendable {
 
     /// True if the current user has signed in
     ///

Amplify/Categories/Auth/Models/AuthSignInStep.swift

@@ -77,3 +77,5 @@ public enum AuthSignInStep {
 }
 
 extension AuthSignInStep: Equatable { }
+
+extension AuthSignInStep: Sendable { }

Amplify/Categories/Auth/Models/AuthSignUpStep.swift

@@ -24,3 +24,5 @@ public enum AuthSignUpStep {
     /// Sign up is complete
     case done
 }
+
+extension AuthSignUpStep: Sendable { }

Amplify/Categories/Auth/Models/AuthUpdateAttributeStep.swift

@@ -18,3 +18,5 @@ public enum AuthUpdateAttributeStep {
     /// Update Attribute step is `done` when the update attribute flow is complete.
     case done
 }
+
+extension AuthUpdateAttributeStep: Sendable { }

Amplify/Categories/Auth/Models/AuthUser.swift

@@ -6,7 +6,7 @@
 //
 
 /// Defines the protocol for an auth user
-public protocol AuthUser {
+public protocol AuthUser: Sendable {
 
     /// User name of the auth user
     var username: String { get }

Amplify/Categories/Auth/Models/AuthUserAttribute.swift

@@ -90,3 +90,7 @@ public enum AuthUserAttributeKey {
 extension AuthUserAttributeKey: Hashable {}
 
 extension AuthUserAttributeKey: Equatable {}
+
+extension AuthUserAttributeKey: Sendable {}
+
+extension AuthUserAttribute: Sendable {}

Amplify/Categories/Auth/Models/AuthWebAuthnCredential.swift

@@ -35,9 +35,11 @@ public struct AuthListWebAuthnCredentialsResult {
     }
 }
 
+extension AuthListWebAuthnCredentialsResult: Sendable { }
+
 /// Defines a WebAuthn credential
 /// - Tag: AuthWebAuthnCredential
-public protocol AuthWebAuthnCredential {
+public protocol AuthWebAuthnCredential: Sendable {
     /// The credential's ID
     var credentialId: String { get }
 

Amplify/Categories/Auth/Models/DeliveryDestination.swift

@@ -24,3 +24,5 @@ public enum DeliveryDestination {
 }
 
 extension DeliveryDestination: Equatable { }
+
+extension DeliveryDestination: Sendable { }

Amplify/Categories/Auth/Models/MFAType.swift

@@ -16,3 +16,5 @@ public enum MFAType: String {
     /// Email Service linked with an email
     case email
 }
+
+extension MFAType: Sendable { }

Amplify/Categories/Auth/Models/TOTPSetupDetails.swift

@@ -42,3 +42,5 @@ public struct TOTPSetupDetails {
 }
 
 extension TOTPSetupDetails: Equatable { }
+
+extension TOTPSetupDetails: Sendable { }

Amplify/Categories/Auth/Request/AuthAssociateWebAuthnCredentialRequest.swift

@@ -37,4 +37,6 @@ public extension AuthAssociateWebAuthnCredentialRequest {
         }
     }
 }
+
+extension AuthAssociateWebAuthnCredentialRequest.Options: @unchecked Sendable { }
 #endif

Amplify/Categories/Auth/Request/AuthAttributeResendConfirmationCodeRequest.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
 // swiftlint:disable type_name
 
 /// Request for resending confirmation code that was generated for update attribute
 public struct AuthAttributeResendConfirmationCodeRequest: AmplifyOperationRequest {
@@ -39,3 +39,5 @@
         }
     }
 }
+
+extension AuthAttributeResendConfirmationCodeRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthAttributeSendVerificationCodeRequest.swift

@@ -39,3 +39,5 @@ public extension AuthSendUserAttributeVerificationCodeRequest {
         }
     }
 }
+
+extension AuthSendUserAttributeVerificationCodeRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthAutoSignInRequest.swift

@@ -32,3 +32,5 @@ public extension AuthAutoSignInRequest {
         }
     }
 }
+
+extension AuthAutoSignInRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthChangePasswordRequest.swift

@@ -42,3 +42,5 @@ public extension AuthChangePasswordRequest {
         }
     }
 }
+
+extension AuthChangePasswordRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthConfirmResetPasswordRequest.swift

@@ -47,3 +47,5 @@ public extension AuthConfirmResetPasswordRequest {
         }
     }
 }
+
+extension AuthConfirmResetPasswordRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthConfirmSignInRequest.swift

@@ -52,3 +52,5 @@ public extension AuthConfirmSignInRequest {
 #endif
     }
 }
+
+extension AuthConfirmSignInRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthConfirmSignUpRequest.swift

@@ -40,3 +40,5 @@ public extension AuthConfirmSignUpRequest {
         }
     }
 }
+
+extension AuthConfirmSignUpRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthConfirmUserAttributeRequest.swift

@@ -42,3 +42,5 @@ public extension AuthConfirmUserAttributeRequest {
         }
     }
 }
+
+extension AuthConfirmUserAttributeRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthDeleteWebAuthnCredentialRequest.swift

@@ -36,3 +36,5 @@ public extension AuthDeleteWebAuthnCredentialRequest {
         }
     }
 }
+
+extension AuthDeleteWebAuthnCredentialRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthFetchDevicesRequest.swift

@@ -32,3 +32,5 @@ public extension AuthFetchDevicesRequest {
         }
     }
 }
+
+extension AuthFetchDevicesRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthFetchSessionRequest.swift

@@ -42,6 +42,8 @@ public extension AuthFetchSessionRequest {
     }
 }
 
+extension AuthFetchSessionRequest.Options: @unchecked Sendable { }
+
 extension AuthFetchSessionRequest.Options {
     public static func forceRefresh() -> AuthFetchSessionRequest.Options {
         return AuthFetchSessionRequest.Options(forceRefresh: true)

Amplify/Categories/Auth/Request/AuthFetchUserAttributesRequest.swift

@@ -32,3 +32,5 @@ public extension AuthFetchUserAttributesRequest {
         }
     }
 }
+
+extension AuthFetchUserAttributesRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthForgetDeviceRequest.swift

@@ -39,3 +39,5 @@ public extension AuthForgetDeviceRequest {
         }
     }
 }
+
+extension AuthForgetDeviceRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthListWebAuthnCredentialsRequest.swift

@@ -60,3 +60,5 @@ public extension AuthListWebAuthnCredentialsRequest {
         }
     }
 }
+
+extension AuthListWebAuthnCredentialsRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthRememberDeviceRequest.swift

@@ -32,3 +32,5 @@ public extension AuthRememberDeviceRequest {
         }
     }
 }
+
+extension AuthRememberDeviceRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthResendSignUpCodeRequest.swift

@@ -36,3 +36,5 @@ public extension AuthResendSignUpCodeRequest {
         }
     }
 }
+
+extension AuthResendSignUpCodeRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthResetPasswordRequest.swift

@@ -36,3 +36,5 @@ public extension AuthResetPasswordRequest {
         }
     }
 }
+
+extension AuthResetPasswordRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthSignInRequest.swift

@@ -54,3 +54,5 @@ public extension AuthSignInRequest {
 #endif
     }
 }
+
+extension AuthSignInRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthSignOutRequest.swift

@@ -54,6 +54,8 @@ public extension AuthSignOutRequest {
 
 }
 
+extension AuthSignOutRequest.Options: @unchecked Sendable { }
+
 #if os(iOS) || os(macOS) || os(visionOS)
 extension AuthSignOutRequest.Options {
     public static func presentationAnchor(_ anchor: AuthUIPresentationAnchor) -> AuthSignOutRequest.Options {

Amplify/Categories/Auth/Request/AuthSignUpRequest.swift

@@ -45,3 +45,5 @@ public extension AuthSignUpRequest {
         }
     }
 }
+
+extension AuthSignUpRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthUpdateUserAttributeRequest.swift

@@ -37,3 +37,5 @@ public extension AuthUpdateUserAttributeRequest {
         }
     }
 }
+
+extension AuthUpdateUserAttributeRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthUpdateUserAttributesRequest.swift

@@ -37,3 +37,5 @@ public extension AuthUpdateUserAttributesRequest {
         }
     }
 }
+
+extension AuthUpdateUserAttributesRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Request/AuthWebUISignInRequest.swift

@@ -50,4 +50,6 @@ public extension AuthWebUISignInRequest {
         }
     }
 }
+
+extension AuthWebUISignInRequest.Options: @unchecked Sendable { }
 #endif

Amplify/Categories/Auth/Request/VerifyTOTPSetupRequest.swift

@@ -38,3 +38,5 @@ public extension VerifyTOTPSetupRequest {
         }
     }
 }
+
+extension VerifyTOTPSetupRequest.Options: @unchecked Sendable { }

Amplify/Categories/Auth/Result/AuthResetPasswordResult.swift

@@ -26,6 +26,8 @@ public struct AuthResetPasswordResult {
 
 extension AuthResetPasswordResult: Equatable {}
 
+extension AuthResetPasswordResult: Sendable {}
+
 /// The next step in Auth.resetPassword api
 public enum AuthResetPasswordStep {
 
@@ -42,3 +44,5 @@ public enum AuthResetPasswordStep {
 }
 
 extension AuthResetPasswordStep: Equatable {}
+
+extension AuthResetPasswordStep: Sendable {}

Amplify/Categories/Auth/Result/AuthSignInResult.swift

@@ -30,3 +30,5 @@ public struct AuthSignInResult {
         self.nextStep = nextStep
     }
 }
+
+extension AuthSignInResult: Sendable { }