Swift6 대응

minsOne · minsOne · commit 8f3c9473d3a8 · 2024-12-11T00:29:38.000+09:00
diff --git a/Package.swift b/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
diff --git a/Sources/DIContainer/Container/Container.swift b/Sources/DIContainer/Container/Container.swift
@@ -1,7 +1,8 @@
 import Foundation
 
 public class Container {
-    static var root = Container()
+    @MainActor
+    private(set) static var root = Container()
 
     /// Stored object instance factories.
     var modules: [String: Module] = [:]
@@ -29,11 +30,12 @@ public extension Container {
     }
 }
 
+@MainActor
 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.
-    static func resolve<T>(for type: AnyObject.Type) -> T {
+    static func resolve<T, U: InjectionKeyType>(for type: U.Type) -> T {
         guard let component: T = weakResolve(for: type) else {
             fatalError("Dependency '\(T.self)' not resolved!")
         }
@@ -44,19 +46,20 @@ 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
-    static func weakResolve<T>(for type: AnyObject.Type) -> T? {
+    static func weakResolve<T, U: InjectionKeyType>(for type: U.Type) -> T? {
         root.module(type)?.resolve() as? T
     }
 
-    func module(_ type: AnyObject.Type) -> Module? {
+    func module<T: InjectionKeyType>(_ type: T.Type) -> Module? {
         let keyName = KeyName(type).name
         return modules[keyName]
     }
 }
 
 public extension Container {
     /// DSL for declaring modules within the container dependency initializer.
-    @resultBuilder enum ContainerBuilder {
+    @resultBuilder
+    enum ContainerBuilder {
         public static func buildBlock(_ modules: Module...) -> [Module] { modules }
         public static func buildBlock(_ module: Module) -> Module { module }
     }
@@ -78,10 +81,23 @@ public extension Container {
         self.init()
         register(contentsOf: [module()])
     }
+}
 
+@MainActor
+public extension Container {
     /// Assigns the current container to the composition root.
     func build() {
         // Used later in property wrapper
         Self.root = self
     }
 }
+
+#if DEBUG
+@MainActor
+public extension Container {
+    static func clear() {
+        root.modules.removeAll()
+    }
+}
+
+#endif
diff --git a/Sources/DIContainer/Internals/Utils/KeyName.swift b/Sources/DIContainer/Internals/Utils/KeyName.swift
diff --git a/Sources/DIContainer/Key/InjectionKeyType.swift b/Sources/DIContainer/Key/InjectionKeyType.swift
@@ -1,16 +1,18 @@
 import Foundation
 
+@MainActor
 public protocol InjectionKeyType: AnyObject {
     associatedtype Value
     static var value: Value { get }
     static var weakValue: Value? { get }
 }
 
+@MainActor
 public extension InjectionKeyType {
     static var value: Value {
         Container.resolve(for: Self.self)
     }
-    
+
     static var weakValue: Value? {
         Container.weakResolve(for: Self.self)
     }
diff --git a/Sources/DIContainer/PropertyWrapper/Inject.swift b/Sources/DIContainer/PropertyWrapper/Inject.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 @propertyWrapper
 public class Inject<Value> {
     private let lazyValue: () -> Value
diff --git a/Sources/DIContainer/PropertyWrapper/WeakInject.swift b/Sources/DIContainer/PropertyWrapper/WeakInject.swift
@@ -1,5 +1,6 @@
 import Foundation
 
+@MainActor
 @propertyWrapper
 public class WeakInject<Value> {
     private let lazyValue: () -> Value?
diff --git a/Sources/DIContainer/Scan/ModuleScanner.swift b/Sources/DIContainer/Scan/ModuleScanner.swift
@@ -63,8 +63,6 @@ public struct ModuleScanner {
 //            }
 //        }
 
-
-#if DEBUG
         print("""
         ┌───── \(Self.self) \(#function) ──────
         │ Duration : \((Date().timeIntervalSince(start) * 1000).rounded())ms
@@ -74,7 +72,6 @@ public struct ModuleScanner {
         │  - \(keys)
         └────────────────────────────────────────────────
         """)
-#endif
         return keys
     }
 
@@ -116,8 +113,6 @@ public struct ModuleScanner {
 //            }
 //        }
 
-
-#if DEBUG
         print("""
         ┌───── \(Self.self) \(#function) ─────────
         │ Duration : \((Date().timeIntervalSince(start) * 1000).rounded())ms
@@ -127,7 +122,6 @@ public struct ModuleScanner {
         │  - \(keys)")
         └────────────────────────────────────────────────
         """)
-#endif
 
         return keys
     }
diff --git a/Tests/DIContainerTests/Helper/Helper.swift b/Tests/DIContainerTests/Helper/Helper.swift
@@ -3,6 +3,7 @@ import Foundation
 @testable import DIContainer
 
 extension InjectionKeyType {
+    @MainActor
     static var module: Module? {
         return Container.root.module(Self.self)
     }
diff --git a/Tests/DIContainerTests/Mock/MockService.swift b/Tests/DIContainerTests/Mock/MockService.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
 
diff --git a/Tests/DIContainerTests/Tests/InjectTestsTests.swift b/Tests/DIContainerTests/Tests/InjectTestsTests.swift
@@ -2,6 +2,7 @@ import XCTest
 
 @testable import DIContainer
 
+@MainActor
 class ContainerTests: XCTestCase {
     func test_container1() {
         testContainer(withSetup: .init {
diff --git a/Tests/DIContainerTests/Tests/ModuleListExtensionTests.swift b/Tests/DIContainerTests/Tests/ModuleListExtensionTests.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
 
diff --git a/Tests/DIContainerTests/Tests/ModuleScannerTests.swift b/Tests/DIContainerTests/Tests/ModuleScannerTests.swift
@@ -1,11 +1,14 @@
 import Foundation
 import MockData
+import Testing
 import XCTest
 
 @testable import DIContainer
 
-final class ModuleScannerTests: XCTestCase {
-    func test_ScanInjectKeys() {
+@MainActor
+struct ModuleScannerTest {
+    @Test
+    func scanInjectKeys() {
         Container {
             Module(MockServiceKey.self) { MockServiceImpl() }
             Module(WeakMockServiceImpl.self)
@@ -34,7 +37,8 @@ final class ModuleScannerTests: XCTestCase {
         }
     }
 
-    func test_ScanModules() {
+    @Test
+    func scanModules() {
         let moduleList = ModuleScanner().scanModuleList
 
         print("""
diff --git a/Tests/DIContainerTests/Tests/WeakInjectNilTests.swift b/Tests/DIContainerTests/Tests/WeakInjectNilTests.swift
@@ -1,18 +1,18 @@
+import Testing
 import XCTest
 
 @testable import DIContainer
 
-final class WeakInjectNilTests: XCTestCase {
-    let mockService = WeakMockServiceImpl()
-
-    override func setUp() {
-        super.setUp()
-
-        // Given
+@MainActor
+struct WeakInjectNilTest {
+    init() {
         Container().build()
     }
+}
 
-    func testContainerDoesNotContainWeakMockService() {
+extension WeakInjectNilTest {
+    @Test
+    func containerDoesNotContainWeakMockService() {
         // When
         let weakMockService = WeakMockServiceKey.module?.resolve()
         let weakMockServiceImpl = WeakMockServiceKey.module?.resolve() as? WeakMockServiceKey.Value
@@ -24,7 +24,8 @@ final class WeakInjectNilTests: XCTestCase {
         XCTAssertNil(weakMockServiceProtocol)
     }
 
-    func testWeakInjectReturnsNil() {
+    @Test
+    func weakInjectReturnsNil() {
         // When
         @WeakInject(WeakMockServiceKey.self) var service1
         @WeakInject(WeakMockServiceKey.self) var service2: WeakMockService?
diff --git a/Tests/DIContainerTests/Tests/WeakInjectTests.swift b/Tests/DIContainerTests/Tests/WeakInjectTests.swift
@@ -1,66 +1,72 @@
+import Testing
 import XCTest
 
 @testable import DIContainer
 
-final class WeakInjectTests: XCTestCase {
-    override func setUp() {
-        super.setUp()
-
+@MainActor
+struct WeakInjectTest {
+    init() {
         // Given
         Container {
             Module(WeakMockServiceKey.self) { WeakMockServiceImpl() }
             Module(MockServiceImpl.self)
         }
         .build()
     }
+}
 
-    func testContainerRegistration1() {
+extension WeakInjectTest {
+    @Test
+    func containerRegistration1() {
         // When
         let weakMockService = WeakMockServiceKey.module?.resolve()
         let weakMockServiceImpl = WeakMockServiceKey.module?.resolve() as? WeakMockServiceKey.Value
         let weakMockServiceProtocol = WeakMockServiceKey.module?.resolve() as? WeakMockService
-
+        
         // Then
         XCTAssertNotNil(weakMockService)
         XCTAssertNotNil(weakMockServiceImpl)
         XCTAssertNotNil(weakMockServiceProtocol)
     }
-
-    func testContainerRegistration2() {
+    
+    @Test
+    func containerRegistration2() {
         // When
         @WeakInject(WeakMockServiceKey.self) var service1
         @WeakInject(MockServiceKey.self) var service2
-
+        
         // Then
         XCTAssertNotNil(service1)
         XCTAssertNotNil(service2)
     }
-
-    func testWeakInjectBehavior1() {
+    
+    @Test
+    func weakInjectBehavior1() {
         // When
         @WeakInject(WeakMockServiceKey.self) var service1: WeakMockService?
         @WeakInject(MockServiceKey.self) var service2: MockService?
-
+        
         // Then
         XCTAssertNotNil(service1)
         service1?.doSomething()
         XCTAssertEqual((service1 as? WeakMockServiceImpl)?.count, 1)
-
+        
         XCTAssertNotNil(service2)
         service2?.doSomething()
         XCTAssertEqual((service2 as? MockServiceImpl)?.count, 1)
     }
-
-    func testWeakInjectBehavior2() {
+    
+    @Test
+    func weakInjectBehavior2() {
         // When
         @WeakInject(WeakMockServiceKey.self) var service1
         @WeakInject(MockServiceKey.self) var service2
-
+        
         // Then
         XCTAssertNotNil(service1)
         service1?.doSomething()
         XCTAssertEqual((service1 as? WeakMockServiceImpl)?.count, 1)
-
+        
         XCTAssertNotNil(service2)
         service2?.doSomething()
         XCTAssertEqual((service2 as? MockServiceImpl)?.count, 1)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version: 5.9`
	`1`	`+// swift-tools-version: 6.0`
`2`	`2`	`// The swift-tools-version declares the minimum version of Swift required to build this package.`
`3`	`3`
`4`	`4`	`import PackageDescription`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,18 @@`
`1`	`1`	`import Foundation`
`2`	`2`
	`3`	`+@MainActor`
`3`	`4`	`public protocol InjectionKeyType: AnyObject {`
`4`	`5`	`associatedtype Value`
`5`	`6`	`static var value: Value { get }`
`6`	`7`	`static var weakValue: Value? { get }`
`7`	`8`	`}`
`8`	`9`
	`10`	`+@MainActor`
`9`	`11`	`public extension InjectionKeyType {`
`10`	`12`	`static var value: Value {`
`11`	`13`	`Container.resolve(for: Self.self)`
`12`	`14`	`}`
`13`		`-`
	`15`	`+`
`14`	`16`	`static var weakValue: Value? {`
`15`	`17`	`Container.weakResolve(for: Self.self)`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import Foundation`
`3`	`3`	`@testable import DIContainer`
`4`	`4`
`5`	`5`	`extension InjectionKeyType {`
	`6`	`+ @MainActor`
`6`	`7`	`static var module: Module? {`
`7`	`8`	`return Container.root.module(Self.self)`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,17 @@`
`1`	`1`	`import DIContainer`
`2`	`2`	`import Foundation`
`3`	`3`
	`4`	`+@MainActor`
`4`	`5`	`final class MockServiceKey: InjectionKey {`
`5`	`6`	`typealias Value = MockService`
`6`	`7`	`}`
`7`	`8`
	`9`	`+@MainActor`
`8`	`10`	`protocol MockService {`
`9`	`11`	`func doSomething()`
`10`	`12`	`}`
`11`	`13`
	`14`	`+@MainActor`
`12`	`15`	`final class MockServiceImpl: AutoModule, MockService {`
`13`	`16`	`typealias ModuleKeyType = MockServiceKey`
`14`	`17`