update swiftlint

.swiftlint.yml

@@ -43,8 +43,15 @@ opt_in_rules:
   - unavailable_function
   - no_space_in_method_call
   - discouraged_assert
+  # - legacy_objc_type
+  # - file_name
   - file_name_no_space
   - discouraged_none_name
+  - return_value_from_void_function
+  - prefer_zero_over_explicit_init
+  - shorthand_optional_binding
+  - xct_specific_matcher
+  - unneeded_synthesized_initializer
 
   # style
   - attributes
@@ -63,19 +70,27 @@ opt_in_rules:
   - unneeded_parentheses_in_closure_argument
   - vertical_whitespace_between_cases
   - prefer_self_in_static_references
+  - comma_inheritance
+  - direct_return
+  - period_spacing
+  - superfluous_else
+  # - sorted_enum_cases
+  - non_overridable_class_declaration
 
   # lint
   - overridden_super_call
   - override_in_extension
   - yoda_condition
-  - anyobject_protocol
   - array_init
   - empty_xctest_method
   - identical_operands
   - prohibited_super_call
-  - unused_capture_list
   - duplicate_enum_cases
   - legacy_multiple
+  - accessibility_label_for_image
+  - lower_acl_than_parent
+  - unhandled_throwing_task
+  - private_swiftui_state
 
 # Rules run by `swiftlint analyze` (experimental)
 analyzer_rules:

Example/ExampleApp/Extensions.swift

@@ -26,8 +26,7 @@ extension UICollectionViewCompositionalLayout {
             var configuration = UICollectionLayoutListConfiguration(appearance: .insetGrouped)
             configuration.headerMode = .supplementary
             configuration.footerMode = .supplementary
-            let section = NSCollectionLayoutSection.list(using: configuration, layoutEnvironment: layoutEnvironment)
-            return section
+            return NSCollectionLayoutSection.list(using: configuration, layoutEnvironment: layoutEnvironment)
         }
     }
 }

Sources/CoreDataStackProvider.swift

@@ -123,7 +123,7 @@ public struct CoreDataStackProvider {
             }
         }
 
-        if let queue = queue {
+        if let queue {
             queue.async(execute: creationClosure)
         } else {
             creationClosure()

Sources/FetchedResultsDiffableDataSource.swift

@@ -61,13 +61,12 @@ extension _FetchedResultsDiffableDataSource {
             }
             let sectionInfo = controller.section(at: indexPath.section)
             let config = configMap[kind]!
-            let view = config._dequeueAndConfigureViewFor(
+            return config._dequeueAndConfigureViewFor(
                 collectionView: collectionView,
                 at: indexPath,
                 with: object,
                 in: sectionInfo
             )
-            return view
         }
     }
 }

Sources/Migrate.swift

@@ -122,11 +122,9 @@ func findModelsInBundle(_ bundle: Bundle) -> [NSManagedObjectModel] {
     .joined()
     .sorted { $0.absoluteString < $1.absoluteString }
 
-    let managedObjectModels = modelVersionFileURLs.compactMap { url -> NSManagedObjectModel? in
+    return modelVersionFileURLs.compactMap { url -> NSManagedObjectModel? in
         NSManagedObjectModel(contentsOf: url)
     }
-
-    return managedObjectModels
 }
 
 func buildMigrationMappingSteps(bundle: Bundle,

Sources/NSManagedObjectContext+Extensions.swift

@@ -59,6 +59,8 @@ extension NSManagedObjectContext {
                 completion?(.failure(error))
             }
         }
+
+        // swiftlint:disable:next void_function_in_ternary
         wait ? self.performAndWait(block) : self.perform(block)
     }
 }

scripts/lint.zsh

@@ -9,10 +9,13 @@
 #
 #  Runs SwiftLint and checks for installation of correct version.
 
+set -e
+export PATH="$PATH:/opt/homebrew/bin"
+
 PROJECT="JSQCoreDataKit.xcodeproj"
 SCHEME="JSQCoreDataKit"
 
-VERSION="0.46.2"
+VERSION="0.54.0"
 
 FOUND=$(swiftlint version)
 LINK="https://github.com/realm/SwiftLint"
@@ -36,15 +39,15 @@ if which swiftlint >/dev/null; then
         if [[ "$argval" == "fix" ]]; then
             echo "Auto-correcting lint errors..."
             echo ""
-            swiftlint --fix --config $CONFIG && swiftlint --config $CONFIG
+            swiftlint --fix --progress --config $CONFIG && swiftlint --config $CONFIG
             echo ""
         # run analyze
         elif [[ "$argval" == "analyze" ]]; then
             LOG="xcodebuild.log"
             echo "Running anaylze..."
             echo ""
             xcodebuild -scheme $SCHEME -project $PROJECT clean build-for-testing > $LOG
-            swiftlint analyze --fix --format --strict --config $CONFIG --compiler-log-path $LOG
+            swiftlint analyze --fix --progress --format --strict --config $CONFIG --compiler-log-path $LOG
             rm $LOG
             echo ""
         else