fix: swift 5.7 고정

MONEYMONG · Sep 20, 2024 · 74ac337 · 74ac337
1 parent 2d88bd0
commit 74ac337
Show file tree

Hide file tree

Showing 25 changed files with 187 additions and 142 deletions.
diff --git a/.package.resolved b/.package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "39b4527b0aa15523ea06a34b7d9de6276b03ac8f0ddf2042b7da3a75163f3e20",
+  "originHash" : "be187523730f57e2e67f885adb181a4b39f93b08e0affc1b04773b10c3e1b62b",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -91,6 +91,15 @@
         "version" : "100.0.0"
       }
     },
+    {
+      "identity" : "kingfisher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/onevcat/Kingfisher",
+      "state" : {
+        "revision" : "4a2333d471e6aa671cbea6ed0c884eac4d90d6fb",
+        "version" : "8.0.1"
+      }
+    },
     {
       "identity" : "leveldb",
       "kind" : "remoteSourceControl",

diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift
@@ -57,6 +57,7 @@ let project = Project(
         base: .init()
           .appleGenericVersioningSystem()
           .marketingVersion("1.2.1")
+          .swiftVersion("5.7")
           .currentProjectVersion("2")
           .cutomSetting()
       ),

diff --git a/Projects/App/Sources/AppDelegate.swift b/Projects/App/Sources/AppDelegate.swift
@@ -2,7 +2,7 @@ import UIKit
 
 import Core
 
-import Pulse
+//@preconcurrency import Pulse
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -11,7 +11,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    URLSessionProxyDelegate.enableAutomaticRegistration()
+    //URLSessionProxyDelegate.enableAutomaticRegistration()
     FirebaseManager.shared.initSDK()
     KakaoAuthManager.shared.initSDK()
     return true

diff --git a/Projects/Core/Core/Project.swift b/Projects/Core/Core/Project.swift
@@ -30,7 +30,8 @@ let project = Project(
       ],
       settings: .settings(base: [
         "DEBUG_INFORMATION_FORMAT": "dwarf-with-dsym",
-        "OTHER_LDFLAGS": "-ObjC"
+        "OTHER_LDFLAGS": "-ObjC",
+        "SWIFT_VERSION": "5.7"
       ]),
       launchArguments: [
         LaunchArgument(name: "IDEPreferLogStreaming=YES", isEnabled: true),

diff --git a/Projects/Core/Utility/Project.swift b/Projects/Core/Utility/Project.swift
@@ -15,7 +15,10 @@ let project = Project(
             deploymentTarget: .iOS(targetVersion: "15.0", devices: .iphone),
             sources: ["Sources/**"],
             dependencies: [
-            ]
+            ],
+            settings: .settings(base: [
+              "SWIFT_VERSION": "5.7"
+            ])
         )
     ]
 )
diff --git a/Projects/Feature/Agency/Project.swift b/Projects/Feature/Agency/Project.swift
@@ -16,7 +16,10 @@ let project = Project(
             sources: ["Sources/**"],
             dependencies: [
               .project(target: "BaseFeature", path: .relativeToRoot("Projects/Feature/Base"))
-            ]
+            ],
+            settings: .settings(base: [
+              "SWIFT_VERSION": "5.7"
+            ])
         ),
         Target(
             name: "AgencyFeatureTests",

diff --git a/Projects/Feature/Base/Project.swift b/Projects/Feature/Base/Project.swift
@@ -17,7 +17,10 @@ let project = Project(
             dependencies: [
               .project(target: "DesignSystem", path: .relativeToRoot("Projects/Shared/DesignSystem")),
               .project(target: "Core", path: .relativeToRoot("Projects/Core/Core"))
-            ]
+            ],
+            settings: .settings(base: [
+              "SWIFT_VERSION": "5.7"
+            ])
         )
     ]
 )
diff --git a/Projects/Feature/Ledger/Project.swift b/Projects/Feature/Ledger/Project.swift
@@ -16,7 +16,10 @@ let project = Project(
             sources: ["Sources/**"],
             dependencies: [
               .project(target: "BaseFeature", path: .relativeToRoot("Projects/Feature/Base"))
-            ]
+            ],
+            settings: .settings(base: [
+              "SWIFT_VERSION": "5.7"
+            ])
         ),
         Target(
             name: "LedgerFeatureTests",

diff --git a/...ure/Ledger/Sources/Scene/Detail/Components/LedgerContentsView/Cell/DefaultImageCell.swift b/...ure/Ledger/Sources/Scene/Detail/Components/LedgerContentsView/Cell/DefaultImageCell.swift
@@ -2,7 +2,8 @@ import UIKit
 
 import DesignSystem
 import Utility
-import Core
+import BaseFeature
+import ThirdPartyLips
 
 import Kingfisher
 import ReactorKit

diff --git a/Projects/Feature/Main/Project.swift b/Projects/Feature/Main/Project.swift
@@ -19,7 +19,10 @@ let project = Project(
                 .project(target: "MyPageFeature", path: .relativeToRoot("Projects/Feature/MyPage")),
                 .project(target: "AgencyFeature", path: .relativeToRoot("Projects/Feature/Agency")),
                 .project(target: "LedgerFeature", path: .relativeToRoot("Projects/Feature/Ledger"))
-            ]
+            ],
+            settings: .settings(base: [
+              "SWIFT_VERSION": "5.7"
+            ])
         ),
         Target(
             name: "MainFeatureTests",

diff --git a/Projects/Feature/MyPage/Project.swift b/Projects/Feature/MyPage/Project.swift
@@ -19,7 +19,10 @@ let project = Project(
                 target: "BaseFeature",
                 path: .relativeToRoot("Projects/Feature/Base")
               )
-            ]
+            ],
+            settings: .settings(base: [
+              "SWIFT_VERSION": "5.7"
+            ])
         ),
         Target(
             name: "MyPageFeatureTests",

diff --git a/Projects/Feature/MyPage/Sources/Common/MyPageCoordinator.swift b/Projects/Feature/MyPage/Sources/Common/MyPageCoordinator.swift
@@ -35,7 +35,8 @@ public final class MyPageCoordinator: Coordinator {
     case .withrawal:
       withdrawl()
     case .debug:
-      debug()
+      //debug()
+      break
     }
   }
 
@@ -68,7 +69,7 @@ extension MyPageCoordinator {
     AlertsManager.show(title: title, subTitle: subTitle, type: .default(okAction: okAction))
   }
 
-  private func debug(animated: Bool = true) {
-    navigationController.pushViewController(UIHostingController(rootView: PulseView()), animated: animated)
-  }
+//  private func debug(animated: Bool = true) {
+//    navigationController.pushViewController(UIHostingController(rootView: PulseView()), animated: animated)
+//  }
 }
diff --git a/Projects/Feature/MyPage/Sources/Scene/MyPage/Cell/UniversityHeader.swift b/Projects/Feature/MyPage/Sources/Scene/MyPage/Cell/UniversityHeader.swift
@@ -2,8 +2,8 @@ import UIKit
 
 import Utility
 import DesignSystem
+import Core
 
-import Kingfisher
 
 final class UniversityHeader: UITableViewHeaderFooterView, ReusableView {
 

diff --git a/Projects/Feature/MyPage/Sources/Scene/PulseView.swift b/Projects/Feature/MyPage/Sources/Scene/PulseView.swift
@@ -1,9 +1,9 @@
 import SwiftUI
 
-import PulseUI
-
-struct PulseView: View {
-  var body: some View {
-    ConsoleView()
-  }
-}
+//import PulseUI
+//
+//struct PulseView: View {
+//  var body: some View {
+//    ConsoleView()
+//  }
+//}
diff --git a/Projects/Feature/Sign/Project.swift b/Projects/Feature/Sign/Project.swift
@@ -25,7 +25,10 @@ let project = Project(
       sources: ["Sources/**"],
       dependencies: [
         .project(target: "BaseFeature", path: .relativeToRoot("Projects/Feature/Base"))
-      ]
+      ],
+      settings: .settings(base: [
+        "SWIFT_VERSION": "5.7"
+      ])
     ),
     Target(
       name: "SignFeatureTests",

diff --git a/Projects/Shared/DesignSystem/Project.swift b/Projects/Shared/DesignSystem/Project.swift
@@ -31,7 +31,10 @@ let project = Project(
       dependencies: [
         .package(product: "FlexLayout"),
         .package(product: "PinLayout")
-      ]
+      ],
+      settings: .settings(base: [
+        "SWIFT_VERSION": "5.7"
+      ])
     ),
     Target(
       name: "DesignSystemDemo",

diff --git a/Projects/Shared/DesignSystem/Sources/Utils/Colors.swift b/Projects/Shared/DesignSystem/Sources/Utils/Colors.swift
@@ -2,52 +2,52 @@ import UIKit
 
 public enum Colors {
   public enum White {
-    public static var _1: UIColor = UIColor(hexString: "FFFFFF")
+    public static let _1: UIColor = UIColor(hexString: "FFFFFF")
   }
 
   public enum Black {
-    public static var _1: UIColor = UIColor(hexString: "000000")
+    public static let _1: UIColor = UIColor(hexString: "000000")
   }
 
   public enum Gray {
-    public static var _10: UIColor = UIColor(hexString: "0F1114")
-    public static var _9: UIColor = UIColor(hexString: "191A1E")
-    public static var _8: UIColor = UIColor(hexString: "292C34")
-    public static var _7: UIColor = UIColor(hexString: "37404F")
-    public static var _6: UIColor = UIColor(hexString: "49556A")
-    public static var _5: UIColor = UIColor(hexString: "77859E")
-    public static var _4: UIColor = UIColor(hexString: "A6B4CA")
-    public static var _3: UIColor = UIColor(hexString: "D9E1ED")
-    public static var _2: UIColor = UIColor(hexString: "E7EDF7")
-    public static var _1: UIColor = UIColor(hexString: "F6F8FC")
-    public static var _300: UIColor = UIColor(hexString: "CDD2D9")
+    public static let _10: UIColor = UIColor(hexString: "0F1114")
+    public static let _9: UIColor = UIColor(hexString: "191A1E")
+    public static let _8: UIColor = UIColor(hexString: "292C34")
+    public static let _7: UIColor = UIColor(hexString: "37404F")
+    public static let _6: UIColor = UIColor(hexString: "49556A")
+    public static let _5: UIColor = UIColor(hexString: "77859E")
+    public static let _4: UIColor = UIColor(hexString: "A6B4CA")
+    public static let _3: UIColor = UIColor(hexString: "D9E1ED")
+    public static let _2: UIColor = UIColor(hexString: "E7EDF7")
+    public static let _1: UIColor = UIColor(hexString: "F6F8FC")
+    public static let _300: UIColor = UIColor(hexString: "CDD2D9")
   }
 
   public enum Blue {
-    public static var _4: UIColor = UIColor(hexString: "5562FF")
-    public static var _3: UIColor = UIColor(hexString: "98A0FF")
-    public static var _2: UIColor = UIColor(hexString: "CCCFFF")
-    public static var _1: UIColor = UIColor(hexString: "EEEFFF")
+    public static let _4: UIColor = UIColor(hexString: "5562FF")
+    public static let _3: UIColor = UIColor(hexString: "98A0FF")
+    public static let _2: UIColor = UIColor(hexString: "CCCFFF")
+    public static let _1: UIColor = UIColor(hexString: "EEEFFF")
   }
 
   public enum SkyBlue {
-    public static var _1: UIColor = UIColor(hexString: "C7F4FF")
+    public static let _1: UIColor = UIColor(hexString: "C7F4FF")
   }
 
   public enum Mint {
-    public static var _3: UIColor = UIColor(hexString: "49DFBB")
-    public static var _2: UIColor = UIColor(hexString: "7CE9CF")
-    public static var _1: UIColor = UIColor(hexString: "E4FAF5")
+    public static let _3: UIColor = UIColor(hexString: "49DFBB")
+    public static let _2: UIColor = UIColor(hexString: "7CE9CF")
+    public static let _1: UIColor = UIColor(hexString: "E4FAF5")
   }
 
   public enum Yellow {
-    public static var _1: UIColor = UIColor(hexString: "FFE600")
+    public static let _1: UIColor = UIColor(hexString: "FFE600")
   }
 
   public enum Red {
-    public static var _3: UIColor = UIColor(hexString: "FF5473")
-    public static var _2: UIColor = UIColor(hexString: "FF8CA0")
-    public static var _1: UIColor = UIColor(hexString: "FFEEF1")
+    public static let _3: UIColor = UIColor(hexString: "FF5473")
+    public static let _2: UIColor = UIColor(hexString: "FF8CA0")
+    public static let _1: UIColor = UIColor(hexString: "FFEEF1")
   }
 }