fix: add @unchecked Sendable annotations for warnings

thisisabhash · thisisabhash · commit 83d191c1286a · 2025-07-31T10:04:25.000-07:00
diff --git a/Amplify/Categories/API/Operation/GraphQLOperation.swift b/Amplify/Categories/API/Operation/GraphQLOperation.swift
@@ -10,15 +10,15 @@ open class GraphQLOperation<R: Decodable>: AmplifyOperation<
     GraphQLOperationRequest<R>,
     GraphQLResponse<R>,
     APIError
-> { }
+>, @unchecked Sendable { }
 
 /// GraphQL Subscription Operation
 open class GraphQLSubscriptionOperation<R: Decodable>: AmplifyInProcessReportingOperation<
     GraphQLOperationRequest<R>,
     GraphQLSubscriptionEvent<R>,
     Void,
     APIError
-> { }
+>, @unchecked Sendable { }
 
 public extension HubPayload.EventName.API {
     /// eventName for HubPayloads emitted by this operation
diff --git a/Amplify/Categories/API/Response/SubscriptionEvent.swift b/Amplify/Categories/API/Response/SubscriptionEvent.swift
@@ -6,7 +6,7 @@
 //
 
 /// Event for subscription
-public enum GraphQLSubscriptionEvent<T: Decodable> {
+public enum GraphQLSubscriptionEvent<T> where T:Decodable, T:Sendable {
     /// The subscription's connection state has changed.
     case connection(SubscriptionConnectionState)
 
diff --git a/Amplify/Categories/DataStore/Subscribe/DataStoreQuerySnapshot.swift b/Amplify/Categories/DataStore/Subscribe/DataStoreQuerySnapshot.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /// A snapshot of the items from DataStore, the changes since last snapshot, and whether this model has
 /// finished syncing and subscriptions are active
-public struct DataStoreQuerySnapshot<M: Model> {
+public struct DataStoreQuerySnapshot<M> where M:Model, M:Sendable {
 
     /// All model instances from the local store
     public let items: [M]
@@ -22,5 +22,3 @@ public struct DataStoreQuerySnapshot<M: Model> {
         self.isSynced = isSynced
     }
 }
-
-extension DataStoreQuerySnapshot: Sendable { }
diff --git a/Amplify/Core/Support/AmplifyInProcessReportingOperation.swift b/Amplify/Core/Support/AmplifyInProcessReportingOperation.swift
@@ -22,7 +22,7 @@ open class AmplifyInProcessReportingOperation<
     InProcess,
     Success,
     Failure: AmplifyError
->: AmplifyOperation<Request, Success, Failure> {
+>: AmplifyOperation<Request, Success, Failure>, @unchecked Sendable {
     public typealias InProcess = InProcess
 
     var inProcessListenerUnsubscribeToken: UnsubscribeToken?
diff --git a/Amplify/Core/Support/AmplifyOperation.swift b/Amplify/Core/Support/AmplifyOperation.swift
@@ -16,7 +16,7 @@ import Foundation
 /// implementation of a `dispatch` method that sends a contextualized payload to the Hub.
 ///
 /// Pausable/resumable tasks that do not require Hub dispatching should use AsynchronousOperation instead.
-open class AmplifyOperation<Request: AmplifyOperationRequest, Success, Failure: AmplifyError>: AsynchronousOperation {
+open class AmplifyOperation<Request: AmplifyOperationRequest, Success, Failure: AmplifyError>: AsynchronousOperation, @unchecked Sendable {
 
     /// The concrete Request associated with this operation
     public typealias Request = Request
diff --git a/Amplify/Core/Support/AsychronousOperation.swift b/Amplify/Core/Support/AsychronousOperation.swift
@@ -12,7 +12,7 @@ import Foundation
 /// from the OperationQueue after it has completed all its work. This class is not inherently thread safe. Although it
 /// is a subclass of Foundation's Operation, it contains private state to support pausing, resuming, and finishing, that
 /// must be managed by callers.
-open class AsynchronousOperation: Operation {
+open class AsynchronousOperation: Operation, @unchecked Sendable {
 
     /// State for this operation.
     @objc private enum OperationState: Int {
diff --git a/Amplify/DefaultPlugins/AWSHubPlugin/Internal/HubChannelDispatcher.swift b/Amplify/DefaultPlugins/AWSHubPlugin/Internal/HubChannelDispatcher.swift
@@ -85,7 +85,7 @@ protocol HubDispatchOperationDelegate: AnyObject {
     var listeners: [FilteredListener] { get }
 }
 
-final class HubDispatchOperation: Operation {
+final class HubDispatchOperation: Operation, @unchecked Sendable {
 
     private static let thresholdForConcurrentPerform = 500
 
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLOperation.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLOperation.swift
@@ -9,7 +9,7 @@ import Amplify
 import AWSPluginsCore
 import Foundation
 
-final public class AWSGraphQLOperation<R: Decodable>: GraphQLOperation<R> {
+final public class AWSGraphQLOperation<R: Decodable>: GraphQLOperation<R>, @unchecked Sendable {
 
     let session: URLSessionBehavior
     let mapper: OperationTaskMapper
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift
@@ -183,7 +183,7 @@ public class AWSGraphQLSubscriptionTaskRunner<R: Decodable>: InternalTaskRunner,
 }
 
 // Class is still necessary. See https://github.com/aws-amplify/amplify-swift/issues/2252
-final public class AWSGraphQLSubscriptionOperation<R: Decodable>: GraphQLSubscriptionOperation<R> {
+final public class AWSGraphQLSubscriptionOperation<R: Decodable>: GraphQLSubscriptionOperation<R>, @unchecked Sendable {
 
     let pluginConfig: AWSAPICategoryPluginConfiguration
     let appSyncRealTimeClientFactory: AppSyncRealTimeClientFactoryProtocol
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSHTTPURLResponse.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSHTTPURLResponse.swift
@@ -23,7 +23,7 @@ import Foundation
 /// **Note**: The class inheritance to `HTTPURLResponse` is to provide above mechanism, and actual
 /// implementation acts as a facade that stores an instance of `HTTPURLResponse` that delegates overidden methods to
 /// this stored property.
-public class AWSHTTPURLResponse: HTTPURLResponse {
+public class AWSHTTPURLResponse: HTTPURLResponse, @unchecked Sendable {
 
     /// The body of the response, if available
     public let body: Data?
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSRESTOperation.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSRESTOperation.swift
@@ -12,7 +12,7 @@ final public class AWSRESTOperation: AmplifyOperation<
     RESTOperationRequest,
     Data,
     APIError
->, RESTOperation {
+>, RESTOperation, @unchecked Sendable {
 
     // Data received by the operation
     var data = Data()
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/AWSAuthCognitoSession.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/AWSAuthCognitoSession.swift
@@ -6,7 +6,7 @@
 //
 
 import Amplify
-import AWSPluginsCore
+@preconcurrency import AWSPluginsCore
 import Foundation
 
 public struct AWSAuthCognitoSession: AuthSession,
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/FederateToIdentityPoolResult.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/FederateToIdentityPoolResult.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import AWSPluginsCore
+@preconcurrency import AWSPluginsCore
 import Foundation
 
 public struct FederateToIdentityPoolResult {
diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/CascadeDeleteOperation.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/CascadeDeleteOperation.swift
@@ -21,7 +21,7 @@ import Combine
 /// 3. Delete the original queried items from local store. This performs a cascade delete by default (See
 ///    **CreateTableStatement** for more details, `on delete cascade` when creating the SQL table enables this behavior).
 ///    4. If sync is enabled, then submit the delete mutations to the sync engine, in the order of children to parent models.
-public class CascadeDeleteOperation<M: Model>: AsynchronousOperation {
+public class CascadeDeleteOperation<M: Model>: AsynchronousOperation, @unchecked Sendable {
     let storageAdapter: StorageEngineAdapter
     var syncEngine: RemoteSyncEngineBehavior?
     let modelType: M.Type
diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/InitialSync/InitialSyncOperation.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/InitialSync/InitialSyncOperation.swift
@@ -10,7 +10,7 @@ import AWSPluginsCore
 import Combine
 import Foundation
 
-final class InitialSyncOperation: AsynchronousOperation {
+final class InitialSyncOperation: AsynchronousOperation, @unchecked Sendable {
     typealias SyncQueryResult = PaginatedList<AnyModel>
 
     private weak var api: APICategoryGraphQLBehavior?
diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/OutgoingMutationQueue/ProcessMutationErrorFromCloudOperation.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/OutgoingMutationQueue/ProcessMutationErrorFromCloudOperation.swift
@@ -15,7 +15,7 @@ import AWSPluginsCore
 /// 1. When there is an APIError which is for an unauthenticated user, call the error handler.
 /// 2. When there is a "conditional request failed" error, then emit to the Hub a 'conditionalSaveFailed' event.
 /// 3. When there is a "conflict unahandled" error, trigger the conflict handler and reconcile the state of the system.
-class ProcessMutationErrorFromCloudOperation: AsynchronousOperation {
+class ProcessMutationErrorFromCloudOperation: AsynchronousOperation, @unchecked Sendable {
 
     typealias MutationSyncAPIRequest = GraphQLRequest<MutationSyncResult>
     typealias MutationSyncCloudResult = GraphQLOperation<MutationSync<AnyModel>>.OperationResult
diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/OutgoingMutationQueue/SyncMutationToCloudOperation.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/OutgoingMutationQueue/SyncMutationToCloudOperation.swift
@@ -13,7 +13,7 @@ import AWSPluginsCore
 /// Publishes a mutation event to the specified Cloud API. Upon receipt of the API response, validates to ensure it is
 /// not a retriable error. If it is, attempts a retry until either success or terminal failure. Upon success or
 /// terminal failure, publishes the event response to the appropriate ModelReconciliationQueue subject.
-class SyncMutationToCloudOperation: AsynchronousOperation {
+class SyncMutationToCloudOperation: AsynchronousOperation, @unchecked Sendable {
 
     typealias MutationSyncCloudResult = GraphQLOperation<MutationSync<AnyModel>>.OperationResult
 
diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/ReconcileAndLocalSaveOperation.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/SubscriptionSync/ReconcileAndLocalSave/ReconcileAndLocalSaveOperation.swift
@@ -13,7 +13,7 @@ import AWSPluginsCore
 // swiftlint:disable type_body_length file_length
 /// Reconciles an incoming model mutation with the stored model. If there is no conflict (e.g., the incoming model has
 /// a later version than the stored model), then write the new data to the store.
-class ReconcileAndLocalSaveOperation: AsynchronousOperation {
+class ReconcileAndLocalSaveOperation: AsynchronousOperation, @unchecked Sendable {
 
     /// Disambiguation for the version of the model incoming from the remote API
     typealias RemoteModel = MutationSync<AnyModel>
diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/Support/CancelAwareBlockOperation.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/Support/CancelAwareBlockOperation.swift
@@ -8,7 +8,7 @@
 import Amplify
 import Foundation
 
-final class CancelAwareBlockOperation: Operation {
+final class CancelAwareBlockOperation: Operation, @unchecked Sendable {
     private let block: BasicClosure
     init(block: @escaping BasicClosure) {
         self.block = block
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageDownloadDataOperation.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageDownloadDataOperation.swift
@@ -19,7 +19,7 @@ class AWSS3StorageDownloadDataOperation: AmplifyInProcessReportingOperation<
     Progress,
     Data,
     StorageError
->, StorageDownloadDataOperation {
+>, StorageDownloadDataOperation, @unchecked Sendable {
 
     let storageConfiguration: AWSS3StoragePluginConfiguration
     let storageServiceProvider: AWSS3StorageServiceProvider
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageDownloadFileOperation.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageDownloadFileOperation.swift
@@ -22,7 +22,7 @@ class AWSS3StorageDownloadFileOperation: AmplifyInProcessReportingOperation<
     Progress,
     Void,
     StorageError
->, StorageDownloadFileOperation {
+>, StorageDownloadFileOperation, @unchecked Sendable {
 
     let storageConfiguration: AWSS3StoragePluginConfiguration
     let storageServiceProvider: AWSS3StorageServiceProvider
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageRemoveOperation.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageRemoveOperation.swift
@@ -18,7 +18,7 @@ class AWSS3StorageRemoveOperation: AmplifyOperation<
     StorageRemoveRequest,
     String,
     StorageError
->, StorageRemoveOperation {
+>, StorageRemoveOperation, @unchecked Sendable {
 
     let storageConfiguration: AWSS3StoragePluginConfiguration
     let storageService: AWSS3StorageServiceBehavior
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageUploadDataOperation.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageUploadDataOperation.swift
@@ -19,7 +19,7 @@ class AWSS3StorageUploadDataOperation: AmplifyInProcessReportingOperation<
     Progress,
     String,
     StorageError
->, StorageUploadDataOperation {
+>, StorageUploadDataOperation, @unchecked Sendable {
 
     let storageConfiguration: AWSS3StoragePluginConfiguration
     let storageServiceProvider: AWSS3StorageServiceProvider
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageUploadFileOperation.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageUploadFileOperation.swift
@@ -19,7 +19,7 @@ class AWSS3StorageUploadFileOperation: AmplifyInProcessReportingOperation<
     Progress,
     String,
     StorageError
->, StorageUploadFileOperation {
+>, StorageUploadFileOperation, @unchecked Sendable {
 
     let storageConfiguration: AWSS3StoragePluginConfiguration
     let storageServiceProvider: AWSS3StorageServiceProvider
diff --git a/AmplifyTestCommon/Mocks/MockAPICategoryPlugin.swift b/AmplifyTestCommon/Mocks/MockAPICategoryPlugin.swift
@@ -274,7 +274,7 @@ class MockSecondAPICategoryPlugin: MockAPICategoryPlugin {
     }
 }
 
-class MockGraphQLOperation<R: Decodable>: GraphQLOperation<R> {
+class MockGraphQLOperation<R: Decodable>: GraphQLOperation<R>, @unchecked Sendable {
     override func pause() {
     }
 
@@ -289,7 +289,7 @@ class MockGraphQLOperation<R: Decodable>: GraphQLOperation<R> {
     }
 }
 
-class MockSubscriptionGraphQLOperation<R: Decodable>: GraphQLSubscriptionOperation<R> {
+class MockSubscriptionGraphQLOperation<R: Decodable>: GraphQLSubscriptionOperation<R>, @unchecked Sendable {
 
     override func pause() {
     }
@@ -305,7 +305,7 @@ class MockSubscriptionGraphQLOperation<R: Decodable>: GraphQLSubscriptionOperati
     }
 }
 
-class MockAPIOperation: AmplifyOperation<RESTOperationRequest, Data, APIError>, RESTOperation {
+class MockAPIOperation: AmplifyOperation<RESTOperationRequest, Data, APIError>, RESTOperation, @unchecked Sendable {
     override func pause() {
     }
 
diff --git a/AmplifyTestCommon/Mocks/MockStorageCategoryPlugin.swift b/AmplifyTestCommon/Mocks/MockStorageCategoryPlugin.swift
@@ -251,7 +251,7 @@ class MockSecondStorageCategoryPlugin: MockStorageCategoryPlugin {
 }
 
 class MockStorageGetURLOperation: AmplifyOperation<StorageGetURLRequest, URL, StorageError>,
-                                  StorageGetURLOperation {
+                                  StorageGetURLOperation, @unchecked Sendable {
     override func pause() {
     }
 
@@ -270,7 +270,7 @@ StorageDownloadDataRequest,
 Progress,
 Data,
 StorageError
->, StorageDownloadDataOperation {
+>, StorageDownloadDataOperation, @unchecked Sendable {
     override func pause() {
     }
 
@@ -289,7 +289,7 @@ StorageDownloadFileRequest,
 Progress,
 Void,
 StorageError
->, StorageDownloadFileOperation {
+>, StorageDownloadFileOperation, @unchecked Sendable {
     override func pause() {
     }
 
@@ -308,7 +308,7 @@ StorageUploadDataRequest,
 Progress,
 String,
 StorageError
->, StorageUploadDataOperation {
+>, StorageUploadDataOperation, @unchecked Sendable {
     override func pause() {
     }
 
@@ -327,7 +327,7 @@ StorageUploadFileRequest,
 Progress,
 String,
 StorageError
->, StorageUploadFileOperation {
+>, StorageUploadFileOperation, @unchecked Sendable {
     override func pause() {
     }
 
@@ -342,7 +342,7 @@ StorageError
 }
 
 class MockStorageRemoveOperation: AmplifyOperation<StorageRemoveRequest, String, StorageError>,
-                                  StorageRemoveOperation {
+                                  StorageRemoveOperation, @unchecked Sendable {
     override func pause() {
     }
 
@@ -357,7 +357,7 @@ class MockStorageRemoveOperation: AmplifyOperation<StorageRemoveRequest, String,
 }
 
 class MockStorageListOperation: AmplifyOperation<StorageListRequest, StorageListResult, StorageError>,
-                                StorageListOperation {
+                                StorageListOperation, @unchecked Sendable {
     override func pause() {
     }
 
diff --git a/Package.swift b/Package.swift

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import Foundation`
`9`	`9`
`10`	`10`	`/// A snapshot of the items from DataStore, the changes since last snapshot, and whether this model has`
`11`	`11`	`/// finished syncing and subscriptions are active`
`12`		`-public struct DataStoreQuerySnapshot<M: Model> {`
	`12`	`+public struct DataStoreQuerySnapshot<M> where M:Model, M:Sendable {`
`13`	`13`
`14`	`14`	`/// All model instances from the local store`
`15`	`15`	`public let items: [M]`
`@@ -22,5 +22,3 @@ public struct DataStoreQuerySnapshot<M: Model> {`
`22`	`22`	`self.isSynced = isSynced`
`23`	`23`	`}`
`24`	`24`	`}`
`25`		`-`
`26`		`-extension DataStoreQuerySnapshot: Sendable { }`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protocol HubDispatchOperationDelegate: AnyObject {`
`85`	`85`	`var listeners: [FilteredListener] { get }`
`86`	`86`	`}`
`87`	`87`
`88`		`-final class HubDispatchOperation: Operation {`
	`88`	`+final class HubDispatchOperation: Operation, @unchecked Sendable {`
`89`	`89`
`90`	`90`	`private static let thresholdForConcurrentPerform = 500`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public class AWSGraphQLSubscriptionTaskRunner<R: Decodable>: InternalTaskRunner,`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`// Class is still necessary. See https://github.com/aws-amplify/amplify-swift/issues/2252`
`186`		`-final public class AWSGraphQLSubscriptionOperation<R: Decodable>: GraphQLSubscriptionOperation<R> {`
	`186`	`+final public class AWSGraphQLSubscriptionOperation<R: Decodable>: GraphQLSubscriptionOperation<R>, @unchecked Sendable {`
`187`	`187`
`188`	`188`	`let pluginConfig: AWSAPICategoryPluginConfiguration`
`189`	`189`	`let appSyncRealTimeClientFactory: AppSyncRealTimeClientFactoryProtocol`