Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

๐Ÿ”€ :: (#1314) Swift 6 ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜ #1327

Merged
merged 13 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:

test:
name: ๐Ÿงช Test
runs-on: macos-14
runs-on: macos-15
needs: prepare-ci

steps:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,4 @@ amplifytools.xcconfig
GoogleService-Info.plist

### Needle
Projects/App/Sources/Application/NeedleGenerated.swift
# Projects/App/Sources/Application/NeedleGenerated.swift
2 changes: 1 addition & 1 deletion .mise.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[tools]
tuist = "4.12.1"
tuist = "4.33.0"
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ public let env = ProjectEnvironment(
.debugInformationFormat(DebugInformationFormat.dwarfWithDsym)
.otherLinkerFlags(["-ObjC"])
.bitcodeEnabled(false)
.swiftVersion("6.0")
.merging(["SWIFT_STRICT_CONCURRENCY": .string("complete")])
)

1 change: 1 addition & 0 deletions Projects/App/Sources/Application/AppComponent+App.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import AppDomain
import AppDomainInterface
@preconcurrency import NeedleFoundation

// MARK: ๋ณ€์ˆ˜๋ช… ์ฃผ์˜
// AppComponent ๋‚ด ๋ณ€์ˆ˜ == Dependency ๋‚ด ๋ณ€์ˆ˜ ์ด๋ฆ„ ๊ฐ™์•„์•ผํ•จ
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import ArtistDomain
import ArtistDomainInterface
import ArtistFeature
import ArtistFeatureInterface
@preconcurrency import NeedleFoundation

public extension AppComponent {
// MARK: Artist
Expand Down
1 change: 1 addition & 0 deletions Projects/App/Sources/Application/AppComponent+Auth.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import AuthDomainInterface
import BaseFeature
import MyInfoFeature
import MyInfoFeatureInterface
@preconcurrency import NeedleFoundation
import SignInFeature
import SignInFeatureInterface
import StorageFeature
Expand Down
1 change: 1 addition & 0 deletions Projects/App/Sources/Application/AppComponent+Base.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import BaseFeature
import BaseFeatureInterface
import Foundation
@preconcurrency import NeedleFoundation

public extension AppComponent {
var multiPurposePopupFactory: any MultiPurposePopupFactory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import ChartDomain
import ChartDomainInterface
import ChartFeature
import ChartFeatureInterface
@preconcurrency import NeedleFoundation

public extension AppComponent {
var chartFactory: any ChartFactory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import CreditDomain
import CreditDomainInterface
import CreditSongListFeature
import CreditSongListFeatureInterface
@preconcurrency import NeedleFoundation
import SongCreditFeature
import SongCreditFeatureInterface

Expand Down
1 change: 1 addition & 0 deletions Projects/App/Sources/Application/AppComponent+Faq.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import BaseFeature
import FaqDomain
import FaqDomainInterface
@preconcurrency import NeedleFoundation
import SignInFeature

// MARK: ๋ณ€์ˆ˜๋ช… ์ฃผ์˜
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Foundation
import FruitDrawFeature
import FruitDrawFeatureInterface
@preconcurrency import NeedleFoundation

extension AppComponent {
var fruitDrawFactory: any FruitDrawFactory {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import ImageDomain
import ImageDomainInterface
@preconcurrency import NeedleFoundation

// MARK: ๋ณ€์ˆ˜๋ช… ์ฃผ์˜
// AppComponent ๋‚ด ๋ณ€์ˆ˜ == Dependency ๋‚ด ๋ณ€์ˆ˜ ์ด๋ฆ„ ๊ฐ™์•„์•ผํ•จ
Expand Down
1 change: 1 addition & 0 deletions Projects/App/Sources/Application/AppComponent+Like.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import BaseFeature
import LikeDomain
import LikeDomainInterface
@preconcurrency import NeedleFoundation
import SignInFeature
import StorageFeature

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Foundation
import MyInfoFeature
import MyInfoFeatureInterface
@preconcurrency import NeedleFoundation

extension AppComponent {
var myInfoFactory: any MyInfoFactory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import BaseFeature
import MainTabFeature
import MyInfoFeature
import MyInfoFeatureInterface
@preconcurrency import NeedleFoundation
import NoticeDomain
import NoticeDomainInterface
import StorageFeature
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@preconcurrency import NeedleFoundation
import NotificationDomain
import NotificationDomainInterface

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import BaseFeature
import BaseFeatureInterface
import ImageDomain
import ImageDomainInterface
@preconcurrency import NeedleFoundation
import PlaylistDomain
import PlaylistDomainInterface
import PlaylistFeature
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Foundation
@preconcurrency import NeedleFoundation
import PriceDomain
import PriceDomainInterface

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Foundation
@preconcurrency import NeedleFoundation
import SearchDomain
import SearchDomainInterface
import SearchFeature
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import LyricHighlightingFeature
import LyricHighlightingFeatureInterface
import MusicDetailFeature
import MusicDetailFeatureInterface
@preconcurrency import NeedleFoundation
import SongsDomain
import SongsDomainInterface

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import BaseFeature
import BaseFeatureInterface
@preconcurrency import NeedleFoundation
import StorageFeature
import StorageFeatureInterface

Expand Down
1 change: 1 addition & 0 deletions Projects/App/Sources/Application/AppComponent+Team.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@preconcurrency import NeedleFoundation
import TeamDomain
import TeamDomainInterface
import TeamFeature
Expand Down
1 change: 1 addition & 0 deletions Projects/App/Sources/Application/AppComponent+User.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import BaseFeature
@preconcurrency import NeedleFoundation
import SignInFeature
import StorageFeature
import UserDomain
Expand Down
6 changes: 1 addition & 5 deletions Projects/App/Sources/Application/AppComponent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions Projects/App/Sources/Application/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
}

Expand Down
Loading
Loading