wip: updated swiftlint and swiftformat to latest version

Mochi-Team · Oct 13, 2023 · ad01510 · ad01510
1 parent c09489a
commit ad01510
Show file tree

Hide file tree

Showing 49 changed files with 127 additions and 158 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -31,4 +31,4 @@ jobs:
       - name: Lint code using SwiftFormat
         run: |
           swiftformat --version
-          swiftformat --config .swiftformat.yml --lint --quiet .
+          swiftformat --config .swiftformat.yml --lint --quiet --reporter github-actions-log .
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.8
+5.9
diff --git a/.swiftformat.yml b/.swiftformat.yml
@@ -57,3 +57,7 @@
 # op-ins (disable)
 
 --disable wrapMultilineStatementBraces
+
+# exclude
+--exclude "**/Package/*"
+--exclude "**/Package.swift"
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -5,6 +5,7 @@ included:
 
 excluded:
   - "**/.build"
+  - "**/Package"
 
 disabled_rules:
   - nesting

diff --git a/App/Mochi.xcodeproj/project.pbxproj b/App/Mochi.xcodeproj/project.pbxproj
@@ -124,6 +124,7 @@
 				13C18B8E29CE6CC200C14F26 /* Frameworks */,
 				13C18B8F29CE6CC200C14F26 /* Resources */,
 				1345C12F29E079120009AB4E /* Run Swiftlint Script */,
+				13BC25D22AD895AE001DAE2A /* Run SwiftFormat Script */,
 			);
 			buildRules = (
 			);
@@ -202,6 +203,25 @@
 			shellPath = /bin/sh;
 			shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftlint > /dev/null; then\n  swiftlint --config ../.swiftlint.yml ../\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
+		13BC25D22AD895AE001DAE2A /* Run SwiftFormat Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run SwiftFormat Script";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# export PATH=\"$PATH:/opt/homebrew/bin\"\n# if which swiftformat >/dev/null; then\n#     swiftformat --config ../.swiftformat.yml --lint ../\n# else\n#   echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\n# fi\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/App/Shared/AppDelegate.swift b/App/Shared/AppDelegate.swift
@@ -18,7 +18,7 @@ let store = Store(
     reducer: { AppFeature() }
 )
 
-@UIApplicationMain
+@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(
         _: UIApplication,

diff --git a/Package/Sources/Clients/AnalyticsClient.swift b/Package/Sources/Clients/AnalyticsClient.swift
@@ -1,6 +1,6 @@
 //
-//  File.swift
-//  
+//  AnalyticsClient.swift
+//
 //
 //  Created by ErrorErrorError on 10/4/23.
 //  

diff --git a/Sources/Clients/BuildClient/BuildClient.swift b/Sources/Clients/BuildClient/BuildClient.swift
@@ -1,9 +1,9 @@
 //
-//  File.swift
-//  
+//  BuildClient.swift
+//
 //
 //  Created by ErrorErrorError on 7/28/23.
-//  
+//
 //
 
 import Dependencies

diff --git a/Sources/Clients/DatabaseClient/Client.swift b/Sources/Clients/DatabaseClient/Client.swift
@@ -33,8 +33,6 @@ public extension DatabaseClient {
     }
 }
 
-// MARK: DependencyKey
-
 extension DatabaseClient: DependencyKey {}
 
 public extension DependencyValues {

diff --git a/Sources/Clients/DatabaseClient/Supporting Files/Cast.swift b/Sources/Clients/DatabaseClient/Supporting Files/Cast.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  Case.swift
 //
 //
 //  Created by ErrorErrorError on 5/16/23.

diff --git a/Sources/Clients/DatabaseClient/Supporting Files/Entity.swift b/Sources/Clients/DatabaseClient/Supporting Files/Entity.swift
@@ -1,9 +1,9 @@
 //
-//  File.swift
-//  
+//  Entity.swift
+//
 //
 //  Created by ErrorErrorError on 9/12/23.
-//  
+// 
 //
 
 import CoreData
@@ -21,14 +21,11 @@ public extension Entity {
     static var entityName: String { .init(describing: Self.self) }
 }
 
-// MARK: - EntityError
-
 public enum EntityError: Error {
     case managedObjectIdIsNotPermanent
 }
 
 extension Entity {
-
     /// Decodes an NSManagedObject data to Entity type
     ///
     init(id: NSManagedObjectID, context: NSManagedObjectContext) throws {

diff --git a/Sources/Clients/DatabaseClient/Supporting Files/TransformableValue.swift b/Sources/Clients/DatabaseClient/Supporting Files/TransformableValue.swift
@@ -168,8 +168,6 @@ extension TransformableValue {
             return
         } else if Self.Primitive.self == Int16.self {
             return
-        } else if Self.Primitive.self == Int16.self {
-            return
         } else if Self.Primitive.self == Int32.self {
             return
         } else if Self.Primitive.self == Int64.self {

diff --git a/Sources/Clients/FileClient/Client.swift b/Sources/Clients/FileClient/Client.swift
@@ -1,9 +1,9 @@
 //
 //  Client.swift
-//  
+//
 //
 //  Created by ErrorErrorError on 10/6/23.
-//  
+// 
 //
 
 import ComposableArchitecture

diff --git a/Sources/Clients/ModuleClient/Client.swift b/Sources/Clients/ModuleClient/Client.swift
@@ -46,7 +46,7 @@ extension SwiftSoup.Exception: Equatable {
     public static func == (lhs: Exception, rhs: Exception) -> Bool {
         switch (lhs, rhs) {
         case let (.Error(typeOne, messageOne), .Error(typeTwo, messageTwo)):
-            return typeOne == typeTwo && messageOne == messageTwo
+            typeOne == typeTwo && messageOne == messageTwo
         }
     }
 }

diff --git a/Sources/Clients/ModuleClient/WASM+Bindings/Binding+Env.swift b/Sources/Clients/ModuleClient/WASM+Bindings/Binding+Env.swift
@@ -1,5 +1,5 @@
 //
-//  Bindings+Env.swift
+//  Binding+Env.swift
 //
 //
 //  Created by ErrorErrorError on 7/25/23.

diff --git a/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Core.swift b/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Core.swift
@@ -181,3 +181,5 @@ extension ModuleClient.Instance {
         }
     }
 }
+
+// swiftlint:enable closure_parameter_position
diff --git a/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Crypto.swift b/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Crypto.swift
@@ -1,5 +1,5 @@
 //
-//  HostModuleInterop+Crypto.swift
+//  Bindings+Crypto.swift
 //
 //
 //  Created by ErrorErrorError on 6/7/23.
@@ -136,3 +136,5 @@ extension ModuleClient.Instance {
         }
     }
 }
+
+// swiftlint:enable closure_parameter_position
diff --git a/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+HTML.swift b/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+HTML.swift
@@ -1,5 +1,5 @@
 //
-//  HostBindings+HTML.swift
+//  Bindings+HTML.swift
 //
 //
 //  Created by ErrorErrorError on 5/9/23.
@@ -224,3 +224,4 @@ extension ModuleClient.Instance {
         }
     }
 }
+// swiftlint:enable closure_parameter_position
diff --git a/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+JSON.swift b/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+JSON.swift
@@ -1,5 +1,5 @@
 //
-//  HostModuleInterop+Json.swift
+//  Bindings+JSON.swift
 //
 //
 //  Created by ErrorErrorError on 5/9/23.
@@ -24,3 +24,5 @@ extension ModuleClient.Instance {
         }
     }
 }
+
+// swiftlint:enable closure_parameter_position
diff --git a/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Meta.swift b/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Meta.swift
@@ -1,5 +1,5 @@
 //
-//  HostModuleInterop+Structs.swift
+//  Bindings+Meta.swift
 //
 //
 //  Created by ErrorErrorError on 5/9/23.
@@ -12,7 +12,7 @@ import WasmInterpreter
 
 // MARK: Meta Structs Imports
 
-// swiftlint:disable closure_parameter_position closure_parameter_position
+// swiftlint:disable closure_parameter_position
 extension ModuleClient.Instance {
     func metaImports() -> WasmInstance.Import {
         WasmInstance.Import(namespace: "structs_meta") {
@@ -236,3 +236,5 @@ extension ModuleClient.Instance {
         }
     }
 }
+
+// swiftlint:enable closure_parameter_position
diff --git a/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Request.swift b/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Request.swift
@@ -1,5 +1,5 @@
 //
-//  HostModuleInterop+Http.swift
+//  Bindings+Request.swift
 //
 //
 //  Created by ErrorErrorError on 5/9/23.
@@ -116,3 +116,5 @@ extension ModuleClient.Instance {
         }
     }
 }
+
+// swiftlint:enable closure_parameter_position
diff --git a/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Video.swift b/Sources/Clients/ModuleClient/WASM+Bindings/Bindings+Video.swift
@@ -1,5 +1,5 @@
 //
-//  HostModuleInterop+Video.swift
+//  Bindings+Video.swift
 //
 //
 //  Created by ErrorErrorError on 6/1/23.
@@ -116,3 +116,5 @@ extension ModuleClient.Instance {
         }
     }
 }
+
+// swiftlint:enable closure_parameter_position
diff --git a/Sources/Clients/PlayerClient/Extension/AVMediaSelectionGroup+Struct.swift b/Sources/Clients/PlayerClient/Extension/AVMediaSelectionGroup+Struct.swift
@@ -1,5 +1,5 @@
 //
-//  AVClasses+Struct.swift
+//  AVMediaSelectionGroup+Struct.swift
 //
 //
 //  Created by ErrorErrorError on 7/16/23.

diff --git a/Sources/Clients/PlayerClient/Extension/AVPlayer+Extension.swift b/Sources/Clients/PlayerClient/Extension/AVPlayer+Extension.swift
@@ -1,5 +1,5 @@
 //
-//  AVPlayer+AsyncStream.swift
+//  AVPlayer+Extension.swift
 //
 //
 //  Created by ErrorErrorError on 6/10/23.

diff --git a/Sources/Clients/PlayerClient/Extension/CMTime+Extension.swift b/Sources/Clients/PlayerClient/Extension/CMTime+Extension.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  CMTime+Extension.swift
 //
 //
 //  Created by ErrorErrorError on 6/11/23.

diff --git a/Sources/Clients/UserSettingsClient/AppIcon.swift b/Sources/Clients/UserSettingsClient/AppIcon.swift
@@ -3,7 +3,7 @@
 //
 //
 //  Created by ErrorErrorError on 10/11/23.
-//  
+//
 //
 
 import Foundation

diff --git a/Sources/Features/App/AppDelegateFeature.swift b/Sources/Features/App/AppDelegateFeature.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  AppDelegateFeature.swift
 //
 //
 //  Created by ErrorErrorError on 5/19/23.
@@ -33,7 +33,7 @@ public struct AppDelegateFeature: Reducer {
         Reduce { _, action in
             switch action {
             case .didFinishLaunching:
-                return .run { _ in
+                .run { _ in
                     try? await databaseClient.initialize()
                     try? await moduleClient.initialize()
                 }

diff --git a/Sources/Features/App/AppFeature+View.swift b/Sources/Features/App/AppFeature+View.swift
@@ -142,15 +142,12 @@ extension AppFeature.View {
     }
 }
 
-// MARK: - AppFeatureView_Previews
-
-struct AppFeatureView_Previews: PreviewProvider {
-    static var previews: some View {
-        AppFeature.View(
-            store: .init(
-                initialState: .init(),
-                reducer: { AppFeature() }
-            )
+#Preview {
+    AppFeature.View(
+        store: .init(
+            initialState: .init(),
+            reducer: { AppFeature() }
         )
-    }
+    )
+
 }