Merge pull request #549 from nimblehq/chore/548-fix-lints-after-gener…

…ating-project [#548] [Chore] Fix lints after generating project
nimblehq · Dec 15, 2023 · c3d8ddc · c3d8ddc
2 parents a9b5099 + 8de90be
commit c3d8ddc
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 20 deletions.
diff --git a/.swiftformat b/.swiftformat
@@ -1,5 +1,5 @@
 # file options
---exclude Pods, Generated, **/*.generated.swift, fastlane/swift
+--exclude Pods, Generated, **/*.generated.swift, fastlane/swift, ArkanaKeys
 
 # rules
 --disable fileHeader

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -9,9 +9,9 @@ excluded:
   - Pods
   - Derived
   - DerivedData
+  - ArkanaKeys
 
 opt_in_rules:
-  - anyobject_protocol
   - array_init
   - attributes
   - closure_body_length

diff --git a/fastlane/Constants/Constant.swift b/fastlane/Constants/Constant.swift
@@ -125,14 +125,14 @@ extension Constant {
             let outputDirectoryURL = URL(fileURLWithPath: Constant.outputPath)
             return outputDirectoryURL.appendingPathComponent(productName + ".app" + Constant.dSYMSuffix).relativePath
         }
-        
+
         var appleUsername: String {
             switch self {
             case .staging: return Constant.appleStagingUserName
             case .production: return Constant.appleProductionUserName
             }
         }
-        
+
         var appleTeamId: String {
             switch self {
             case .staging: return Constant.appleStagingTeamId
@@ -148,29 +148,29 @@ extension Constant {
         case appStore = "app-store"
 
         var value: String { return rawValue }
-        
+
         var match: String {
             switch self {
             case .development: return "development"
             case .adHoc: return "adhoc"
             case .appStore: return "appstore"
             }
         }
-        
+
         var configuration: String {
             switch self {
             case .development: return "Debug"
             case .adHoc, .appStore: return "Release"
             }
         }
-        
+
         var codeSignIdentity: String {
             switch self {
             case .development: return "iPhone Developer"
-            case .adHoc, . appStore: return "iPhone Distribution"
+            case .adHoc, .appStore: return "iPhone Distribution"
             }
         }
-        
+
         var method: String {
             switch self {
             case .development: return "Development"

diff --git a/fastlane/Fastfile.swift b/fastlane/Fastfile.swift
@@ -19,7 +19,7 @@ class Fastfile: LaneFile {
             environment: .staging
         )
     }
-    
+
     func syncDevelopmentProductionCodeSigningLane() {
         desc("Sync the Development match signing for the Production build")
         Match.syncCodeSigning(
@@ -51,7 +51,7 @@ class Fastfile: LaneFile {
             environment: .production
         )
     }
-    
+
     func removeKeychainLane() {
         desc("Delete keychain")
         Keychain.remove()

diff --git a/fastlane/Helpers/Keychain.swift b/fastlane/Helpers/Keychain.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-	
+
 enum Keychain {
 
     static func create() {
@@ -19,7 +19,7 @@ enum Keychain {
             timeout: 115_200
         )
     }
-    
+
     static func remove() {
         deleteKeychain(
             name: .userDefined(Constant.keychainName)

diff --git a/fastlane/Helpers/Match.swift b/fastlane/Helpers/Match.swift
@@ -36,24 +36,24 @@ enum Match {
         }
         updateCodeSigning(type: type, environment: environment)
     }
-    
+
     static func updateCodeSigning(type: Constant.BuildType, environment: Constant.Environment) {
         // Update Code signing from automatic to manual
         updateCodeSigningSettings(
             path: Constant.projectPath,
             useAutomaticSigning: .userDefined(false),
             teamId: .userDefined(environment.appleTeamId),
             targets: .userDefined([Constant.projectName]),
-            buildConfigurations: .userDefined([Self.createBuildConfiguration(type: type, environment: environment)]),
+            buildConfigurations: .userDefined([createBuildConfiguration(type: type, environment: environment)]),
             codeSignIdentity: .userDefined(type.codeSignIdentity),
-            profileName: .userDefined(Self.createProfileName(type: type, environment: environment))
+            profileName: .userDefined(createProfileName(type: type, environment: environment))
         )
     }
-    
+
     static func createBuildConfiguration(type: Constant.BuildType, environment: Constant.Environment) -> String {
         "\(type.configuration) \(environment.rawValue)"
     }
-    
+
     static func createProfileName(type: Constant.BuildType, environment: Constant.Environment) -> String {
         "match \(type.method) \(environment.bundleId)"
     }

diff --git a/{PROJECT_NAME}KIFUITests/Sources/Utilities/KIF+Swift.swift b/{PROJECT_NAME}KIFUITests/Sources/Utilities/KIF+Swift.swift
@@ -8,10 +8,10 @@ import KIF
 extension KIFSpec {
 
     static func tester(file: String = #file, _ line: Int = #line) -> KIFUITestActor {
-        return KIFUITestActor(inFile: file, atLine: line, delegate: kifDelegate)
+        KIFUITestActor(inFile: file, atLine: line, delegate: kifDelegate)
     }
 
     static func system(file: String = #file, _ line: Int = #line) -> KIFSystemTestActor {
-        return KIFSystemTestActor(inFile: file, atLine: line, delegate: kifDelegate)
+        KIFSystemTestActor(inFile: file, atLine: line, delegate: kifDelegate)
     }
 }
diff --git a/{PROJECT_NAME}Tests/Sources/Specs/Data/NetworkAPI/NetworkAPISpec.swift b/{PROJECT_NAME}Tests/Sources/Specs/Data/NetworkAPI/NetworkAPISpec.swift
@@ -11,6 +11,7 @@ final class NetworkAPISpec: AsyncSpec {
 
     override class func spec() {
 
+        // swiftlint:disable closure_body_length
         describe("a NetworkAPI") {
 
             var networkAPI: NetworkAPI!
@@ -60,5 +61,6 @@ final class NetworkAPISpec: AsyncSpec {
                 }
             }
         }
+        // swiftlint:enable closure_body_length
     }
 }