Update SwiftLint and SwiftFormat

.github/workflows/deploying.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         channel: ['beta', 'release']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '2.7'

.github/workflows/linting.yml

@@ -6,7 +6,7 @@ jobs:
   swiftformat:
     runs-on: macos-12
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '2.7'
@@ -26,7 +26,7 @@ jobs:
   swiftlint:
     runs-on: macos-12
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '2.7'

.github/workflows/testing.yml

@@ -6,7 +6,7 @@ jobs:
   testing:
     runs-on: macos-12
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '2.7'
@@ -15,7 +15,7 @@ jobs:
       run: |
         brew update
         brew install carthage swiftformat
-        brew install go || brew link --overwrite go
+        brew install go@1.20 || brew link --overwrite go
         brew install swiftlint || brew link --overwrite swiftlint
         gem install bundler
     - uses: actions/cache@v3

.swiftformat

@@ -19,6 +19,7 @@
     blankLinesAroundMark,           \
     blankLinesAtEndOfScope,         \
     blankLinesAtStartOfScope,       \
+    blankLinesBetweenChainedFunctions,  \
 #    blankLinesBetweenImports,       \
     blankLinesBetweenScopes,        \
     blockComments,                  \
@@ -32,6 +33,7 @@
     extensionAccessControl,         \
     fileHeader,                     \
 #    genericExtensions,              \
+    headerFileName,                 \
     hoistPatternLet,                \
     indent,                         \
     initCoderUnavailable,           \
@@ -41,9 +43,11 @@
     linebreaks,                     \
     modifierOrder,                  \
 #    markTypes,                      \
+    noExplicitOwnership,            \
     numberFormatting,               \
 #    opaqueGenericParameters,        \
 #    organizeDeclarations,           \
+#    preferForLoop,                  \
     preferKeyPath,                  \
     redundantBackticks,             \
     redundantBreak,                 \
@@ -52,6 +56,7 @@
     redundantFileprivate,           \
     redundantGet,                   \
     redundantInit,                  \
+    redundantInternal,              \
     redundantLet,                   \
     redundantLetError,              \
     redundantNilInit,               \
@@ -62,11 +67,13 @@
     redundantRawValues,             \
     redundantReturn,                \
     redundantSelf,                  \
+    redundantStaticSelf,            \
     redundantType,                  \
     redundantVoidReturnType,        \
     semicolons,                     \
-    sortedImports,                  \
-    sortedSwitchCases,              \
+    sortImports,                    \
+    sortSwitchCases,                \
+    sortTypealiases,                \
     spaceAroundBraces,              \
     spaceAroundBrackets,            \
     spaceAroundComments,            \
@@ -93,6 +100,8 @@
     wrapAttributes,                 \
     wrapConditionalBodies,          \
 #    wrapEnumCases,                  \
+    wrapLoopBodies,                 \
+    wrapMultilineConditionalAssignment, \
 #    wrapMultilineStatementBraces,   \
     wrapSingleLineComments,         \
 #    wrapSwitchCases,                \

.swiftlint.yml

@@ -66,6 +66,8 @@ attributes:
 closure_body_length:
   warning: 40
   error: 60
+explicit_init:
+  include_bare_init: true
 identifier_name:
   excluded: ["id", "to", "Defaults"]
   allowed_symbols: ["_"]

pass.xcodeproj/project.pbxproj

@@ -199,7 +199,7 @@
 		DC4914961E434301007FF592 /* LabelTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4914941E434301007FF592 /* LabelTableViewCell.swift */; };
 		DC4914991E434600007FF592 /* PasswordDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4914981E434600007FF592 /* PasswordDetailTableViewController.swift */; };
 		DC5F385B1E56AADB00C69ACA /* PGPKeyArmorImportTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC5F385A1E56AADB00C69ACA /* PGPKeyArmorImportTableViewController.swift */; };
-		DC8963C01E38EEB900828B09 /* SSHKeyURLImportTableViewController..swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8963BF1E38EEB900828B09 /* SSHKeyURLImportTableViewController..swift */; };
+		DC8963C01E38EEB900828B09 /* SSHKeyURLImportTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC8963BF1E38EEB900828B09 /* SSHKeyURLImportTableViewController.swift */; };
 		DC917BD71E2E8231000FDF54 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC917BD61E2E8231000FDF54 /* AppDelegate.swift */; };
 		DC917BDC1E2E8231000FDF54 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DC917BDA1E2E8231000FDF54 /* Main.storyboard */; };
 		DC917BDE1E2E8231000FDF54 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DC917BDD1E2E8231000FDF54 /* Assets.xcassets */; };
@@ -496,7 +496,7 @@
 		DC4914941E434301007FF592 /* LabelTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LabelTableViewCell.swift; sourceTree = "<group>"; };
 		DC4914981E434600007FF592 /* PasswordDetailTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordDetailTableViewController.swift; sourceTree = "<group>"; };
 		DC5F385A1E56AADB00C69ACA /* PGPKeyArmorImportTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PGPKeyArmorImportTableViewController.swift; sourceTree = "<group>"; };
-		DC8963BF1E38EEB900828B09 /* SSHKeyURLImportTableViewController..swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSHKeyURLImportTableViewController..swift; sourceTree = "<group>"; };
+		DC8963BF1E38EEB900828B09 /* SSHKeyURLImportTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSHKeyURLImportTableViewController.swift; sourceTree = "<group>"; };
 		DC917BD31E2E8231000FDF54 /* Pass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Pass.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DC917BD61E2E8231000FDF54 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		DC917BDB1E2E8231000FDF54 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -982,7 +982,7 @@
 				DC037CA91E4B8EAE00609409 /* SpecialThanksTableViewController.swift */,
 				DCC441531E916382008A90C4 /* SSHKeyArmorImportTableViewController.swift */,
 				30650E7023F82AF8005CCD5E /* SSHKeyFileImportTableViewController.swift */,
-				DC8963BF1E38EEB900828B09 /* SSHKeyURLImportTableViewController..swift */,
+				DC8963BF1E38EEB900828B09 /* SSHKeyURLImportTableViewController.swift */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -1661,7 +1661,7 @@
 				DCC441541E916382008A90C4 /* SSHKeyArmorImportTableViewController.swift in Sources */,
 				306D970E24091CDD006C0E2E /* SwitchTableViewCell.swift in Sources */,
 				A2A61C201EEFABAD00CFE063 /* UtilsExtension.swift in Sources */,
-				DC8963C01E38EEB900828B09 /* SSHKeyURLImportTableViewController..swift in Sources */,
+				DC8963C01E38EEB900828B09 /* SSHKeyURLImportTableViewController.swift in Sources */,
 				DC30F83829BED4E2001EB12B /* PasswordGeneratorUISwitch.swift in Sources */,
 				9AFC87F025B514AD008D6060 /* PasswordDecryptor.swift in Sources */,
 				3066AD6823EE0D6500F65535 /* PGPKeyImporter.swift in Sources */,

pass/AppDelegate.swift

@@ -20,7 +20,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    lazy var passcodeLockPresenter: PasscodeLockPresenter = .init(mainWindow: self.window)
+    lazy var passcodeLockPresenter = PasscodeLockPresenter(mainWindow: self.window)
 
     func application(_: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.

pass/Controllers/AboutRepositoryTableViewController.swift

@@ -13,7 +13,7 @@ class AboutRepositoryTableViewController: BasicStaticTableViewController {
     private static let VALUE_NOT_AVAILABLE = "ValueNotAvailable".localize()
 
     private var needRefresh = false
-    private var indicator: UIActivityIndicatorView = .init(style: .medium)
+    private var indicator = UIActivityIndicatorView(style: .medium)
 
     private let passwordStore = PasswordStore.shared
 

pass/Controllers/BasicStaticTableViewController.swift

@@ -38,11 +38,6 @@ class BasicStaticTableViewController: UITableViewController, MFMailComposeViewCo
         tableData[section].count
     }
 
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-
     override func tableView(_: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cellData = tableData[indexPath.section][indexPath.row]
         let cellDataStyle = cellData[CellDataKey.style] as? CellDataStyle

pass/Controllers/KeyImporter.swift

@@ -24,13 +24,13 @@ protocol KeyImporter {
 
 extension KeyImporter {
     static var isCurrentKeySource: Bool {
-        Defaults.gitSSHKeySource == Self.keySource
+        Defaults.gitSSHKeySource == keySource
     }
 
     static var menuLabel: String {
         if isCurrentKeySource {
-            return "✓ \(Self.label)"
+            return "✓ \(label)"
         }
-        return Self.label
+        return label
     }
 }

pass/Controllers/PGPKeyImporter.swift

@@ -14,7 +14,7 @@ protocol PGPKeyImporter: KeyImporter {
 
 extension PGPKeyImporter {
     static var isCurrentKeySource: Bool {
-        Defaults.pgpKeySource == Self.keySource
+        Defaults.pgpKeySource == keySource
     }
 
     func doAfterImport() {}

pass/Controllers/PasswordDetailTableViewController.swift

@@ -30,7 +30,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     // preserve path so it can be reloaded even if the passwordEntity is deleted during the update process
     private var passwordPath: String?
 
-    private lazy var editUIBarButtonItem: UIBarButtonItem = .init(barButtonSystemItem: .edit, target: self, action: #selector(pressEdit))
+    private lazy var editUIBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(pressEdit))
 
     private struct TableSection {
         var type: PasswordDetailTableViewControllerSectionType

pass/Views/PasswordDetailTitleTableViewCell.swift

@@ -14,14 +14,4 @@ class PasswordDetailTitleTableViewCell: UITableViewCell {
     @IBOutlet var passwordImageImageView: UIImageView!
     @IBOutlet var labelImageConstraint: NSLayoutConstraint!
     @IBOutlet var labelCellConstraint: NSLayoutConstraint!
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-    }
-
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        // Configure the view for the selected state
-    }
 }

passKit/Helpers/DefaultsKeys.swift

@@ -35,6 +35,8 @@ extension SearchBarScope: DefaultsSerializable {}
 extension PasswordGenerator: DefaultsSerializable {}
 
 public extension DefaultsKeys {
+    // swiftlint:disable explicit_init
+
     var pgpKeySource: DefaultsKey<KeySource?> { .init("pgpKeySource") }
     var pgpPublicKeyURL: DefaultsKey<URL?> { .init("pgpPublicKeyURL") }
     var pgpPrivateKeyURL: DefaultsKey<URL?> { .init("pgpPrivateKeyURL") }
@@ -70,4 +72,6 @@ public extension DefaultsKeys {
     var encryptInArmored: DefaultsKey<Bool> { .init("encryptInArmored", defaultValue: false) }
 
     var autoCopyOTP: DefaultsKey<Bool> { .init("autoCopyOTP", defaultValue: false) }
+
+    // swiftlint:enable explicit_init
 }

passKitTests/Crypto/CryptoFrameworkTest.swift

@@ -8,9 +8,10 @@
 
 import XCTest
 
+@testable import Gopenpgp
+
 // swiftformat:disable:next sortedImports
 @testable import passKit
-@testable import Gopenpgp
 
 class CryptoFrameworkTest: XCTestCase {
     private typealias MessageConverter = (CryptoPGPMessage, NSErrorPointer) -> CryptoPGPMessage?

passKitTests/Testbase/TestPGPKeys.swift

@@ -11,7 +11,7 @@ import XCTest
 @testable import passKit
 
 struct PGPTestSet {
-    fileprivate static var ALL_TEST_SETS: [String: PGPTestSet] = [:] // swiftlint:disable:this strict_fileprivate
+    fileprivate static var ALL_TEST_SETS: [String: Self] = [:] // swiftlint:disable:this strict_fileprivate
 
     let publicKey: String
     let privateKey: String

scripts/swiftformat.sh

@@ -1,5 +1,5 @@
 export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}"
-SWIFTFORMAT_VERSION="0.51.*"
+SWIFTFORMAT_VERSION="0.53.*"
 
 if [[ "${CI}" == "true" ]]; then
   echo "Running in a Continuous Integration environment. Formatting is skipped."

scripts/swiftlint.sh

@@ -1,6 +1,6 @@
 export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}"
 
-SWIFTLINT_VERSION="0.52.*"
+SWIFTLINT_VERSION="0.53.*"
 
 if [[  "${CI}" == "true" ]]; then
   echo "Running in a Continuous Integration environment. Linting is skipped."