Swift6 대응

Author: minsOne

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

Sources/DIContainer/Container/Container.swift

@@ -1,7 +1,8 @@
 import Foundation
 
 public class Container {
-    static var root = Container()
+    @MainActor
+    static private(set) var root = Container()
 
     /// Stored object instance factories.
     var modules: [String: Module] = [:]
@@ -33,6 +34,7 @@ extension Container {
     /// Resolves through inference and returns an instance of the given type from the current default container.
     ///
     /// If the dependency is not found, an exception will occur.
+    @MainActor
     static func resolve<T>(for type: AnyObject.Type) -> T {
         guard let component: T = weakResolve(for: type) else {
             fatalError("Dependency '\(T.self)' not resolved!")
@@ -44,6 +46,7 @@ extension Container {
     /// Resolves through inference and returns an instance of the given type from the current default container.
     ///
     /// If the dependency is not found, return nil
+    @MainActor
     static func weakResolve<T>(for type: AnyObject.Type) -> T? {
         root.module(type)?.resolve() as? T
     }
@@ -78,10 +81,23 @@ public extension Container {
         self.init()
         register(contentsOf: [module()])
     }
+}
 
+public extension Container {
     /// Assigns the current container to the composition root.
+    @MainActor
     func build() {
         // Used later in property wrapper
         Self.root = self
     }
 }
+
+#if DEBUG
+public extension Container {
+    @MainActor
+    static func clear() {
+        root.modules.removeAll()
+    }
+}
+
+#endif

Sources/DIContainer/Utils/KeyName.swift …IContainer/Internals/Utils/KeyName.swiftSources/DIContainer/Utils/KeyName.swift renamed to Sources/DIContainer/Internals/Utils/KeyName.swift Sources/DIContainer/Utils/KeyName.swift renamed to Sources/DIContainer/Internals/Utils/KeyName.swift

@@ -1,16 +1,19 @@
 import Foundation
 
+@MainActor
 public protocol InjectionKeyType: AnyObject {
     associatedtype Value
     static var value: Value { get }
     static var weakValue: Value? { get }
 }
 
 public extension InjectionKeyType {
+    @MainActor
     static var value: Value {
         Container.resolve(for: Self.self)
     }
 
+    @MainActor
     static var weakValue: Value? {
         Container.weakResolve(for: Self.self)
     }

Sources/DIContainer/Key/InjectionKeyType.swift

@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 @propertyWrapper
 public class Inject<Value> {
     private let lazyValue: () -> Value

Sources/DIContainer/PropertyWrapper/Inject.swift

@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 @propertyWrapper
 public class WeakInject<Value> {
     private let lazyValue: () -> Value?

Sources/DIContainer/PropertyWrapper/WeakInject.swift

@@ -3,6 +3,7 @@ import Foundation
 @testable import DIContainer
 
 extension InjectionKeyType {
+    @MainActor
     static var module: Module? {
         return Container.root.module(Self.self)
     }

Tests/DIContainerTests/Helper/Helper.swift

@@ -1,14 +1,17 @@
 import DIContainer
 import Foundation
 
+@MainActor
 final class MockServiceKey: InjectionKey {
     typealias Value = MockService
 }
 
+@MainActor
 protocol MockService {
     func doSomething()
 }
 
+@MainActor
 final class MockServiceImpl: AutoModule, MockService {
     typealias ModuleKeyType = MockServiceKey
 

Tests/DIContainerTests/Mock/MockService.swift

@@ -2,6 +2,7 @@ import XCTest
 
 @testable import DIContainer
 
+@MainActor
 class ContainerTests: XCTestCase {
     func test_container1() {
         testContainer(withSetup: .init {

Tests/DIContainerTests/Tests/InjectTestsTests.swift

@@ -1,10 +1,13 @@
 import Foundation
+import Testing
 import XCTest
 
 @testable import DIContainer
 
-final class ModuleListExtensionTests: XCTestCase {
-    func testReplaceOneModule() {
+@MainActor
+struct ModuleListExtensionTest {
+    @Test
+    func replaceOneModule() {
         // Given
         let newModule = Module(MockServiceKey.self) { Service1() }
         var moduleList = ModuleScanner().scanModuleList
@@ -23,7 +26,8 @@ final class ModuleListExtensionTests: XCTestCase {
         XCTAssertEqual(service?.count, 1)
     }
 
-    func testReplaceMultipleModules() {
+    @Test
+    func replaceMultipleModules() {
         // Given
         let newModule1 = Module(MockServiceKey.self) { Service1() }
         let newModule2 = Module(WeakMockServiceKey.self) { Service2() }
@@ -60,7 +64,7 @@ final class ModuleListExtensionTests: XCTestCase {
     }
 }
 
-private extension ModuleListExtensionTests {
+private extension ModuleListExtensionTest {
     final class Service1: MockService {
         var count = 0