chore: fix swiftlint and swiftformat config

evva-sfw · Feb 14, 2025 · f249f9e · f249f9e
1 parent 25d8bf3
commit f249f9e
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 50 deletions.
diff --git a/example/.swiftformat → example/ios/.swiftformat b/example/.swiftformat → example/ios/.swiftformat
diff --git a/example/.swiftlint.yml → example/ios/.swiftlint.yml b/example/.swiftlint.yml → example/ios/.swiftlint.yml
@@ -10,7 +10,7 @@ opt_in_rules:
 analyzer_rules: # rules run by `swiftlint analyze`
   - explicit_self
 included:
-  - abrevva-sdk-ios/lib
+  - ../../ios
 excluded:
   - Carthage
   - Pods
@@ -21,8 +21,8 @@ force_try:
   severity: warning
 line_length: 120
 type_body_length:
-  warning: 400
-  error: 500
+  warning: 550
+  error: 650
 file_length:
   warning: 600
   error: 1200

diff --git a/example/ios/ExampleAppExample.xcodeproj/project.pbxproj b/example/ios/ExampleAppExample.xcodeproj/project.pbxproj
@@ -154,6 +154,8 @@
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ExampleAppExample" */;
 			buildPhases = (
 				AA1E527239C7DC8BC535B9F1 /* [CP] Check Pods Manifest.lock */,
+				0714C2562D5F2897004E0943 /* Run SwiftLint */,
+				0714C2572D5F31AD004E0943 /* Run SwiftFormat */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
@@ -262,6 +264,44 @@
 			shellPath = /bin/sh;
 			shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
 		};
+		0714C2562D5F2897004E0943 /* Run SwiftLint */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run SwiftLint";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "${PODS_ROOT}/SwiftLint/swiftlint --fix --format && ${PODS_ROOT}/SwiftLint/swiftlint\n";
+		};
+		0714C2572D5F31AD004E0943 /* Run SwiftFormat */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run SwiftFormat";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat --swiftversion 6.0 $SRCROOT\n";
+		};
 		14EBE08067923129DD66A4E5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -593,10 +633,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -679,10 +716,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -28,9 +28,10 @@ end
 target 'ExampleAppExample' do
   config = use_native_modules!
   use_frameworks!
-  
+
   pod 'SwiftLint', '~> 0.54.0'
   pod 'SwiftFormat/CLI', '~> 0.49'
+
   use_react_native!(
     :path => config[:reactNativePath],
     # Enables Flipper.

diff --git a/ios/ble/AbrevvaBle.swift b/ios/ble/AbrevvaBle.swift
@@ -102,7 +102,7 @@ public class AbrevvaBle: RCTEventEmitter {
                     settingsURL,
                     completionHandler: { success in
                         resolve([
-                            "value": success,
+                            "value": success
                         ])
                     }
                 )
@@ -126,22 +126,19 @@ public class AbrevvaBle: RCTEventEmitter {
         let allowDuplicates = optionsSwift["allowDuplicates"] as? Bool ?? false
         let timeout = optionsSwift["timeout"] as? Int ?? 10000
 
-        bleManager.startScan(
-            { device in
-                self.bleDeviceMap[device.getAddress()] = device
-                self.sendEvent(
-                    withName: "onScanResult", body: self.getAdvertismentData(device)
-                )
-            },
-            { error in
-                self.sendEvent(withName: "onScanStart", body: error == nil)
-            },
-            { error in
-                self.sendEvent(withName: "onScanStop", body: error == nil)
-            },
-            macFilter,
-            allowDuplicates,
-            timeout
+        bleManager.startScan({ device in
+            self.bleDeviceMap[device.getAddress()] = device
+            self.sendEvent(
+                withName: "onScanResult", body: self.getAdvertismentData(device)
+            )
+        }, { error in
+            self.sendEvent(withName: "onScanStart", body: error == nil)
+        }, { error in
+            self.sendEvent(withName: "onScanStop", body: error == nil)
+        },
+        macFilter,
+        allowDuplicates,
+        timeout
         )
     }
 
@@ -196,8 +193,7 @@ public class AbrevvaBle: RCTEventEmitter {
         let timeout = optionsSwift["timeout"] as? Int ?? 10000
         Task {
             let success = await self.bleManager!.connect(
-                device,
-                { address in
+                device, { address in
                     self.sendEvent(
                         withName: "onDisconnect|\(address)", body: ["address": address]
                     )
@@ -350,12 +346,11 @@ public class AbrevvaBle: RCTEventEmitter {
         let timeout = optionsSwift["timeout"] as? Int ?? nil
         Task {
             let success = await device.setNotifications(
-                characteristic.0, characteristic.1, true,
-                { value in
+                characteristic.0, characteristic.1, true, { value in
                     let key =
                         "notification|\(device.getAddress().lowercased())|"
-                            + "\(characteristic.0.uuidString.lowercased())|"
-                            + "\(characteristic.1.uuidString.lowercased())"
+                        + "\(characteristic.0.uuidString.lowercased())|"
+                        + "\(characteristic.1.uuidString.lowercased())"
 
                     if value != nil {
                         self.sendEvent(withName: key, body: ["value": dataToString(value!)])
@@ -407,11 +402,11 @@ public class AbrevvaBle: RCTEventEmitter {
         var bleDeviceData: [String: Any?] = [
             "deviceId": device.getAddress(),
             "name": device.getName(),
-            "raw": device.advertisementData?.rawData,
+            "raw": device.advertisementData?.rawData
         ]
 
         var advertismentData: [String: Any?] = [
-            "rssi": device.advertisementData?.rssi,
+            "rssi": device.advertisementData?.rssi
         ]
         if let isConnectable = device.advertisementData?.isConnectable {
             advertismentData["isConnectable"] = isConnectable
@@ -441,7 +436,7 @@ public class AbrevvaBle: RCTEventEmitter {
             "subFirmwareVersionMinor": mfData.subFirmwareVersionMinor,
             "subFirmwareVersionPatch": mfData.subFirmwareVersionPatch,
             "subComponentIdentifier": mfData.subComponentIdentifier,
-            "componentType": getComponentType(mfData.componentType),
+            "componentType": getComponentType(mfData.componentType)
         ]
 
         advertismentData["manufacturerData"] = manufacturerData
@@ -469,8 +464,7 @@ public class AbrevvaBle: RCTEventEmitter {
     }
 
     private func getBleManager(_ reject: @escaping RCTPromiseRejectBlock)
-        -> BleManager?
-    {
+    -> BleManager? {
         guard let bleManager else {
             reject("getBleManager(): not initialized", nil, nil)
             return nil
@@ -544,7 +538,7 @@ public class AbrevvaBle: RCTEventEmitter {
 
     private func getBleDeviceDict(_ device: BleDevice) -> [String: String] {
         var bleDevice = [
-            "deviceId": device.getAddress(),
+            "deviceId": device.getAddress()
         ]
         if device.getName() != nil {
             bleDevice["name"] = device.getName()

diff --git a/ios/crypto/AbrevvaCrypto.swift b/ios/crypto/AbrevvaCrypto.swift
@@ -33,7 +33,7 @@ public class AbrevvaCrypto: NSObject {
         } else {
             resolve([
                 "cipherText": [UInt8](ct[..<pt.count]).toHexString(),
-                "authTag": [UInt8](ct[pt.count...]).toHexString(),
+                "authTag": [UInt8](ct[pt.count...]).toHexString()
             ])
         }
     }
@@ -61,7 +61,7 @@ public class AbrevvaCrypto: NSObject {
         } else {
             resolve([
                 "plainText": pt,
-                "authOk": true,
+                "authOk": true
             ])
         }
     }
@@ -74,7 +74,7 @@ public class AbrevvaCrypto: NSObject {
 
         resolve([
             "privateKey": keyPair[0].toHexString(),
-            "publicKey": keyPair[1].toHexString(),
+            "publicKey": keyPair[1].toHexString()
         ])
     }
 
@@ -96,7 +96,7 @@ public class AbrevvaCrypto: NSObject {
         )
 
         resolve([
-            "sharedSecret": sharedSecret?.toHexString(),
+            "sharedSecret": sharedSecret?.toHexString()
         ])
     }
 
@@ -121,7 +121,7 @@ public class AbrevvaCrypto: NSObject {
             reject("encryption failed", nil, nil)
         } else {
             resolve([
-                "opOk": operationResult,
+                "opOk": operationResult
             ])
         }
     }
@@ -158,7 +158,7 @@ public class AbrevvaCrypto: NSObject {
             reject("Encryption has failed", nil, nil)
         } else {
             resolve([
-                "opOk": operationResult,
+                "opOk": operationResult
             ])
         }
     }
@@ -193,7 +193,7 @@ public class AbrevvaCrypto: NSObject {
             reject("Decryption has failed", nil, nil)
         } else {
             resolve([
-                "opOk": operationResult,
+                "opOk": operationResult
             ])
         }
     }
@@ -214,7 +214,7 @@ public class AbrevvaCrypto: NSObject {
             reject("random generation failed", nil, nil)
         } else {
             resolve([
-                "value": rnd,
+                "value": rnd
             ])
         }
     }
@@ -240,7 +240,7 @@ public class AbrevvaCrypto: NSObject {
             reject("derivation failed", nil, nil)
         } else {
             resolve([
-                "value": derived,
+                "value": derived
             ])
         }
     }