diff --git a/.swiftlint.yml b/.swiftlint.yml index 48a1680..2abbdd2 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -168,6 +168,7 @@ only_rules: # - required_deinit - required_enum_case - return_arrow_whitespace + - self_in_property_initialization - shorthand_operator - single_test_class - sorted_first_last diff --git a/pass/Controllers/AdvancedSettingsTableViewController.swift b/pass/Controllers/AdvancedSettingsTableViewController.swift index 30f1ef5..677118f 100644 --- a/pass/Controllers/AdvancedSettingsTableViewController.swift +++ b/pass/Controllers/AdvancedSettingsTableViewController.swift @@ -17,7 +17,7 @@ class AdvancedSettingsTableViewController: UITableViewController { @IBOutlet var discardChangesTableViewCell: UITableViewCell! let passwordStore = PasswordStore.shared - let encryptInASCIIArmoredSwitch: UISwitch = { + private lazy var encryptInASCIIArmoredSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() diff --git a/pass/Controllers/GeneralSettingsTableViewController.swift b/pass/Controllers/GeneralSettingsTableViewController.swift index 46b7203..2d2fdc7 100644 --- a/pass/Controllers/GeneralSettingsTableViewController.swift +++ b/pass/Controllers/GeneralSettingsTableViewController.swift @@ -12,7 +12,7 @@ import UIKit class GeneralSettingsTableViewController: BasicStaticTableViewController { let passwordStore = PasswordStore.shared - let hideUnknownSwitch: UISwitch = { + private lazy var hideUnknownSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() @@ -20,7 +20,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController { return uiSwitch }() - let hideOTPSwitch: UISwitch = { + private lazy var hideOTPSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() @@ -28,7 +28,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController { return uiSwitch }() - let autoCopyOTPSwitch: UISwitch = { + private lazy var autoCopyOTPSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() @@ -36,7 +36,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController { return uiSwitch }() - let rememberPGPPassphraseSwitch: UISwitch = { + private lazy var rememberPGPPassphraseSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() @@ -45,7 +45,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController { return uiSwitch }() - let rememberGitCredentialPassphraseSwitch: UISwitch = { + private lazy var rememberGitCredentialPassphraseSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() @@ -54,7 +54,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController { return uiSwitch }() - let enableGPGIDSwitch: UISwitch = { + private lazy var enableGPGIDSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() @@ -63,7 +63,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController { return uiSwitch }() - let showFolderSwitch: UISwitch = { + private lazy var showFolderSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() @@ -72,7 +72,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController { return uiSwitch }() - let hidePasswordImagesSwitch: UISwitch = { + private lazy var hidePasswordImagesSwitch: UISwitch = { let uiSwitch = UISwitch() uiSwitch.onTintColor = Colors.systemBlue uiSwitch.sizeToFit() diff --git a/scripts/swiftlint.sh b/scripts/swiftlint.sh index 2bc2422..e5888c3 100755 --- a/scripts/swiftlint.sh +++ b/scripts/swiftlint.sh @@ -1,4 +1,4 @@ -SWIFTLINT_VERSION="0.44.*" +SWIFTLINT_VERSION="0.45.*" if [[ "${CI}" == "true" ]]; then echo "Running in a Continuous Integration environment. Linting is skipped."