fix: swiftlint warnings

Backbase · Dec 10, 2024 · 82bd008 · 82bd008
1 parent 2c68863
commit 82bd008
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 36 deletions.
diff --git a/Package.swift b/Package.swift
@@ -36,7 +36,9 @@ let package = Package(
             name: "danger-swift",
             url: "https://github.com/danger/swift.git",
             from: "3.5.0"
-        )
+        ),
+        .package(
+            url: "https://github.com/SimplyDanny/SwiftLintPlugins")
     ],
     targets: [
         .target(
@@ -46,7 +48,8 @@ let package = Package(
                 "Yams",
                 "XcodeProj",
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                "Stencil"
+                "Stencil",
+                "SwiftLintPlugins"
             ]
         ),
         .target(
@@ -57,7 +60,9 @@ let package = Package(
         ),
         .testTarget(
             name: "VariantsTests",
-            dependencies: ["Variants"]
+            dependencies: [
+                "Variants"
+            ]
         )
     ]
 )
diff --git a/Sources/VariantsCore/Custom Types/Project/AndroidProject.swift b/Sources/VariantsCore/Custom Types/Project/AndroidProject.swift
@@ -101,7 +101,7 @@ class AndroidProject: Project {
         try gradleFactory.createScript(with: configuration, variant: defaultVariant)
     }
 
-    // swiftlint:disable function_body_length
+    // swiftlint:disable:next function_body_length
     private func setupFastlane(with configuration: AndroidConfiguration, skip: Bool) {
         if skip {
             Logger.shared.logInfo("Skipped Fastlane setup", item: "")
@@ -183,7 +183,6 @@ class AndroidProject: Project {
             }
         }
     }
-    // swiftlint:enable function_body_length
 
     private func storeFastlaneParams(for variant: AndroidVariant, configuration: AndroidConfiguration) throws {
         var customProperties: [CustomProperty] = (variant.custom ?? []) + (configuration.custom ?? [])

diff --git a/Sources/VariantsCore/Custom Types/Project/iOSProject.swift b/Sources/VariantsCore/Custom Types/Project/iOSProject.swift
@@ -5,12 +5,12 @@
 //  Created by Balazs Toth
 //
 
+// swiftlint:disable type_name
+
 import Foundation
 import ArgumentParser
 import PathKit
 
-// swiftlint:disable type_name
-
 class iOSProject: Project {
     init(
         specHelper: SpecHelper,
@@ -140,7 +140,7 @@ class iOSProject: Project {
             }
     }
 
-    // swiftlint:disable function_body_length
+    // swiftlint:disable:next function_body_length
     private func setupFastlane(with configuration: iOSConfiguration, skip: Bool) {
         if skip {
             Logger.shared.logInfo("Skipped Fastlane setup", item: "")
@@ -225,7 +225,6 @@ class iOSProject: Project {
             }
         }
     }
-    // swiftlint:enable function_body_length
 
     private func storeFastlaneParams(_ properties: [CustomProperty]) throws {
         let fastlaneProperties = properties.filter { $0.destination == .fastlane }

diff --git a/Sources/VariantsCore/Helpers/SpecHelper.swift b/Sources/VariantsCore/Helpers/SpecHelper.swift
@@ -5,11 +5,11 @@
 //  Created by Arthur Alves
 //
 
+// swiftlint:disable type_name
+
 import Foundation
 import PathKit
 
-// swiftlint:disable type_name
-
 enum iOSProjectKey: String, CaseIterable {
     case project = "PROJECT"
     case target = "TARGET"

diff --git a/Sources/VariantsCore/Schemas/iOS/iOSConfiguration.swift b/Sources/VariantsCore/Schemas/iOS/iOSConfiguration.swift
@@ -5,10 +5,10 @@
 //  Created by Arthur Alves
 //
 
-import Foundation
-
 // swiftlint:disable type_name
 
+import Foundation
+
 internal extension CodingUserInfoKey {
     static let bundleID = CodingUserInfoKey(rawValue: "bundle_id")!
 }

diff --git a/Sources/VariantsCore/Schemas/iOS/iOSSigning.swift b/Sources/VariantsCore/Schemas/iOS/iOSSigning.swift
@@ -5,10 +5,10 @@
 //  Created by Arthur Alves
 //
 
-import Foundation
-
 // swiftlint:disable type_name
 
+import Foundation
+
 struct iOSSigning: Codable {
     let teamName: String?
     let teamID: String?

diff --git a/Sources/VariantsCore/Schemas/iOS/iOSTarget.swift b/Sources/VariantsCore/Schemas/iOS/iOSTarget.swift
@@ -5,10 +5,10 @@
 //  Created by Arthur Alves
 //
 
-import Foundation
-
 // swiftlint:disable type_name
 
+import Foundation
+
 public typealias NamedTarget = (key: String, value: iOSTarget)
 
 public struct iOSTarget: Codable {

diff --git a/Sources/VariantsCore/Schemas/iOS/iOSVariant.swift b/Sources/VariantsCore/Schemas/iOS/iOSVariant.swift
@@ -5,10 +5,10 @@
 //  Created by Arthur Alves
 //
 
-import Foundation
-
 // swiftlint:disable type_name
 
+import Foundation
+
 public struct iOSVariant: Variant {
     let name: String
     let versionName: String

diff --git a/Tests/VariantsCoreTests/Mocks/MockXCcodeConfigFactory.swift b/Tests/VariantsCoreTests/Mocks/MockXCcodeConfigFactory.swift
@@ -5,10 +5,11 @@
 //  Created by Arthur Alves
 //
 
+// swiftlint:disable colon
+
 import Foundation
 import PathKit
 @testable import VariantsCore
-// swiftlint:disable colon
 
 class MockXCcodeConfigFactory: XCFactory {
     var writeContentCache: [(content: String, file: Path, force: Bool)] = []

diff --git a/Tests/VariantsCoreTests/YamlParserTests.swift b/Tests/VariantsCoreTests/YamlParserTests.swift
@@ -74,7 +74,8 @@ class YamlParserTests: XCTestCase {
             }
         }
     }
-    // swiftlint:disable function_body_length
+
+    // swiftlint:disable:next function_body_length
     func testExtractConfiguration_valid_iOS() {
         let parser = YamlParser()
         do {
@@ -167,7 +168,7 @@ class YamlParserTests: XCTestCase {
             XCTAssertTrue(((error as? DecodingError) == nil))
         }
     }
-    // swiftlint:enable function_body_length
+
     func testExtractConfiguration_valid_android() {
         let parser = YamlParser()
         do {

diff --git a/Tests/VariantsCoreTests/iOSProjectTests.swift b/Tests/VariantsCoreTests/iOSProjectTests.swift
@@ -5,11 +5,12 @@
 //  Created by Arthur Alves
 //
 
+// swiftlint:disable type_name
+
 import XCTest
 import PathKit
 import ArgumentParser
 @testable import VariantsCore
-// swiftlint:disable type_name
 
 class iOSProjectTests: XCTestCase {
     let specHelperMock = SpecHelperMock(

diff --git a/Tests/VariantsCoreTests/iOSSigningTests.swift b/Tests/VariantsCoreTests/iOSSigningTests.swift
@@ -5,11 +5,11 @@
 //  Created by Roman Huti
 //
 
+// swiftlint:disable type_name
+
 import XCTest
 @testable import VariantsCore
 
-// swiftlint:disable type_name
-
 final class iOSSigningTests: XCTestCase {
 
     func testMergeValidSignings() throws {

diff --git a/Tests/VariantsTests/InitCommandTests.swift b/Tests/VariantsTests/InitCommandTests.swift
@@ -5,11 +5,11 @@
 //  Created by Arthur Alves
 //
 
+// swiftlint:disable line_length
+
 import XCTest
 import class Foundation.Bundle
 
-// swiftlint:disable line_length
-
 final class InitCommandTests: XCTestCase {
     func testUsage_help() throws {
         let arguments = ["init", "--help"]
@@ -33,8 +33,9 @@ final class InitCommandTests: XCTestCase {
         let output = try CLIExecutor.shared.run(with: arguments)
         XCTAssertEqual(output, expectedOutput)
     }
-
-    #warning("Test 'testUsage_noExtraArguments' will always fail when running from Xcode.")
+
+    /// Note:
+    /// Test testUsage_noExtraArguments' will always fail when running from Xcode.
     func testUsage_noExtraArguments() throws {
         let arguments = ["init"]
 

diff --git a/Variants.xcodeproj/project.pbxproj b/Variants.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -601,6 +601,7 @@
 			buildPhases = (
 				8E1B9CC9254AC1E700DD0204 /* Headers */,
 				8E1B9CCA254AC1E700DD0204 /* Sources */,
+				2D70A7582D0854F000DF5272 /* ShellScript */,
 				8E1B9CCB254AC1E700DD0204 /* Frameworks */,
 				8E1B9CCC254AC1E700DD0204 /* Resources */,
 			);
@@ -643,6 +644,7 @@
 			buildConfigurationList = OBJ_379 /* Build configuration list for PBXNativeTarget "Variants" */;
 			buildPhases = (
 				OBJ_382 /* Sources */,
+				2D70A7562D08548E00DF5272 /* ShellScript */,
 				OBJ_421 /* Frameworks */,
 				8E1BA14E254C43A900DD0204 /* Embed Frameworks */,
 			);
@@ -710,6 +712,7 @@
 				8E1BA105254C3FD000DD0204 /* XCRemoteSwiftPackageReference "xcodeproj" */,
 				8E1BA10E254C3FFF00DD0204 /* XCRemoteSwiftPackageReference "swift-argument-parser" */,
 				8E8A483325514BE00056F79F /* XCRemoteSwiftPackageReference "Stencil" */,
+				2D70A7512D08525300DF5272 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
 			);
 			productRefGroup = OBJ_274 /* Products */;
 			projectDirPath = "";
@@ -750,6 +753,45 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		2D70A7562D08548E00DF5272 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "SWIFT_PACKAGE_DIR=\"${BUILD_DIR%Build/*}SourcePackages/artifacts\"\nSWIFTLINT_CMD=$(ls \"$SWIFT_PACKAGE_DIR\"/swiftlintplugins/SwiftLintBinary/SwiftLintBinary.artifactbundle/swiftlint-*/bin/swiftlint | head -n 1)\n\nif test -f \"$SWIFTLINT_CMD\" 2>&1\nthen\n    \"$SWIFTLINT_CMD\"\nelse\n    echo \"warning: `swiftlint` command not found - See https://github.com/realm/SwiftLint#installation for installation instructions.\"\nfi\n";
+		};
+		2D70A7582D0854F000DF5272 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "SWIFT_PACKAGE_DIR=\"${BUILD_DIR%Build/*}SourcePackages/artifacts\"\nSWIFTLINT_CMD=$(ls \"$SWIFT_PACKAGE_DIR\"/swiftlintplugins/SwiftLintBinary/SwiftLintBinary.artifactbundle/swiftlint-*/bin/swiftlint | head -n 1)\n\nif test -f \"$SWIFTLINT_CMD\" 2>&1\nthen\n    \"$SWIFTLINT_CMD\"\nelse\n    echo \"warning: `swiftlint` command not found - See https://github.com/realm/SwiftLint#installation for installation instructions.\"\nfi\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		8E1B9CCA254AC1E700DD0204 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -1481,6 +1523,14 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
+		2D70A7512D08525300DF5272 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.57.1;
+			};
+		};
 		8E1BA0F3254C3F3E00DD0204 /* XCRemoteSwiftPackageReference "PathKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/kylef/PathKit.git";

diff --git a/samples/ios/VariantsTestApp/VariantsTestApp/ViewController.swift b/samples/ios/VariantsTestApp/VariantsTestApp/ViewController.swift
@@ -7,9 +7,4 @@
 
 import UIKit
 
-class ViewController: UIViewController {
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        // Do any additional setup after loading the view.
-    }
-}
+class ViewController: UIViewController { }