Merge pull request #60 from RakuyoKit/feature/swiftformat

Feature/swiftformat
RakuyoKit · Jul 15, 2024 · 6240e53 · 6240e53
2 parents 1c8802f + de20816
commit 6240e53
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -23,26 +23,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/groue/GRDB.swift.git",
       "state" : {
-        "revision" : "639fa9168d36931b36a79e60dc06b7d23852f1f4",
-        "version" : "6.27.0"
+        "revision" : "78448cf8f4ed39b259bd6718d074a57ae3b2e8ba",
+        "version" : "6.28.0"
       }
     },
     {
       "identity" : "ralog",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/RakuyoKit/RaLog.git",
       "state" : {
-        "revision" : "30f50a95eb90d85f2c9bfd7321bfbbcc545b8fcc",
-        "version" : "1.7.3"
+        "revision" : "f89b6fe7ca4138f717a83f18bb80ce248acdbb6d",
+        "version" : "1.7.4"
       }
     },
     {
       "identity" : "swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/RakuyoKit/swift.git",
       "state" : {
-        "revision" : "426104d8792ffe1cf1c6677a4820c10801f12b5c",
-        "version" : "1.2.0"
+        "revision" : "c5638568c4383ef7e72c10c76a682264b9fd4362",
+        "version" : "1.3.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -27,8 +27,8 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.8.2"),
         .package(url: "https://github.com/airbnb/epoxy-ios.git", from: "0.10.0"),
-        .package(url: "https://github.com/groue/GRDB.swift.git", from: "6.27.0"),
-        .package(url: "https://github.com/RakuyoKit/RaLog.git", from: "1.7.3"),
+        .package(url: "https://github.com/groue/GRDB.swift.git", from: "6.28.0"),
+        .package(url: "https://github.com/RakuyoKit/RaLog.git", from: "1.7.4"),
         .package(url: "https://github.com/devxoul/Then.git", from: "3.0.0"),
     ],
     targets: [
@@ -143,4 +143,4 @@ let package = Package(
 )
 
 // Add the Rakuyo Swift formatting plugin if possible
-package.dependencies.append(.package(url: "https://github.com/RakuyoKit/swift.git", from: "1.1.4"))
+package.dependencies.append(.package(url: "https://github.com/RakuyoKit/swift.git", from: "1.2.2"))
diff --git a/Sources/Base/Controller/BaseNavigationController.swift b/Sources/Base/Controller/BaseNavigationController.swift
@@ -14,7 +14,7 @@ import RAKConfig
 @objc(RAKBaseNavigationController)
 open class BaseNavigationController: UINavigationController {
     #if !os(tvOS)
-    private var popDelegateProxy: NavigationControllerPopDelegateProxy?
+    private var popDelegateProxy: NavigationControllerPopDelegateProxy? = nil
     #endif
 
     override open func viewDidLoad() {

diff --git a/Sources/Base/View/Fast/FastListView.swift b/Sources/Base/View/Fast/FastListView.swift
@@ -26,7 +26,7 @@ public protocol FastListView: NSObjectProtocol {
 
 // MARK: - UITableView
 
-private var tableViewKey: Void?
+private var tableViewKey: Void? = nil
 
 extension UITableView: FastListView {
     public var registeredIdentifiers: [String] {
@@ -56,7 +56,7 @@ extension UITableView: FastListView {
 
 // MARK: - UICollectionView
 
-private var collectionViewKey: Void?
+private var collectionViewKey: Void? = nil
 
 extension UICollectionView: FastListView {
     public var registeredIdentifiers: [String] {

diff --git a/Sources/Codable/RAKDecodable.swift b/Sources/Codable/RAKDecodable.swift
@@ -88,7 +88,7 @@ extension RAKDecodable {
         let jsonObject = try? JSONSerialization.jsonObject(with: _jsonData, options: .allowFragments)
         var result: Any? = jsonObject
         var abort = false
-        var next = jsonObject as? [String: Any]
+        var next = (jsonObject as? [String: Any])
 
         for path in paths {
             if path.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty || abort {

diff --git a/Sources/Combine/Core/DelegateProxy/DelegateProxyType.swift b/Sources/Combine/Core/DelegateProxy/DelegateProxyType.swift
@@ -1,7 +1,7 @@
 #if !(os(iOS) && (arch(i386) || arch(arm)))
 import Foundation
 
-private var associatedKey: Void?
+private var associatedKey: Void? = nil
 
 public protocol DelegateProxyType {
     associatedtype Object

diff --git a/Sources/Core/Extensions/UIView+RAK.swift b/Sources/Core/Extensions/UIView+RAK.swift
@@ -56,8 +56,8 @@ extension UIView {
     }
 }
 
-private var kIsHideKeyboardWhenTapKey: Void?
-private var kHideKeyboardGestureKey: Void?
+private var kIsHideKeyboardWhenTapKey: Void? = nil
+private var kHideKeyboardGestureKey: Void? = nil
 
 // MARK: - Animation
 

diff --git a/Sources/Core/Utilities/OptionalSize.swift b/Sources/Core/Utilities/OptionalSize.swift
@@ -11,9 +11,9 @@ import Foundation
 // MARK: - OptionalSize
 
 public struct OptionalSize<T: FloatingPoint> {
-    public var width: T?
+    public var width: T? = nil
 
-    public var height: T?
+    public var height: T? = nil
 
     public init(width: T? = nil, height: T? = nil) {
         self.width = width