[WIP] 3.0

.Package.Test.swift

@@ -26,7 +26,8 @@ let package = Package(
                 "Quick",
                 "Nimble",
                 "Swinject",
-            ]
+            ],
+            path: "Tests"
         ),
     ]
 )

.gitignore

@@ -65,5 +65,8 @@ fastlane/screenshots
 ## Mac
 .DS_Store
 
+## Sourcery
+.sourcery.dump
+
 ## Swinject
 Swinject.framework.zip

.sourcery.yml

@@ -0,0 +1,6 @@
+sources:
+  - Sources
+templates:
+  - Templates
+output:
+  .sourcery.dump

.swiftformat

@@ -2,3 +2,4 @@
 --exclude .Package.Test.swift
 --exclude Package.swift
 --header "\n Copyright © {created.year} Swinject Contributors. All rights reserved.\n"
+--exclude Tests/Support/GeneratedMocks.swift

.swiftlint.yml

@@ -6,7 +6,8 @@ included:
   - Sources
   - Tests
 excluded:
-  - Sources/Container.Arguments.swift
-  - Sources/SynchronizedResolver.Arguments.swift
-  - Sources/Resolver.swift
-  - Sources/ServiceEntry.TypeForwarding.swift
+  - Sources/2.0 API/Container+Registration.swift
+  - Sources/2.0 API/SynchronizedResolver+Arguments.swift
+  - Sources/2.0 API/Resolver+LegacyApi.swift
+  - Sources/2.0 API/ServiceEntry+TypeForwarding.swift
+  - Tests/Support/GeneratedMocks.swift

.travis.yml

@@ -3,8 +3,6 @@ env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - PROJECT=Swinject.xcodeproj
-git:
-  submodules: false
 matrix:
   include:
     - env: JOB="LINUX_SPM" SWIFT_VERSION="5.0"
@@ -23,13 +21,15 @@ matrix:
       before_install:
       script:
         - pod lib lint
-    - env: JOB="XCODE" DEST="OS=10.0,name=iPhone 6" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test" PLATFORM="iOS"
+    - env: JOB="XCODE" DEST="OS=10.0,name=iPhone 6" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test" PLATFORM="iOS" CONFIG="Release"
       osx_image: xcode10.2
-    - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="Swinject-macOS" SDK="macosx" ACTION="test" PLATFORM="OSX"
+    - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="Swinject-macOS" SDK="macosx" ACTION="test" PLATFORM="OSX" CONFIG="Release"
       osx_image: xcode10.2
-    - env: JOB="XCODE" DEST="OS=10.0,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" ACTION="test" PLATFORM="tvOS"
+    - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="Swinject-macOS" SDK="macosx" ACTION="test" PLATFORM="OSX" CONFIG="Release"
+      osx_image: xcode11
+    - env: JOB="XCODE" DEST="OS=10.0,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" ACTION="test" PLATFORM="tvOS" CONFIG="Debug"
       osx_image: xcode10.2
-    - env: JOB="XCODE" DEST="OS=2.2,name=Apple Watch - 42mm" SCHEME="Swinject-watchOS" SDK="watchsimulator" ACTION="build" PLATFORM="watchOS"
+    - env: JOB="XCODE" DEST="OS=2.2,name=Apple Watch - 42mm" SCHEME="Swinject-watchOS" SDK="watchsimulator" ACTION="build" PLATFORM="watchOS" CONFIG="Release"
       osx_image: xcode10.2
 
 before_install:
@@ -39,7 +39,7 @@ before_install:
   - carthage bootstrap --verbose --platform $PLATFORM
 script:
   - set -o pipefail
-  - xcodebuild "$ACTION" -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DEST" -configuration Release ENABLE_TESTABILITY=YES | xcpretty
+  - xcodebuild "$ACTION" -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DEST" -configuration "$CONFIG" ENABLE_TESTABILITY=YES | xcpretty
 notifications:
   email:
     on_success: never

LinuxMain.swift

@@ -0,0 +1,10 @@
+//
+//  Copyright © 2019 Swinject Contributors. All rights reserved.
+//
+
+import Quick
+import XCTest
+
+@testable import SwinjectTests
+
+Quick.QCKMain(SwinjectTests.allSpecs)

Sources/Assembler.swift → Sources/2.0 API/Assembler.swift

@@ -20,33 +20,6 @@ public final class Assembler {
         self.container = container!
     }
 
-    /// Will create an empty `Assembler`
-    ///
-    /// - parameter parentAssembler: the baseline assembler
-    /// - parameter defaultObjectScope: default object scope for container
-    /// - parameter behaviors: list of behaviors to be added to the container
-    public init(parentAssembler: Assembler?, defaultObjectScope: ObjectScope = .graph, behaviors: [Behavior] = []) {
-        container = Container(
-            parent: parentAssembler?.container,
-            defaultObjectScope: defaultObjectScope,
-            behaviors: behaviors
-        )
-    }
-
-    /// Will create a new `Assembler` with the given `Assembly` instances to build a `Container`
-    ///
-    /// - parameter assemblies:         the list of assemblies to build the container from
-    /// - parameter container:          the baseline container
-    ///
-    @available(*, deprecated, message: "Use not throwing alternative: init(_:, container:)")
-    public convenience init(assemblies: [Assembly], container: Container? = Container()) throws {
-        if let container = container {
-            self.init(assemblies, container: container)
-        } else {
-            self.init(assemblies)
-        }
-    }
-
     /// Will create a new `Assembler` with the given `Assembly` instances to build a `Container`
     ///
     /// - parameter assemblies:         the list of assemblies to build the container from
@@ -60,26 +33,44 @@ public final class Assembler {
     /// Will create a new `Assembler` with the given `Assembly` instances to build a `Container`
     ///
     /// - parameter assemblies:         the list of assemblies to build the container from
-    /// - parameter parentAssembler:    the baseline assembler
-    ///
-    @available(*, deprecated, message: "Use not throwing alternative: init(_:, parent:)")
-    public convenience init(assemblies: [Assembly], parentAssembler: Assembler?) throws {
-        self.init(_: assemblies, parent: parentAssembler)
+    /// - parameter parent:             the baseline assembler
+    /// - parameter defaultObjectScope: default object scope for container
+    /// - parameter behaviors:          list of behaviors to be added to the container
+    public convenience init(
+        _ assemblies: [Assembly] = [],
+        parent: Assembler? = nil,
+        defaultObjectScope: ObjectScope = .graph,
+        behaviors: [Behavior] = []
+    ) {
+        self.init(
+            assemblies,
+            parent: parent,
+            defaultScope: defaultObjectScope.scope,
+            defaultMakeRef: defaultObjectScope.makeRef,
+            behaviors: behaviors
+        )
     }
 
     /// Will create a new `Assembler` with the given `Assembly` instances to build a `Container`
     ///
     /// - parameter assemblies:         the list of assemblies to build the container from
     /// - parameter parent:             the baseline assembler
-    /// - parameter defaultObjectScope: default object scope for container
+    /// - parameter defaultScope:       default  scope for container
+    /// - parameter defaultMakeRef:     default  reference maker for container (`strongRef` by default)
     /// - parameter behaviors:          list of behaviors to be added to the container
     public init(
-        _ assemblies: [Assembly],
-        parent: Assembler?,
-        defaultObjectScope: ObjectScope = .graph,
+        _ assemblies: [Assembly] = [],
+        parent: Assembler? = nil,
+        defaultScope: AnyScope?,
+        defaultMakeRef: @escaping ReferenceMaker<Any> = strongRef,
         behaviors: [Behavior] = []
     ) {
-        container = Container(parent: parent?.container, defaultObjectScope: defaultObjectScope, behaviors: behaviors)
+        container = Container(
+            parent: parent?.container,
+            defaultScope: defaultScope,
+            defaultMakeRef: defaultMakeRef,
+            behaviors: behaviors
+        )
         run(assemblies: assemblies)
     }