chore: Lints

build-support/dependencies.rb

@@ -36,3 +36,7 @@ def include_build_tools!
         :execution_position => :before_compile
     },
 ]
+
+def get_plugin_dir(plugin_name)
+    return File.join('.symlinks', 'plugins', plugin_name, 'ios')
+end

melos.yaml

@@ -98,6 +98,8 @@ scripts:
       scope:
         - amplify_analytics_*
         - amplify_api*
+        - amplify_flutter*
+        - amplify_core*
 
   lint:ios:
     run: |
@@ -111,6 +113,8 @@ scripts:
       scope:
         - amplify_analytics_pinpoint_example
         - amplify_api_example
+        - amplify_flutter_example
+        - amplify_core_example
 
   lint:android:
     run: |
@@ -122,6 +126,20 @@ scripts:
       scope:
         - amplify_analytics_pinpoint_example
         - amplify_api_example
+        - amplify_flutter_example
+        - amplify_core_example
+
+  copy_dependencies:
+    run: |
+      melos exec -c 1 -- \
+        cp "\$MELOS_ROOT_PATH"/build-support/dependencies.rb ios
+    description: Updates the iOS build dependencies for each project
+    select-package:
+      scope:
+        - amplify_analytics_pinpoint
+        - amplify_api
+        - amplify_flutter
+        - amplify_core
 
   lint:pub: >
     melos exec -c 5 --fail-fast --no-private --ignore="*example*" -- \

packages/amplify_analytics_pinpoint/example/ios/Podfile

@@ -1,4 +1,4 @@
-load '../../../../build-support/dependencies.rb'
+load '../../ios/dependencies.rb'
 
 # Uncomment this line to define a global platform for your project
 platform :ios, '13.0'
@@ -28,19 +28,18 @@ end
 require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
 
 flutter_ios_podfile_setup
+include_build_tools!
 
 target 'Runner' do
   use_frameworks!
   use_modular_headers!
-  include_build_tools!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
 target 'unit_tests' do
   use_frameworks!
   use_modular_headers!
-  include_build_tools!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end

packages/amplify_analytics_pinpoint/example/lib/main.dart

@@ -1,8 +1,7 @@
+import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart';
 import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
-import 'package:flutter/material.dart';
-
 import 'package:amplify_flutter/amplify.dart';
-import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart';
+import 'package:flutter/material.dart';
 
 import 'amplifyconfiguration.dart';
 

packages/amplify_analytics_pinpoint/ios/Classes/FlutterAnalytics.swift

@@ -63,7 +63,8 @@ public enum FlutterAnalytics {
         bridge: AnalyticsBridge
     ) {
         guard let argumentsMap = arguments as? [String: Any],
-              let name = argumentsMap["name"] as? String else {
+              let name = argumentsMap["name"] as? String
+        else {
             result(invalidArgumentsError)
             return
         }
@@ -132,7 +133,8 @@ public enum FlutterAnalytics {
     public static func identifyUser(arguments: Any?, result: @escaping FlutterResult, bridge: AnalyticsBridge) {
         guard let arguments = arguments as? [String: Any],
               let userId = arguments["userId"] as? String,
-              let userProfileMap = arguments["userProfileMap"] as? [String: Any] else {
+              let userProfileMap = arguments["userProfileMap"] as? [String: Any]
+        else {
             result(invalidArgumentsError)
             return
         }

packages/amplify_analytics_pinpoint/ios/amplify_analytics_pinpoint.podspec

@@ -1,3 +1,5 @@
+load 'dependencies.rb'
+
 #
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
 # Run `pod lib lint amplify_analytics_pinpoint.podspec' to validate before publishing.
@@ -18,9 +20,12 @@ This code is the iOS part of the Amplify Flutter Pinpoint Analytics Plugin.  The
   s.dependency 'Amplify', '~> 1.15.3'
   s.dependency 'AmplifyPlugins/AWSPinpointAnalyticsPlugin', '~> 1.15.3'
   s.dependency 'amplify_core'
+  s.dependency 'SwiftLint'
+  s.dependency 'SwiftFormat/CLI'
   s.platform = :ios, '11.0'
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
-  s.swift_version = '5.0'
+  s.swift_version = $swift_version
+  s.script_phases = $default_script_phases
 end

packages/amplify_analytics_pinpoint/ios/dependencies.rb

@@ -0,0 +1,42 @@
+$swift_version = "5.0"
+
+# Include common tooling
+def include_build_tools!
+    # Pin to 0.44.17 until we resolve closing braces
+    pod 'SwiftFormat/CLI', '0.44.17'
+    pod 'SwiftLint'
+end
+
+$lint_script = <<-EOF
+    CONFIG_FILE="${SRCROOT}/../../../../../.swiftformat"
+    if [[ -e "${CONFIG_FILE}" ]]; then
+        "${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat" --config "${CONFIG_FILE}" --swiftversion "#{$swift_version}" "${SRCROOT}/../.symlinks/plugins/${PRODUCT_NAME}/ios"
+    fi 
+EOF
+
+$format_script = <<-EOF
+    CONFIG_FILE="${SRCROOT}/../../../../../.swiftlint.yml"
+    if [[ -e "${CONFIG_FILE}" ]]; then 
+        "${PODS_ROOT}/SwiftLint/swiftlint" --config "${CONFIG_FILE}" --path "${SRCROOT}/../.symlinks/plugins/${PRODUCT_NAME}/ios"
+    fi
+EOF
+
+$default_script_phases = [
+    # Format build phase
+    {
+        :name => 'SwiftFormat',
+        :script => $lint_script,
+        :execution_position => :before_compile
+    },
+
+    # Lint build phase
+    {
+        :name => 'SwiftLint',
+        :script => $format_script,
+        :execution_position => :before_compile
+    },
+]
+
+def get_plugin_dir(plugin_name)
+    return File.join('.symlinks', 'plugins', plugin_name, 'ios')
+end

packages/amplify_analytics_pinpoint/lib/amplify_analytics_pinpoint.dart

@@ -18,7 +18,7 @@ library amplify_analytics_pinpoint;
 import 'package:amplify_analytics_plugin_interface/amplify_analytics_plugin_interface.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
-import './method_channel_amplify.dart';
+import 'src/method_channel_amplify.dart';
 
 export 'package:amplify_analytics_plugin_interface/src/types.dart';
 

packages/amplify_analytics_pinpoint/lib/method_channel_amplify.dart → packages/amplify_analytics_pinpoint/lib/src/method_channel_amplify.dart

@@ -14,12 +14,10 @@
  */
 
 import 'package:amplify_analytics_plugin_interface/amplify_analytics_plugin_interface.dart';
-import 'package:amplify_core/types/exception/AmplifyException.dart';
-import 'package:amplify_core/types/exception/AmplifyAlreadyConfiguredException.dart';
-import 'package:amplify_core/types/index.dart';
+import 'package:amplify_core/amplify_core.dart';
 import 'package:flutter/services.dart';
 
-import 'amplify_analytics_pinpoint.dart';
+import '../amplify_analytics_pinpoint.dart';
 
 const MethodChannel _channel =
     MethodChannel('com.amazonaws.amplify/analytics_pinpoint');

packages/amplify_analytics_pinpoint/test/amplify_analytics_pinpoint_test.dart

@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
+import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart';
+import 'package:amplify_analytics_plugin_interface/amplify_analytics_plugin_interface.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:amplify_analytics_plugin_interface/amplify_analytics_plugin_interface.dart';
-import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart';
 
 void main() {
   const MethodChannel analyticsChannel =

packages/amplify_analytics_plugin_interface/lib/amplify_analytics_plugin_interface.dart

@@ -17,7 +17,7 @@ library amplify_analytics_plugin_interface;
 
 import 'dart:async';
 
-import 'package:amplify_core/types/index.dart';
+import 'package:amplify_core/amplify_core.dart';
 import 'package:meta/meta.dart';
 
 import 'src/types.dart';

packages/amplify_analytics_plugin_interface/lib/src/exceptions/analytics_exception.dart

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_core/types/exception/AmplifyException.dart';
+import 'package:amplify_core/amplify_core.dart';
 
 /// Base Class for Analytics Exceptions
 class AnalyticsException extends AmplifyException {

packages/amplify_api/example/integration_test/main_test.dart

@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-import 'package:integration_test/integration_test.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:amplify_flutter/amplify.dart';
 import 'package:amplify_api/amplify_api.dart';
 import 'package:amplify_api_example/amplifyconfiguration.dart';
+import 'package:amplify_flutter/amplify.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
 
 import 'graph_ql_tests.dart' as graph_ql_tests;
 

packages/amplify_api/example/ios/Podfile

@@ -1,4 +1,4 @@
-load '../../../../build-support/dependencies.rb'
+load '../../ios/dependencies.rb'
 
 # Uncomment this line to define a global platform for your project
 platform :ios, '13.0'
@@ -28,19 +28,18 @@ end
 require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
 
 flutter_ios_podfile_setup
+include_build_tools!
 
 target 'Runner' do
   use_frameworks!
   use_modular_headers!
-  include_build_tools!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
 target 'unit_tests' do
   use_frameworks!
   use_modular_headers!
-  include_build_tools!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end

packages/amplify_api/example/lib/graphql_api_view.dart

@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
+import 'package:amplify_api/amplify_api.dart';
 import 'package:amplify_flutter/amplify.dart';
 import 'package:flutter/material.dart';
-import 'package:amplify_api/amplify_api.dart';
 
 class GraphQLApiView extends StatefulWidget {
   final bool isAmplifyConfigured;

packages/amplify_api/ios/Classes/Auth/FlutterAuthProvider.swift

@@ -24,7 +24,7 @@ extension FlutterError: Error {}
 /// A factory of [FlutterAuthProvider] instances. Manages shared state for all providers.
 class FlutterAuthProviders: APIAuthProviderFactory {
     /// Thread to perform wait activities on.
-    static private let queue = DispatchQueue(label: "FlutterAuthProviders")
+    private static let queue = DispatchQueue(label: "FlutterAuthProviders")
 
     /// Retrieves the latest token for `type` by calling into Flutter via the plugin's method channel.
     static func getToken(for type: AWSAuthorizationType) -> Result<String, Error> {

packages/amplify_api/ios/Classes/FlutterApiResponse.swift

@@ -58,7 +58,7 @@ extension Encodable {
   }
 }
 
-class FlutterApiResponse {
+enum FlutterApiResponse {
     static func handleGraphQLErrorResponse(
         flutterResult: @escaping FlutterResult,
         errorResponse: GraphQLResponseError<String>

packages/amplify_api/ios/Classes/FlutterRestApi.swift

@@ -21,11 +21,13 @@ import Amplify
 import AmplifyPlugins
 import AWSCore
 
-public class FlutterRestApi {
+public enum FlutterRestApi {
     private static func restFunctionHelper(
         methodName: String,
         flutterResult: @escaping FlutterResult,
-        request: [String: Any], function: (RESTRequest, RESTOperation.ResultListener?) -> RESTOperation ) {
+        request: [String: Any],
+        function: (RESTRequest, RESTOperation.ResultListener?) -> RESTOperation
+    ) {
         do {
             let cancelToken = try FlutterApiRequest.getCancelToken(methodChannelRequest: request)
             let restRequest = try FlutterApiRequest.getRestRequest(methodChannelRequest: request,

packages/amplify_api/ios/Classes/FlutterSerializedRestResponse.swift

@@ -24,9 +24,9 @@ public struct FlutterSerializedRestResponse {
     init(statusCode: Int, headers: [AnyHashable: Any], data: Data?) {
         let stringHeaders = headers
             .filter { $0.key is String }
-            .compactMapValues { $0 as? String } as? [String: String]
+            .compactMapValues { $0 as? String }
         self.statusCode = statusCode
-        self.headers = stringHeaders ?? [:]
+        self.headers = stringHeaders as? [String: String] ?? [:]
         self.data = data
     }
 

packages/amplify_api/ios/Classes/FlutterURLSessionDelegate.swift

@@ -84,34 +84,42 @@ class FlutterURLSessionBehaviorDelegate: NSObject, URLSessionBehaviorDelegate {
 }
 
 extension FlutterURLSessionBehaviorDelegate: URLSessionDelegate {
-    @objc public func urlSession(_ session: URLSession,
-                                 didReceive challenge: URLAuthenticationChallenge,
-                                 completionHandler: @escaping AuthChallengeDispositionHandler) {
+    @objc public func urlSession(
+        _ session: URLSession,
+        didReceive challenge: URLAuthenticationChallenge,
+        completionHandler: @escaping AuthChallengeDispositionHandler
+    ) {
         completionHandler(.performDefaultHandling, nil)
     }
 }
 
 extension FlutterURLSessionBehaviorDelegate: URLSessionTaskDelegate {
-    @objc public func urlSession(_ session: URLSession,
-                                 task: URLSessionTask,
-                                 didReceive challenge: URLAuthenticationChallenge,
-                                 completionHandler: @escaping AuthChallengeDispositionHandler) {
+    @objc public func urlSession(
+        _ session: URLSession,
+        task: URLSessionTask,
+        didReceive challenge: URLAuthenticationChallenge,
+        completionHandler: @escaping AuthChallengeDispositionHandler
+    ) {
         completionHandler(.performDefaultHandling, nil)
     }
 
-    @objc public func urlSession(_ session: URLSession,
-                                 task: URLSessionTask,
-                                 didCompleteWithError error: Error?) {
+    @objc public func urlSession(
+        _ session: URLSession,
+        task: URLSessionTask,
+        didCompleteWithError error: Error?
+    ) {
         urlSessionBehavior(session,
                            dataTaskBehavior: task,
                            didCompleteWithError: error)
     }
 }
 
 extension FlutterURLSessionBehaviorDelegate: URLSessionDataDelegate {
-    @objc public func urlSession(_ session: URLSession,
-                                 dataTask: URLSessionDataTask,
-                                 didReceive data: Data) {
+    @objc public func urlSession(
+        _ session: URLSession,
+        dataTask: URLSessionDataTask,
+        didReceive data: Data
+    ) {
         urlSessionBehavior(session,
                            dataTaskBehavior: dataTask,
                            didReceive: data)

packages/amplify_api/ios/Classes/OperationsManager.swift

@@ -16,7 +16,7 @@
 import Foundation
 import Amplify
 
-public class OperationsManager {
+public enum OperationsManager {
     /// Prevents concurrent access to arrays.
     private static let queue = DispatchQueue(label: "com.amazonaws.flutter.OperationsManager.concurrency")