Merge pull request #3 from Infomaniak/switchToApacheV2

chore: Switch to apache v2

Author: valentinperignon

LICENSE

@@ -0,0 +1,5 @@
+Infomaniak InfomaniakDI
+Copyright [2013-2014] Infomaniak Network SA
+
+This product includes software developed at
+Infomaniak Network SA.

NOTICE

@@ -1,6 +1,6 @@
 # InfomaniakDI
 
-Minimalist dependency injection mechanism.
+Minimalist dependency injection mechanism written in pure Swift.
 
 ## Abstract
 Register factories thanks to the `Factory` type into the resolver.
@@ -15,8 +15,13 @@ Use the property wrapper `@InjectService` to resolve a shared instance from any
 - [x] Lazy init (with @LazyInjectService)
 - [x] Efficient SwiftUI with `@LazyInjectService` and `@InjectService` used as IVAR in `View`
 
+## OS Support
+
+Anything with first party Swift support. (iOS / macOS / Linux …)
+
 ## Roadmap
 - [ ] Optionals
+- [ ] Multiple containers
 
 ## Requirements
 - Swift 5.x +
@@ -26,7 +31,7 @@ Use the property wrapper `@InjectService` to resolve a shared instance from any
 
 Early on in the lifecycle of your app, you want to write something like this :
 
-```
+```swift
 import InfomaniakDI
 
 […]
@@ -44,9 +49,13 @@ catch {
 ```
 
 later on, when you want to resolve a service use the property wrapper like so:
-```
+```swift
 @InjectService var injected: SomeService
 ```
 Injection will be performed at the init time of the owner of the property.
 
 Checkout `ITSimpleReslover.swift` for more advanced examples.
+
+## Licence
+
+This package is available under the permissive ApacheV2 licence for you to enjoy. 

README.md

@@ -1,20 +1,15 @@
-/*
- InfomaniakDI
- Copyright (C) 2023 Infomaniak Network SA
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
 
 import Foundation
 
@@ -23,7 +18,6 @@ public typealias FactoryClosure = (_ parameters: [String: Any]?, _ resolver: Sim
 
 /// Something that can build a type
 public protocol Factoryable {
-    
     /// Required init for a Factoryable
     /// - Parameters:
     ///   - type: The type we register, prefer using a Protocol here. Great for testing.
@@ -36,16 +30,15 @@ public protocol Factoryable {
     ///   - resolver: A resolver for chained resolution
     /// - Returns: Return something that can be casted as the `type` declared at init. Will throw otherwise.
     func build(factoryParameters: [String: Any]?, resolver: SimpleResolvable) throws -> Any
-    
+
     /// The registered type, prefer using a Protocol here. Great for testing.
     var type: Any.Type { get }
 }
 
 public struct Factory: Factoryable, CustomDebugStringConvertible {
-    
     /// The factory closure
     private let closure: FactoryClosure
-    
+
     public let type: Any.Type
 
     // MARK: Factoryable
@@ -57,12 +50,12 @@ public struct Factory: Factoryable, CustomDebugStringConvertible {
 
     public func build(factoryParameters: [String: Any]? = nil,
                       resolver: SimpleResolvable = SimpleResolver.sharedResolver) throws -> Any {
-        try self.closure(factoryParameters, resolver)
+        try closure(factoryParameters, resolver)
     }
 
     // MARK: CustomDebugStringConvertible
 
     public var debugDescription: String {
-        "<\(Swift.type(of: self)): for type:\(self.type), closure:\(String(describing: self.closure))>"
+        "<\(Swift.type(of: self)): for type:\(type), closure:\(String(describing: closure))>"
     }
 }

Sources/InfomaniakDI/Factory.swift

@@ -1,20 +1,15 @@
-/*
- InfomaniakDI
- Copyright (C) 2023 Infomaniak Network SA
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
 
 import Foundation
 

Sources/InfomaniakDI/InjectService.swift

@@ -1,20 +1,15 @@
-/*
- InfomaniakDI
- Copyright (C) 2023 Infomaniak Network SA
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
 
 import Foundation
 

Sources/InfomaniakDI/LazyInjectService.swift

@@ -1,20 +1,15 @@
-/*
- InfomaniakDI
- Copyright (C) 2023 Infomaniak Network SA
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
 
 import Foundation
 
@@ -66,44 +61,44 @@ public final class SimpleResolver: SimpleResolvable, SimpleStorable, CustomDebug
         }
         return buffer
     }
-    
+
     enum ErrorDomain: Error {
         case factoryMissing(identifier: String)
         case typeMissmatch(expected: String, got: String)
     }
-    
+
     /// One singleton to rule them all
     public static let sharedResolver = SimpleResolver()
-    
+
     /// Factory collection
     var factories = [String: Factoryable]()
-    
+
     /// Resolved object collection
     var store = [String: Any]()
 
     /// A serial queue for thread safety
     private let queue = DispatchQueue(label: "com.infomaniakDI.resolver")
-    
+
     // MARK: SimpleStorable
-    
+
     public func store(factory: Factoryable,
                       forCustomTypeIdentifier customIdentifier: String? = nil) {
         let type = factory.type
-        
+
         let identifier = buildIdentifier(type: type, forIdentifier: customIdentifier)
         queue.sync {
             factories[identifier] = factory
         }
     }
-        
+
     // MARK: SimpleResolvable
-    
+
     public func resolve<Service>(type: Service.Type,
                                  forCustomTypeIdentifier customIdentifier: String?,
                                  factoryParameters: [String: Any]? = nil,
                                  resolver: SimpleResolvable) throws -> Service {
         let serviceIdentifier = buildIdentifier(type: type, forIdentifier: customIdentifier)
-        
+
         // load form store
         var fetchedService: Any?
         queue.sync {
@@ -112,7 +107,7 @@ public final class SimpleResolver: SimpleResolvable, SimpleStorable, CustomDebug
         if let service = fetchedService as? Service {
             return service
         }
-        
+
         // load service from factory
         var factory: Factoryable?
         queue.sync {
@@ -121,23 +116,23 @@ public final class SimpleResolver: SimpleResolvable, SimpleStorable, CustomDebug
         guard let factory = factory else {
             throw ErrorDomain.factoryMissing(identifier: serviceIdentifier)
         }
-        
+
         // Apply factory closure
         let builtType = try factory.build(factoryParameters: factoryParameters, resolver: resolver)
         guard let service = builtType as? Service else {
             throw ErrorDomain.typeMissmatch(expected: "\(Service.Type.self)", got: "\(builtType.self)")
         }
-        
+
         // keep in store built object for later
         queue.sync {
             store[serviceIdentifier] = service
         }
-        
+
         return service
     }
-    
+
     // MARK: internal
-    
+
     func buildIdentifier(type: Any.Type,
                          forIdentifier identifier: String? = nil) -> String {
         if let identifier {
@@ -146,9 +141,9 @@ public final class SimpleResolver: SimpleResolvable, SimpleStorable, CustomDebug
             return "\(type)"
         }
     }
-    
+
     // MARK: testing
-    
+
     func removeAll() {
         queue.sync {
             factories.removeAll()

Sources/InfomaniakDI/SimpleResolver.swift

@@ -1,20 +1,15 @@
-/*
- InfomaniakDITests
- Copyright (C) 2023 Infomaniak Network SA
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
 
 @testable import InfomaniakDI
 import XCTest

Tests/InfomaniakDITests/ITInjectService.swift

@@ -1,20 +1,15 @@
-/*
- InfomaniakDITests
- Copyright (C) 2023 Infomaniak Network SA
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+//  software distributed under the License is distributed on an
+//  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//  KIND, either express or implied.  See the License for the
+//  specific language governing permissions and limitations
+//  under the License.
 
 @testable import InfomaniakDI
 import XCTest