diff --git a/Application/DevLogApp/Sources/App/Delegate/AppDelegate.swift b/Application/DevLogApp/Sources/App/Delegate/AppDelegate.swift index 208d7191..b441fee7 100644 --- a/Application/DevLogApp/Sources/App/Delegate/AppDelegate.swift +++ b/Application/DevLogApp/Sources/App/Delegate/AppDelegate.swift @@ -12,7 +12,7 @@ import DevLogInfra class AppDelegate: UIResponder, UIApplicationDelegate { private let logger = Logger(category: "AppDelegate") - private let container = AppDIContainer.shared + private let container = AppDIContainer.default func application( _ app: UIApplication, diff --git a/Application/DevLogApp/Sources/App/DevLogApp.swift b/Application/DevLogApp/Sources/App/DevLogApp.swift index 0e68fd0b..8af1c05a 100644 --- a/Application/DevLogApp/Sources/App/DevLogApp.swift +++ b/Application/DevLogApp/Sources/App/DevLogApp.swift @@ -19,7 +19,7 @@ struct DevLogApp: App { @State private var windowEvent = TodoEditorWindowEvent() init() { - AppAssembler().assemble(AppDIContainer.shared) + AppAssembler().assemble(AppDIContainer.default) } var body: some Scene { diff --git a/Application/DevLogCore/Sources/DIContainer.swift b/Application/DevLogCore/Sources/DIContainer.swift index 9993ef5c..a2994e48 100644 --- a/Application/DevLogCore/Sources/DIContainer.swift +++ b/Application/DevLogCore/Sources/DIContainer.swift @@ -24,7 +24,7 @@ public enum DependencyScope { case transient } -public protocol DIContainer { +public protocol DIContainer: Sendable { func register( _ type: T.Type, name: DependencyName?, @@ -50,8 +50,8 @@ public extension DIContainer { } } -public final class AppDIContainer: DIContainer { - public static let shared = AppDIContainer() +public final class AppDIContainer: DIContainer, @unchecked Sendable { + public static let `default` = AppDIContainer() private let lock = NSRecursiveLock() diff --git a/Application/DevLogCore/Sources/DIContainerKey.swift b/Application/DevLogCore/Sources/DIContainerKey.swift index 28ec5372..bfe039e9 100644 --- a/Application/DevLogCore/Sources/DIContainerKey.swift +++ b/Application/DevLogCore/Sources/DIContainerKey.swift @@ -8,7 +8,7 @@ import SwiftUI private struct DIContainerKey: EnvironmentKey { - static let defaultValue: any DIContainer = AppDIContainer.shared + static let defaultValue: any DIContainer = AppDIContainer.default } public extension EnvironmentValues { diff --git a/Application/DevLogCore/Sources/PushNotificationQuery.swift b/Application/DevLogCore/Sources/PushNotificationQuery.swift index ee138d87..3b0c7aa5 100644 --- a/Application/DevLogCore/Sources/PushNotificationQuery.swift +++ b/Application/DevLogCore/Sources/PushNotificationQuery.swift @@ -7,13 +7,13 @@ import Foundation -public struct PushNotificationQuery: Equatable { - public enum SortOrder: Equatable { +public struct PushNotificationQuery: Equatable, Sendable { + public enum SortOrder: Equatable, Sendable { case latest case oldest } - public enum TimeFilter: Equatable, Hashable { + public enum TimeFilter: Equatable, Hashable, Sendable { case none case hours(Int) case days(Int) diff --git a/Tuist/ProjectDescriptionHelpers/Project+Settings.swift b/Tuist/ProjectDescriptionHelpers/Project+Settings.swift index 48bae5f2..e8eb0d39 100644 --- a/Tuist/ProjectDescriptionHelpers/Project+Settings.swift +++ b/Tuist/ProjectDescriptionHelpers/Project+Settings.swift @@ -16,8 +16,8 @@ public extension Settings { "CURRENT_PROJECT_VERSION": "1", "INFOPLIST_KEY_CFBundleShortVersionString": "$(MARKETING_VERSION)", "INFOPLIST_KEY_CFBundleVersion": "$(CURRENT_PROJECT_VERSION)", - "SWIFT_VERSION": "5.0", - "TARGETED_DEVICE_FAMILY": "1,2", + "SWIFT_VERSION": "6.0", + "TARGETED_DEVICE_FAMILY": "1,2" ] commonBase.merge(base) { _, new in new } @@ -26,7 +26,7 @@ public extension Settings { base: commonBase, configurations: [ .debug(name: "Debug", settings: debug, xcconfig: versionXcconfigPath), - .release(name: "Release", settings: release, xcconfig: versionXcconfigPath), + .release(name: "Release", settings: release, xcconfig: versionXcconfigPath) ], defaultSettings: defaultSettings ) @@ -36,7 +36,7 @@ public extension Settings { base: commonBase, configurations: [ .debug(name: "Debug", settings: debug), - .release(name: "Release", settings: release), + .release(name: "Release", settings: release) ], defaultSettings: defaultSettings ) @@ -50,7 +50,7 @@ public extension Settings { "ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS": "YES", "DEVELOPMENT_TEAM": DevLogSigning.teamID, "ENABLE_USER_SCRIPT_SANDBOXING": "YES", - "STRING_CATALOG_GENERATE_SYMBOLS": "YES", + "STRING_CATALOG_GENERATE_SYMBOLS": "YES" ] base.merge(additionalBase) { _, new in new } return .devlog(versionXcconfigPath: versionXcconfigPath, base: base)