From e7085ac4487a182e6ffbef4302dc9140c90b9ead Mon Sep 17 00:00:00 2001 From: opficdev <162981733+opficdev@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:42:05 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore:=20swift=206=20=EA=B8=B0=EB=B0=98?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tuist/ProjectDescriptionHelpers/Project+Settings.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tuist/ProjectDescriptionHelpers/Project+Settings.swift b/Tuist/ProjectDescriptionHelpers/Project+Settings.swift index 48bae5f2..db44b8fc 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", ] commonBase.merge(base) { _, new in new } From f8505fec3ead7c4f93599ef1443f2c97ae73d125 Mon Sep 17 00:00:00 2001 From: opficdev <162981733+opficdev@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:42:21 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=EB=A6=B0=ED=8A=B8=20trailing?= =?UTF-8?q?=20comma=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tuist/ProjectDescriptionHelpers/Project+Settings.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tuist/ProjectDescriptionHelpers/Project+Settings.swift b/Tuist/ProjectDescriptionHelpers/Project+Settings.swift index db44b8fc..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)", - "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) From a4dd36b7e0f73a2dfbc31d620014c3d901d61958 Mon Sep 17 00:00:00 2001 From: opficdev <162981733+opficdev@users.noreply.github.com> Date: Fri, 5 Jun 2026 14:12:11 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20PushNotificationQuery=EC=97=90=20Sen?= =?UTF-8?q?dable=20=EC=B1=84=ED=83=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/DevLogCore/Sources/PushNotificationQuery.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) From 562bcbb9ba1080cbe2a02aeaa593ee6d4462a4d6 Mon Sep 17 00:00:00 2001 From: opficdev <162981733+opficdev@users.noreply.github.com> Date: Fri, 5 Jun 2026 14:49:08 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20DIContainer=EC=9D=98=20?= =?UTF-8?q?=EC=8B=B1=EA=B8=80=ED=84=B4=20=ED=8C=A8=ED=84=B4=EC=9D=84=20def?= =?UTF-8?q?ault=EB=A1=9C=20=EC=88=98=EC=A0=95=ED=95=98=EA=B3=A0=20unchecke?= =?UTF-8?q?d=20Sendable=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevLogApp/Sources/App/Delegate/AppDelegate.swift | 2 +- Application/DevLogApp/Sources/App/DevLogApp.swift | 2 +- Application/DevLogCore/Sources/DIContainer.swift | 6 +++--- Application/DevLogCore/Sources/DIContainerKey.swift | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) 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 {