Merge pull request #1327 from wakmusic/1314-swift-6-migration

.github/workflows/CI.yml

@@ -76,7 +76,7 @@ jobs:
 
   test:
     name: 🧪 Test
-    runs-on: macos-14
+    runs-on: macos-15
     needs: prepare-ci
 
     steps:

.gitignore

@@ -113,4 +113,4 @@ amplifytools.xcconfig
 GoogleService-Info.plist
 
 ### Needle
-Projects/App/Sources/Application/NeedleGenerated.swift
+# Projects/App/Sources/Application/NeedleGenerated.swift

.mise.toml

@@ -1,2 +1,2 @@
 [tools]
-tuist = "4.12.1"
+tuist = "4.33.0"

Package.resolved

@@ -194,8 +194,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/naver/naveridlogin-sdk-ios.git",
       "state" : {
-        "branch" : "master",
-        "revision" : "d8d2128b8bcef8cd93068a058ea898d6dbb7d486"
+        "revision" : "0d89660344926a625824387a130f7e38e0fad2d7",
+        "version" : "4.2.3"
       }
     },
     {

Package.swift

@@ -34,7 +34,7 @@ let package = Package(
         .package(url: "https://github.com/RxSwiftCommunity/RxDataSources.git", from: "5.0.2"),
         .package(url: "https://github.com/RxSwiftCommunity/RxKeyboard.git", from: "2.0.1"),
         .package(url: "https://github.com/huri000/SwiftEntryKit", from: "2.0.0"),
-        .package(url: "https://github.com/naver/naveridlogin-sdk-ios.git", branch: "master"),
+        .package(url: "https://github.com/naver/naveridlogin-sdk-ios.git", from: "4.2.3"),
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.8.2"),
         .package(url: "https://github.com/cbpowell/MarqueeLabel.git", from: "4.5.0"),
         .package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.25.0"),

Plugin/EnvironmentPlugin/ProjectDescriptionHelpers/ProjectEnvironment.swift

@@ -24,5 +24,7 @@ public let env = ProjectEnvironment(
         .debugInformationFormat(DebugInformationFormat.dwarfWithDsym)
         .otherLinkerFlags(["-ObjC"])
         .bitcodeEnabled(false)
+        .swiftVersion("6.0")
+        .merging(["SWIFT_STRICT_CONCURRENCY": .string("complete")])
 )
 

Projects/App/Sources/Application/AppComponent+App.swift

@@ -1,5 +1,6 @@
 import AppDomain
 import AppDomainInterface
+@preconcurrency import NeedleFoundation
 
 // MARK: 변수명 주의
 // AppComponent 내 변수 == Dependency 내 변수 이름 같아야함

Projects/App/Sources/Application/AppComponent+Artist.swift

@@ -2,6 +2,7 @@ import ArtistDomain
 import ArtistDomainInterface
 import ArtistFeature
 import ArtistFeatureInterface
+@preconcurrency import NeedleFoundation
 
 public extension AppComponent {
     // MARK: Artist

Projects/App/Sources/Application/AppComponent+Auth.swift

@@ -3,6 +3,7 @@ import AuthDomainInterface
 import BaseFeature
 import MyInfoFeature
 import MyInfoFeatureInterface
+@preconcurrency import NeedleFoundation
 import SignInFeature
 import SignInFeatureInterface
 import StorageFeature

Projects/App/Sources/Application/AppComponent+Base.swift

@@ -1,6 +1,7 @@
 import BaseFeature
 import BaseFeatureInterface
 import Foundation
+@preconcurrency import NeedleFoundation
 
 public extension AppComponent {
     var multiPurposePopupFactory: any MultiPurposePopupFactory {

Projects/App/Sources/Application/AppComponent+Chart.swift

@@ -3,6 +3,7 @@ import ChartDomain
 import ChartDomainInterface
 import ChartFeature
 import ChartFeatureInterface
+@preconcurrency import NeedleFoundation
 
 public extension AppComponent {
     var chartFactory: any ChartFactory {

Projects/App/Sources/Application/AppComponent+Credit.swift

@@ -2,6 +2,7 @@ import CreditDomain
 import CreditDomainInterface
 import CreditSongListFeature
 import CreditSongListFeatureInterface
+@preconcurrency import NeedleFoundation
 import SongCreditFeature
 import SongCreditFeatureInterface
 

Projects/App/Sources/Application/AppComponent+Faq.swift

@@ -1,6 +1,7 @@
 import BaseFeature
 import FaqDomain
 import FaqDomainInterface
+@preconcurrency import NeedleFoundation
 import SignInFeature
 
 // MARK: 변수명 주의

Projects/App/Sources/Application/AppComponent+Fruit.swift

@@ -1,6 +1,7 @@
 import Foundation
 import FruitDrawFeature
 import FruitDrawFeatureInterface
+@preconcurrency import NeedleFoundation
 
 extension AppComponent {
     var fruitDrawFactory: any FruitDrawFactory {

Projects/App/Sources/Application/AppComponent+Image.swift

@@ -1,5 +1,6 @@
 import ImageDomain
 import ImageDomainInterface
+@preconcurrency import NeedleFoundation
 
 // MARK: 변수명 주의
 // AppComponent 내 변수 == Dependency 내 변수 이름 같아야함

Projects/App/Sources/Application/AppComponent+Like.swift

@@ -1,6 +1,7 @@
 import BaseFeature
 import LikeDomain
 import LikeDomainInterface
+@preconcurrency import NeedleFoundation
 import SignInFeature
 import StorageFeature
 

Projects/App/Sources/Application/AppComponent+MyInfo.swift

@@ -1,6 +1,7 @@
 import Foundation
 import MyInfoFeature
 import MyInfoFeatureInterface
+@preconcurrency import NeedleFoundation
 
 extension AppComponent {
     var myInfoFactory: any MyInfoFactory {

Projects/App/Sources/Application/AppComponent+Notice.swift

@@ -2,6 +2,7 @@ import BaseFeature
 import MainTabFeature
 import MyInfoFeature
 import MyInfoFeatureInterface
+@preconcurrency import NeedleFoundation
 import NoticeDomain
 import NoticeDomainInterface
 import StorageFeature

Projects/App/Sources/Application/AppComponent+Notification.swift

@@ -1,3 +1,4 @@
+@preconcurrency import NeedleFoundation
 import NotificationDomain
 import NotificationDomainInterface
 

Projects/App/Sources/Application/AppComponent+Playlist.swift

@@ -2,6 +2,7 @@ import BaseFeature
 import BaseFeatureInterface
 import ImageDomain
 import ImageDomainInterface
+@preconcurrency import NeedleFoundation
 import PlaylistDomain
 import PlaylistDomainInterface
 import PlaylistFeature

Projects/App/Sources/Application/AppComponent+Price.swift

@@ -1,4 +1,5 @@
 import Foundation
+@preconcurrency import NeedleFoundation
 import PriceDomain
 import PriceDomainInterface
 

Projects/App/Sources/Application/AppComponent+Search.swift

@@ -1,4 +1,5 @@
 import Foundation
+@preconcurrency import NeedleFoundation
 import SearchDomain
 import SearchDomainInterface
 import SearchFeature

Projects/App/Sources/Application/AppComponent+Songs.swift

@@ -5,6 +5,7 @@ import LyricHighlightingFeature
 import LyricHighlightingFeatureInterface
 import MusicDetailFeature
 import MusicDetailFeatureInterface
+@preconcurrency import NeedleFoundation
 import SongsDomain
 import SongsDomainInterface
 

Projects/App/Sources/Application/AppComponent+Storage.swift

@@ -1,5 +1,6 @@
 import BaseFeature
 import BaseFeatureInterface
+@preconcurrency import NeedleFoundation
 import StorageFeature
 import StorageFeatureInterface
 

Projects/App/Sources/Application/AppComponent+Team.swift

@@ -1,3 +1,4 @@
+@preconcurrency import NeedleFoundation
 import TeamDomain
 import TeamDomainInterface
 import TeamFeature

Projects/App/Sources/Application/AppComponent+User.swift

@@ -1,4 +1,5 @@
 import BaseFeature
+@preconcurrency import NeedleFoundation
 import SignInFeature
 import StorageFeature
 import UserDomain

Projects/App/Sources/Application/AppComponent.swift

@@ -3,16 +3,12 @@ import Foundation
 import KeychainModule
 import MainTabFeature
 import MyInfoFeature
-import NeedleFoundation
+@preconcurrency import NeedleFoundation
 import RootFeature
 import StorageFeature
 import UIKit
 
 public final class AppComponent: BootstrapComponent {
-    public func makeRootView() -> IntroViewController {
-        rootComponent.makeView()
-    }
-
     public var keychain: any Keychain {
         shared {
             KeychainImpl()

Projects/App/Sources/Application/AppDelegate.swift

@@ -19,7 +19,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     ) -> Bool {
         // Use Firebase library to configure APIs
         FirebaseApp.configure()
-        if let userInfo = PreferenceManager.userInfo {
+        if let userInfo = PreferenceManager.shared.userInfo {
             LogManager.setUserID(userID: userInfo.decryptedID)
         } else {
             LogManager.setUserID(userID: nil)
@@ -105,19 +105,19 @@ extension AppDelegate {
     }
 
     private func initializeUserProperty() {
-        if let loginPlatform = PreferenceManager.userInfo?.platform {
+        if let loginPlatform = PreferenceManager.shared.userInfo?.platform {
             LogManager.setUserProperty(property: .loginPlatform(platform: loginPlatform))
         } else {
             LogManager.clearUserProperty(property: .loginPlatform(platform: ""))
         }
 
-        if let fruitTotal = PreferenceManager.userInfo?.itemCount {
+        if let fruitTotal = PreferenceManager.shared.userInfo?.itemCount {
             LogManager.setUserProperty(property: .fruitTotal(count: fruitTotal))
         } else {
             LogManager.clearUserProperty(property: .fruitTotal(count: -1))
         }
 
-        if let playPlatform = PreferenceManager.songPlayPlatformType {
+        if let playPlatform = PreferenceManager.shared.songPlayPlatformType {
             LogManager.setUserProperty(property: .songPlayPlatform(platform: playPlatform.display))
         }