chore(DataStore): defines typealias for AmplifyCancellable (#1044)

Author: brennanMKE

Amplify/Core/Support/Cancellable.swift

@@ -10,3 +10,6 @@
 public protocol Cancellable {
     func cancel()
 }
+
+/// Unique name for Cancellable which handles a name conflict with the Combine framework.
+public typealias AmplifyCancellable = Cancellable

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/MutationSync/MutationEvent/MutationEventPublisher.swift

@@ -10,6 +10,6 @@ import Combine
 
 /// Publishes mutation events to downstream subscribers for subsequent sync to the API.
 @available(iOS 13.0, *)
-protocol MutationEventPublisher: class, Cancellable {
+protocol MutationEventPublisher: class, AmplifyCancellable {
     var publisher: AnyPublisher<MutationEvent, DataStoreError> { get }
 }

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/IncomingAsyncSubscriptionEventPublisher.swift

@@ -18,7 +18,7 @@ import Combine
 /// `GraphQLSubscriptionType` and holds a reference to the returned operation. The operations' listeners enqueue
 /// incoming successful events onto a `Publisher`, that queue processors can subscribe to.
 @available(iOS 13.0, *)
-final class IncomingAsyncSubscriptionEventPublisher: Cancellable {
+final class IncomingAsyncSubscriptionEventPublisher: AmplifyCancellable {
     typealias Payload = MutationSync<AnyModel>
     typealias Event = SubscriptionEvent<GraphQLResponse<Payload>>
 

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/IncomingAsyncSubscriptionEventToAnyModelMapper.swift

@@ -18,7 +18,7 @@ enum IncomingAsyncSubscriptionEvent {
 // swiftlint:disable type_name
 /// Subscribes to an IncomingSubscriptionAsyncEventQueue, and publishes AnyModel
 @available(iOS 13.0, *)
-final class IncomingAsyncSubscriptionEventToAnyModelMapper: Subscriber, Cancellable {
+final class IncomingAsyncSubscriptionEventToAnyModelMapper: Subscriber, AmplifyCancellable {
     // swiftlint:enable type_name
 
     typealias Input = IncomingAsyncSubscriptionEventPublisher.Event

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/IncomingEventReconciliationQueue.swift

@@ -22,7 +22,7 @@ enum IncomingEventReconciliationQueueEvent {
 /// automatically-configured subscriptions for models, the queue provides an `offer` method for submitting events
 /// directly from other network events such as mutation callbacks or from base/initial sync queries.
 @available(iOS 13.0, *)
-protocol IncomingEventReconciliationQueue: class, Cancellable {
+protocol IncomingEventReconciliationQueue: class, AmplifyCancellable {
     func start()
     func pause()
     func offer(_ remoteModel: MutationSync<AnyModel>, modelSchema: ModelSchema)

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/SubscriptionSync/IncomingSubscriptionEventPublisher.swift

@@ -15,6 +15,6 @@ enum IncomingSubscriptionEventPublisherEvent {
 }
 
 @available(iOS 13.0, *)
-protocol IncomingSubscriptionEventPublisher: Cancellable {
+protocol IncomingSubscriptionEventPublisher: AmplifyCancellable {
     var publisher: AnyPublisher<IncomingSubscriptionEventPublisherEvent, DataStoreError> { get }
 }

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/Support/Cancellable.swift

@@ -72,7 +72,6 @@
 		6B3CC61923F5E64F0008ECBC /* RemoteSyncEngine+State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3CC61823F5E64F0008ECBC /* RemoteSyncEngine+State.swift */; };
 		6B3CC67C23F86D680008ECBC /* RemoteSyncEngine+IncomingEventReconciliationQueueEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3CC67B23F86D680008ECBC /* RemoteSyncEngine+IncomingEventReconciliationQueueEvent.swift */; };
 		6B3CC68023F87FA10008ECBC /* RemoteSyncEngine+Retryable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3CC67F23F87FA10008ECBC /* RemoteSyncEngine+Retryable.swift */; };
-		6B3CC68223F89EE30008ECBC /* Cancellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B3CC68123F89EE30008ECBC /* Cancellable.swift */; };
 		6B4693E923A5645F006BE2C5 /* MutationRetryNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B4693E823A5645F006BE2C5 /* MutationRetryNotifier.swift */; };
 		6B4E3DF42397269C00AD962B /* OutgoingMutationQueueTestsWithMockStateMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B4E3DF32397269C00AD962B /* OutgoingMutationQueueTestsWithMockStateMachine.swift */; };
 		6B4E3DF62397327E00AD962B /* MockStateMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B4E3DF52397327E00AD962B /* MockStateMachine.swift */; };
@@ -320,7 +319,6 @@
 		6B3CC61823F5E64F0008ECBC /* RemoteSyncEngine+State.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RemoteSyncEngine+State.swift"; sourceTree = "<group>"; };
 		6B3CC67B23F86D680008ECBC /* RemoteSyncEngine+IncomingEventReconciliationQueueEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RemoteSyncEngine+IncomingEventReconciliationQueueEvent.swift"; sourceTree = "<group>"; };
 		6B3CC67F23F87FA10008ECBC /* RemoteSyncEngine+Retryable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RemoteSyncEngine+Retryable.swift"; sourceTree = "<group>"; };
-		6B3CC68123F89EE30008ECBC /* Cancellable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cancellable.swift; sourceTree = "<group>"; };
 		6B4693E823A5645F006BE2C5 /* MutationRetryNotifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutationRetryNotifier.swift; sourceTree = "<group>"; };
 		6B4E3DF32397269C00AD962B /* OutgoingMutationQueueTestsWithMockStateMachine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutgoingMutationQueueTestsWithMockStateMachine.swift; sourceTree = "<group>"; };
 		6B4E3DF52397327E00AD962B /* MockStateMachine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockStateMachine.swift; sourceTree = "<group>"; };
@@ -821,7 +819,6 @@
 				FA8F4D1D2395AF7600861D91 /* DataStoreError+Plugin.swift */,
 				FA8F4D212395B11700861D91 /* MutationEvent+Query.swift */,
 				FA3841E823889D440070AD5B /* StateMachine.swift */,
-				6B3CC68123F89EE30008ECBC /* Cancellable.swift */,
 			);
 			path = Support;
 			sourceTree = "<group>";
@@ -1631,7 +1628,6 @@
 				D838AB4C2500330000BF4940 /* ModelSyncedEvent.swift in Sources */,
 				FAED5742238B52CE008EBED8 /* ModelStorageBehavior.swift in Sources */,
 				2149E5C62388684F00873955 /* StorageEngineAdapter.swift in Sources */,
-				6B3CC68223F89EE30008ECBC /* Cancellable.swift in Sources */,
 				FA55A5492391EA89002AFF2D /* MutationEventSubscription.swift in Sources */,
 				FA5D76AB2394752900489864 /* AWSMutationDatabaseAdapter+MutationEventIngester.swift in Sources */,
 				B9B64AA123FD0A3C00730B68 /* ModelValueConverter+SQLite.swift in Sources */,