chore(datastore): DataStore Cocoa Pod removed modules

packages/aft/lib/src/commands/generate/generate_amplify_swift_command.dart

@@ -87,6 +87,12 @@ class GenerateAmplifySwiftCommand extends AmplifyCommand with GlobOptions {
     ),
   ];
 
+  final _importsToRemove = [
+    'import Amplify',
+    'import AWSPluginsCore',
+    'import AWSDataStorePlugin',
+  ];
+
   /// Downloads Amplify Swift from GitHub into a temporary directory.
   Future<Directory> _downloadRepository() => _cloneMemo.runOnce(() async {
         final cloneDir =
@@ -132,12 +138,55 @@ class GenerateAmplifySwiftCommand extends AmplifyCommand with GlobOptions {
     return worktreeDir;
   }
 
+  /// Find and replaces the `import` statements in the plugin files.
+  Future<void> _replaceImports(Directory pluginDir) async {
+    final files = await pluginDir.list(recursive: true).toList();
+    for (final file in files) {
+      if (file is! File) {
+        continue;
+      }
+      // Only process Swift files.
+      if (!file.path.endsWith('.swift')) {
+        continue;
+      }
+      final contents = await file.readAsString();
+      // remove the list of import statement for Amplify including line breaks
+      final newContents = contents.split('\n').where((line) {
+        return !_importsToRemove.any((import) => line.contains(import));
+      }).join('\n');
+      await file.writeAsString(newContents);
+    }
+  }
+
+  /// Remove `info.plist` from the plugin files.
+  Future<void> _removePListFiles(Directory pluginDir) async {
+    final files = await pluginDir.list(recursive: true).toList();
+    for (final file in files) {
+      if (file is! File) {
+        continue;
+      }
+      // Only process Info.plist files.
+      if (!file.path.endsWith('Info.plist')) {
+        continue;
+      }
+      await file.delete();
+    }
+  }
+
+  /// Transforms the plugin files to Amplify Flutter requirements.
+  Future<void> _transformPlugin(Directory directory) async {
+    logger
+      ..info('Transforming plugin files...')
+      ..verbose('In ${directory.path}');
+    await _replaceImports(directory);
+    await _removePListFiles(directory);
+  }
+
   /// Sets up the Amplify Swift repo for use later
   Future<void> _setupRepo() async {
     if (_repoCache[branchTarget] != null) {
       return;
     }
-
     final repoDir = await _downloadRepository();
     final repoRef = await _checkoutRepositoryRef(repoDir, branchTarget);
 
@@ -151,9 +200,13 @@ class GenerateAmplifySwiftCommand extends AmplifyCommand with GlobOptions {
       exitError('No cached repo for branch $branchTarget');
     }
 
-    return Directory.fromUri(
+    final pluginDir = Directory.fromUri(
       repoDir.uri.resolve(path),
     );
+
+    await _transformPlugin(pluginDir);
+
+    return pluginDir;
   }
 
   /// Generates the Amplify Swift plugin for [plugin].
@@ -251,6 +304,7 @@ class GenerateAmplifySwiftCommand extends AmplifyCommand with GlobOptions {
 
   @override
   Future<void> run() async {
+    logger.info('Generating Amplify Swift plugins.');
     await super.run();
     switch (isDiff) {
       case true:

packages/amplify_datastore/example/ios/unit_tests/AmplifyModelSchemaUnitTests.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import XCTest
-import Amplify
-@testable import AWSDataStorePlugin
 @testable import amplify_datastore
 
 class AmplifyModelSchemaUnitTests: XCTestCase {

packages/amplify_datastore/example/ios/unit_tests/AmplifySerializedModelUnitTests.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import XCTest
-import Amplify
-@testable import AWSDataStorePlugin
 @testable import amplify_datastore
 
 class AmplifySerializedModelUnitTests: XCTestCase {

packages/amplify_datastore/example/ios/unit_tests/DataStoreHubEventStreamHandlerTests.swift

@@ -1,11 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import Flutter
 import XCTest
-import Amplify
 import Combine
-@testable import AWSDataStorePlugin
-@testable import AWSPluginsCore
 @testable import amplify_datastore
 
 let testHubSchema: ModelSchema = SchemaData.PostSchema

packages/amplify_datastore/example/ios/unit_tests/DataStorePluginUnitTests.swift

@@ -1,10 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import Flutter
 import XCTest
-import Amplify
 import Combine
-@testable import AWSDataStorePlugin
 @testable import amplify_datastore
 
 let testSchema: ModelSchema = SchemaData.PostSchema

packages/amplify_datastore/example/ios/unit_tests/GetJsonFromFileUtil.swift

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
 
 func readJsonMap(filePath: String) throws -> [String: Any] {
     if let object = try readJson(filePath: filePath) as? [String: Any] {

packages/amplify_datastore/example/ios/unit_tests/GraphQLResponse+DecodeTests.swift

@@ -7,8 +7,6 @@
 
 
 import XCTest
-@testable import Amplify
-@testable import AWSPluginsCore
 @testable import amplify_datastore
 
 class GraphQLResponseDecodeTests: XCTestCase {

packages/amplify_datastore/example/ios/unit_tests/ModelSchemaEquatableExtensions.swift

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
+@testable import amplify_datastore
 
 extension ModelSchema: Equatable {
     public static func == (lhs: ModelSchema, rhs: ModelSchema) -> Bool {

packages/amplify_datastore/example/ios/unit_tests/QueryPaginationUnitTests.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import XCTest
-import Amplify
-import AWSDataStorePlugin
 @testable import amplify_datastore
 
 extension QueryPaginationInput: Equatable {

packages/amplify_datastore/example/ios/unit_tests/QueryPredicateBuilderUnitTests.swift

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import XCTest
-import Amplify
 @testable import amplify_datastore
 
 class QueryPredicateBuilderUnitTests: XCTestCase {

packages/amplify_datastore/example/ios/unit_tests/QuerySortBuilderUnitTests.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import XCTest
-import Amplify
-@testable import AWSDataStorePlugin
 @testable import amplify_datastore
 
 // Extending for simple assertions on the objects equality.

packages/amplify_datastore/example/ios/unit_tests/resources/FlutterSerializedModelData.swift

@@ -1,8 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import Amplify
-@testable import AWSDataStorePlugin
 @testable import amplify_datastore
 
 struct FlutterSerializedModelData {

packages/amplify_datastore/example/ios/unit_tests/resources/SchemaData.swift

@@ -1,8 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import Amplify
-@testable import AWSDataStorePlugin
 @testable import amplify_datastore
 
 struct SchemaData {

packages/amplify_datastore/ios/Classes/CognitoPlugin.swift

@@ -3,8 +3,6 @@
 
 import Flutter
 import UIKit
-import Amplify
-import AWSPluginsCore
 
 extension NativeAuthUser: AuthUser { }
 

packages/amplify_datastore/ios/Classes/DataStoreBridge.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
-import AWSDataStorePlugin
 import Combine
 
 public class DataStoreBridge {

packages/amplify_datastore/ios/Classes/DataStoreHubEventStreamHandler.swift

@@ -1,9 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import Flutter
 import Foundation
-import Amplify
-import AWSDataStorePlugin
 
 public class DataStoreHubEventStreamHandler: NSObject, FlutterStreamHandler {
     private var eventSink: FlutterEventSink?

packages/amplify_datastore/ios/Classes/DataStoreObserveEventStreamHandler.swift

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import Flutter
 import Foundation
 
 public class DataStoreObserveEventStreamHandler: NSObject, FlutterStreamHandler {

packages/amplify_datastore/ios/Classes/FlutterApiPlugin.swift

@@ -1,7 +1,5 @@
 import Foundation
 import Flutter
-import Amplify
-import AWSPluginsCore
 import Combine
 
 

packages/amplify_datastore/ios/Classes/FlutterDataStoreErrorHandler.swift

@@ -1,9 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import Flutter
 import Foundation
-import Amplify
-import AWSDataStorePlugin
 
 class FlutterDataStoreErrorHandler {
     static func handleDataStoreError(error: DataStoreError, flutterResult: FlutterResult) {

packages/amplify_datastore/ios/Classes/FlutterDataStoreRequestUtils.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
-import AWSDataStorePlugin
 
 public enum FlutterDataStoreRequestUtils {
     static func getJSONValue(_ jsonDict: [String: Any]) throws -> [String: JSONValue] {

packages/amplify_datastore/ios/Classes/FlutterSchemaRegistry.swift

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import Amplify
 import Foundation
 
 // Contains the set of classes that conforms to the `Model` protocol.

packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift

@@ -3,9 +3,6 @@
 
 import Flutter
 import UIKit
-import Amplify
-import AWSDataStorePlugin
-import AWSPluginsCore
 import Combine
 
 public class SwiftAmplifyDataStorePlugin: NSObject, FlutterPlugin, NativeAmplifyBridge, NativeAuthBridge, NativeApiBridge {

packages/amplify_datastore/ios/Classes/api/GraphQLRequest+Extension.swift

@@ -7,7 +7,6 @@
 
 
 import Foundation
-import Amplify
 
 extension GraphQLRequest {
     func toNativeGraphQLRequest() -> NativeGraphQLRequest {

packages/amplify_datastore/ios/Classes/api/GraphQLResponse+Decode.swift

@@ -7,8 +7,6 @@
 
 
 import Foundation
-import Amplify
-import AWSPluginsCore
 
 extension GraphQLResponse {
     static var jsonDecoder: JSONDecoder {

packages/amplify_datastore/ios/Classes/api/Publisher+Extension.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import Combine
-import Amplify
 
 extension Publisher {
     func toAmplifyAsyncThrowingSequence() -> (AmplifyAsyncThrowingSequence<Output>, AnyCancellable) {

packages/amplify_datastore/ios/Classes/auth/FlutterAuthProviders.swift

@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
-import AWSDataStorePlugin
-import AWSPluginsCore
 import Flutter
 
 /// A factory of [FlutterAuthProvider] instances. Manages shared state for all providers.

packages/amplify_datastore/ios/Classes/bridge/NativeAWSAuthCognitoSession.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
-import AWSPluginsCore
 
 struct NativeAWSAuthCognitoSession: AuthSession,
                                        AuthAWSCredentialsProvider,

packages/amplify_datastore/ios/Classes/bridge/NativeAWSCredentials+AuthAWSCredentials.swift

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import AWSPluginsCore
 
 struct NativeAWSPermanentCredentials: AWSCredentials {
     let accessKeyId: String

packages/amplify_datastore/ios/Classes/bridge/NativeAuthFetchSessionOperation.swift

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
 
 // TODO: Mirgrate to Async Swift v2
 public protocol AuthFetchSessionOperation: AmplifyOperation<AuthFetchSessionRequest, AuthSession, AuthError> {}

packages/amplify_datastore/ios/Classes/bridge/NativeUserPoolTokens+AuthCognitoTokens.swift

@@ -2,6 +2,5 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import AWSPluginsCore
 
 extension NativeUserPoolTokens: AuthCognitoTokens { }

packages/amplify_datastore/ios/Classes/types/hub/FlutterHubElement.swift

@@ -4,8 +4,6 @@
 import Foundation
 import Flutter
 import UIKit
-import Amplify
-import AWSDataStorePlugin
 import Combine
 
 public struct FlutterHubElement {

packages/amplify_datastore/ios/Classes/types/hub/FlutterModelSyncedEvent.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
-import AWSDataStorePlugin
 
 struct FlutterModelSyncedEvent: FlutterHubEvent {
     var eventName: String

packages/amplify_datastore/ios/Classes/types/hub/FlutterNetworkStatusEvent.swift

@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Foundation
-import Amplify
-import AWSDataStorePlugin
 
 struct FlutterNetworkStatusEvent: FlutterHubEvent {
     var eventName: String