removed unneded builds from travis

updated travis config
bumped swift version to 4.1
2018-04-28 20:05:53 +01:00 · 2018-04-28 19:48:03 +01:00 · 2018-04-28 19:43:49 +01:00 · 2018-04-28 19:41:45 +01:00 · 2018-04-28 19:39:46 +01:00 · 2018-04-28 19:21:05 +01:00
77 changed files with 2639 additions and 2631 deletions
@@ -0,0 +1 @@
+4.1
@@ -1,24 +1,19 @@
-env:
-  global:
-    - MODULE_NAME=Dip
-
 matrix:
  allow_failures:
    - os: linux
  include:
    - script:
-        - set -o pipefail && xcodebuild test -workspace Dip.xcworkspace -scheme Dip-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' ONLY_ACTIVE_ARCH=NO | xcpretty -c
-        - set -o pipefail && xcodebuild test -workspace Dip.xcworkspace -scheme Dip-OSX -sdk macosx -destination 'platform=OS X,arch=x86_64' ONLY_ACTIVE_ARCH=NO | xcpretty -c
-        - set -o pipefail && xcodebuild test -workspace Dip.xcworkspace -scheme Dip-tvOS -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV 1080p,OS=latest' ONLY_ACTIVE_ARCH=NO | xcpretty -c
-        - set -o pipefail && xcodebuild -workspace Dip.xcworkspace -scheme Dip-watchOS -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch - 38mm,OS=latest' ONLY_ACTIVE_ARCH=NO | xcpretty - c
-        - set -o pipefail && xcodebuild test -workspace Dip.xcworkspace -scheme DipSampleApp -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' ONLY_ACTIVE_ARCH=NO | xcpretty -c
-        - pod lib lint --quick
+        - set -o pipefail && xcodebuild test -workspace Dip.xcworkspace -scheme Dip -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' ONLY_ACTIVE_ARCH=NO | xcpretty -c
+        - set -o pipefail && xcodebuild test -workspace Dip.xcworkspace -scheme Dip -sdk macosx -destination 'platform=macOS,arch=x86_64' ONLY_ACTIVE_ARCH=NO | xcpretty -c
+        - pod spec lint --allow-warnings
        - carthage build --no-skip-current
      os: osx
-      osx_image: xcode7.3
+      osx_image: xcode9.3
      language: objective-c
+      before_install:
+        - gem install cocoapods --version 1.1.0.rc.2 --no-document
    - script:
-        - swift build
+        - swift package clean && swift build && swift test
      os: linux
      dist: trusty
      sudo: required
@@ -26,16 +21,13 @@ matrix:
      before_install:
        - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
        - cd ..
-        - export SWIFT_VERSION=swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a
-        - wget https://swift.org/builds/development/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz
+        - export SWIFT_VERSION=swift-4.1-RELEASE
+        - wget https://swift.org/builds/swift-4.1-release/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz
        - tar xzf $SWIFT_VERSION-ubuntu14.04.tar.gz
        - export PATH="${PWD}/${SWIFT_VERSION}-ubuntu14.04/usr/bin:${PATH}"
-        - export SWIFT_RELEASE_VERSION=2.2.1
-        - export SWIFT_RELEASE_NAME="${SWIFT_RELEASE_VERSION}-RELEASE"
-        - wget https://swift.org/builds/swift-$SWIFT_RELEASE_VERSION-release/ubuntu1404/swift-$SWIFT_RELEASE_NAME/swift-$SWIFT_RELEASE_NAME-ubuntu14.04.tar.gz 
-        - tar xzf swift-$SWIFT_RELEASE_NAME-ubuntu14.04.tar.gz
-        - export SWIFT_EXEC="${PWD}/swift-${SWIFT_RELEASE_NAME}-ubuntu14.04/usr/bin/swiftc"
-        - cd $MODULE_NAME
+        - cd Dip
+    - script:
+        - swift package clean && swift build && swift test

 notifications:
  email: false
@@ -1,12 +1,96 @@
 # CHANGELOG

+## 6.1
+
+* Swift 4.1 support
+* Fixed crashes resolving singletons using collaborating containers
+  [#179](https://github.com/AliSoftware/Dip/pull/179), [@trimmurrti](https://github.com/trimmurrti)
+  [#182](https://github.com/AliSoftware/Dip/pull/182), [@tapsandswipes](https://github.com/tapsandswipes)
+
+## 6.0
+
+* Swift 4 support
+* Fixed unneeded reuse of singletons in collaborating containers. 
+  Containers now first attempt to autowire components and fallback to collaboration when it fails.  
+  [#169](https://github.com/AliSoftware/Dip/issues/169), [@ilyapuchka](https://github.com/ilyapuchka)
+
+## 5.1
+
+* Dropped Swift 2.3 support.  
+  [#150](https://github.com/AliSoftware/Dip/issues/150), [@ilyapuchka](https://github.com/ilyapuchka)
+* Added custom logging function.  
+  [#146](https://github.com/AliSoftware/Dip/issues/146), [@Pr0Ger](https://github.com/Pr0Ger)
+  
+#### Fixed
+
+* Fixed Swift 3.1 warnings.  
+  [#145](https://github.com/AliSoftware/Dip/issues/145), [@DenHeadless](https://github.com/DenHeadless)
+* Fixed collaboration shared references.  
+  [#151](https://github.com/AliSoftware/Dip/issues/151), [@ilyapuchka](https://github.com/ilyapuchka)
+* Fixed autowiring when using tags.  
+  [#154](https://github.com/AliSoftware/Dip/issues/154), [@ilyapuchka](https://github.com/ilyapuchka)
+
+## 5.0.4
+
+#### Fixed
+
+* Fixed broken compatibility for Swift 2.3 API in `resolve(tag:arguments:)` method.  
+  [#135](https://github.com/AliSoftware/Dip/issues/135), [@ilyapuchka](https://github.com/ilyapuchka)
+  
+## 5.0.3
+
+* Added Swift 2.3 compatibility. `swift2.3` brunch is no longer maintained.  
+  [#127](https://github.com/AliSoftware/Dip/issues/127), [@ilyapuchka](https://github.com/ilyapuchka)
+
+#### Fixed
+
+* Fixed reusing instances registered with `WeakSingleton` scope  
+  [#129](https://github.com/AliSoftware/Dip/issues/129), [@ilyapuchka](https://github.com/ilyapuchka)
+
+## 5.0.2
+
+#### Fixed
+
+* Fixed Swift 3 issues related to reflection and IUO  
+  [#125](https://github.com/AliSoftware/Dip/issues/125), [@ilyapuchka](https://github.com/ilyapuchka)
+
+## 5.0.1
+
+This release is the same as 5.0.0 and only fixes CocoaPods speck pushed to trunk without macOS, tvOS and watchOS deployment targets. Please use this release instead of 5.0.0 if you integrate Dip via Cocoapods.
+
+## 5.0.0
+
+* Migrated to Swift 3.0  
+  [#120](https://github.com/AliSoftware/Dip/issues/120), [@patrick-lind](https://github.com/patrick-lind), [@mark-urbanthings](https://github.com/mark-urbanthings), [@ilyapuchka](https://github.com/ilyapuchka)
+* Renamed `DefinitionOf` to `Definition` and some other source-breaking refactoring.  
+  [#113](https://github.com/AliSoftware/Dip/issues/113), [@ilyapuchka](https://github.com/ilyapuchka)
+* Added `invalidType` error when resolved instance does not implement requested type.  
+  [#118](https://github.com/AliSoftware/Dip/issues/118), [@ilyapuchka](https://github.com/ilyapuchka)
+* Added optional `type` parameter in register methods to be able to specify type when registering using method literal instead of closure.
+  [#115](https://github.com/AliSoftware/Dip/issues/115), [@ilyapuchka](https://github.com/ilyapuchka)
+* Added `implements` family of methods in to `Definition` to register type-forwarding definitions.  
+  [#114](https://github.com/AliSoftware/Dip/issues/114), [@ilyapuchka](https://github.com/ilyapuchka)
+* Shared scope is now the default scope.  
+  [#112](https://github.com/AliSoftware/Dip/issues/112), [@ilyapuchka](https://github.com/ilyapuchka)
+* Single target project setup.  
+  [#121](https://github.com/AliSoftware/Dip/issues/121), [@ilyapuchka](https://github.com/ilyapuchka)
+* Simplified implementation of auto-wiring.  
+  [#117](https://github.com/AliSoftware/Dip/issues/117), [@ilyapuchka](https://github.com/ilyapuchka)
+
+
+#### Fixed
+* Auto-injected properties inherited from super class are now properly injected when resolving subclass. 
+Added `resolveDependencies(_:DependencyContainer)` method to `Resolvable` protocol to handle inheritance when resolving.  
+  [#116](https://github.com/AliSoftware/Dip/issues/116), [@ilyapuchka](https://github.com/ilyapuchka)
+  
+  
 ## 4.6.1

 #### Fixed

-* Fixed sharing singletons between collaborating containers
+* Fixed sharing singletons between collaborating containers.  
  [#103](https://github.com/AliSoftware/Dip/issues/103), [@ilyapuchka](https://github.com/ilyapuchka)
-* Renamed some public API's (see release notes for more info)
+* Renamed some public API's (see release notes for more info).  
  [#105](https://github.com/AliSoftware/Dip/issues/105), [@ilyapuchka](https://github.com/ilyapuchka)

 ## 4.6.0
@@ -155,7 +239,7 @@
  This code: 
  
  ```swift
-  container.register("some tag") { SomeClass() as SomeProtocol }
+  container.register(tag: "some tag") { SomeClass() as SomeProtocol }
  container.resolve("some tag") as SomeProtocol
  ```
  
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name             = "Dip"
-  s.version          = "4.6.1"
+  s.version          = "6.1"
  s.summary          = "Dependency Injection for Swift made easy."

  s.description      = <<-DESC
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0710"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0903B3771C1615EC002241C1"
-               BuildableName = "Dip.framework"
-               BlueprintName = "Dip-iOS"
-               ReferencedContainer = "container:Dip.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0903B3801C1615EC002241C1"
-               BuildableName = "Dip-iOSTests.xctest"
-               BlueprintName = "Dip-iOSTests"
-               ReferencedContainer = "container:Dip.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0903B3771C1615EC002241C1"
-            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-iOS"
-            ReferencedContainer = "container:Dip.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0903B3771C1615EC002241C1"
-            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-iOS"
-            ReferencedContainer = "container:Dip.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0903B3771C1615EC002241C1"
-            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-iOS"
-            ReferencedContainer = "container:Dip.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0710"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0903B3A51C1618AF002241C1"
-               BuildableName = "Dip.framework"
-               BlueprintName = "Dip-tvOS"
-               ReferencedContainer = "container:Dip.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0903B3AE1C1618AF002241C1"
-               BuildableName = "Dip-tvOSTests.xctest"
-               BlueprintName = "Dip-tvOSTests"
-               ReferencedContainer = "container:Dip.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0903B3A51C1618AF002241C1"
-            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-tvOS"
-            ReferencedContainer = "container:Dip.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0903B3A51C1618AF002241C1"
-            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-tvOS"
-            ReferencedContainer = "container:Dip.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0903B3A51C1618AF002241C1"
-            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-tvOS"
-            ReferencedContainer = "container:Dip.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0710"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0903B4031C162862002241C1"
-               BuildableName = "Dip.framework"
-               BlueprintName = "Dip-watchOS"
-               ReferencedContainer = "container:Dip.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0903B4031C162862002241C1"
-            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-watchOS"
-            ReferencedContainer = "container:Dip.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "0903B4031C162862002241C1"
-            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-watchOS"
-            ReferencedContainer = "container:Dip.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0930"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -16,7 +16,21 @@
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "0903B3571C161543002241C1"
               BuildableName = "Dip.framework"
-               BlueprintName = "Dip-OSX"
+               BlueprintName = "Dip"
+               ReferencedContainer = "container:Dip.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0903B3601C161543002241C1"
+               BuildableName = "DipTests.xctest"
+               BlueprintName = "DipTests"
               ReferencedContainer = "container:Dip.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -26,6 +40,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
@@ -33,8 +48,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "0903B3601C161543002241C1"
-               BuildableName = "Dip-OSXTests.xctest"
-               BlueprintName = "Dip-OSXTests"
+               BuildableName = "DipTests.xctest"
+               BlueprintName = "DipTests"
               ReferencedContainer = "container:Dip.xcodeproj">
            </BuildableReference>
         </TestableReference>
@@ -44,7 +59,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "0903B3571C161543002241C1"
            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-OSX"
+            BlueprintName = "Dip"
            ReferencedContainer = "container:Dip.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -66,7 +81,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "0903B3571C161543002241C1"
            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-OSX"
+            BlueprintName = "Dip"
            ReferencedContainer = "container:Dip.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -84,7 +99,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "0903B3571C161543002241C1"
            BuildableName = "Dip.framework"
-            BlueprintName = "Dip-OSX"
+            BlueprintName = "Dip"
            ReferencedContainer = "container:Dip.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -9,7 +9,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -9,7 +9,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -0,0 +1,2 @@
+[
+]
@@ -8,7 +8,7 @@ let container = DependencyContainer()

 ### Auto-Injection

-On the previous page you saw how auto-wiring helps us get rid of boilerplate code when registering and resolving components with consturctor injection. Auto-injection solves the same problem for property injection.
+On the previous page you saw how auto-wiring helps us to get rid of boilerplate code when registering and resolving components with consturctor injection. Auto-injection solves the same problem for property injection.

 Let's say you have following related components:
 */
@@ -47,10 +47,10 @@ With auto-injection your code transforms to this:
 */

 class AutoInjectedServiceImp: Service {
-    private var injectedLogger = Injected<Logger>()
+    private let injectedLogger = Injected<Logger>()
    var logger: Logger? { return injectedLogger.value }
    
-    private var injectedTracker = Injected<Tracker>()
+    private let injectedTracker = Injected<Tracker>()
    var tracker: Tracker? { return injectedTracker.value }
 }

@@ -83,9 +83,7 @@ container.register { ServerWithRequiredClient() }
 do {
    let serverWithClient = try container.resolve() as ServerWithRequiredClient
 }
-catch {
-    print(error)
-}
+catch {}

 /*:
 You can make auto-injected property optional by passing `false` to `required` parameter of `Injected<T>`/`InjectedWeak<T>` constructor. For such properties container will ignore any errors when it resolves this property (or any of its dependencies).
@@ -127,11 +125,11 @@ class ServerClientImp: ServerClient {
 The standard way to register such components in `DependencyContainer` will lead to such code:
 */

-container.register(.Shared) {
+container.register {
    ServerClientImp(server: try container.resolve()) as ServerClient
 }

-container.register(.Shared) { ServerImp() as Server }
+container.register { ServerImp() as Server }
    .resolvingProperties { (container: DependencyContainer, server: Server) in
        (server as! ServerImp).client = try container.resolve() as ServerClient
 }
@@ -153,8 +151,8 @@ class InjectedClientImp: ServerClient {
    var server: Server? { get { return injectedServer.value } }
 }

-container.register(.Shared) { InjectedServerImp() as Server }
-container.register(.Shared) { InjectedClientImp() as ServerClient }
+container.register { InjectedServerImp() as Server }
+container.register { InjectedClientImp() as ServerClient }

 let injectedClient = try! container.resolve() as ServerClient
 injectedClient.server
@@ -7,7 +7,7 @@ import UIKit

 ### Auto-wiring

-Among three main DI patterns - _constructor_, _property_ and _method_ injection - construction injection should be your choise by default. Dip makes use of this pattern very simple. 
+Among three main DI patterns - _constructor_, _property_ and _method_ injection - constructor injection should be your choise by default. Dip makes using this pattern very simple.

 Let's say you have some VIPER module with following components:
 */
@@ -28,7 +28,7 @@ class View: UIView, ViewOutput {}
 class ServiceImp: Service {}

 /*:
-VIPER module by its nature consists of a lot of components, wired up using protocols. Using construction injection you can end up with following constructors for presenter and interactor:
+VIPER module by its nature consists of a lot of components, wired up using protocols. Using constructor injection you can end up with following constructors for presenter and interactor:
 */

 class InteractorImp: Interactor {
@@ -109,7 +109,7 @@ You don't need to call `resolve` in a factory and care about order of arguments

 The only requirement is that all constructor arguments should be registered in the container and there should be no several factories with the same _number_ of arguments registered for the same components. 

-In very rare case when you have several different factories with different set of runtime arguments registered for the same component, when you try to resolve it container will try to use these factories one by one until one of them succeeds starting with a factory with most numbers of arguments. If it finds two factories with the same number of arguments it will throw an error.
+In very rare cases when you have several factories for the same component with different set of runtime arguments, when you try to resolve it container will try to use factory registered for the same type and tag (if provided, otherwise registered without tag) and with the maximum number of runtime arguments. If it finds two factories registered for the same type and tag and with the same number but different types of arguments it will throw an error.

 You can use auto-wiring with tags. The tag that you pass to `resolve` method will be used to resolve each of the constructor arguments.
 */
@@ -1,6 +1,7 @@
 //: [Previous: Scopes](@previous)

 import Dip
+import Foundation

 let container = DependencyContainer()

@@ -25,7 +26,7 @@ class NetworkClientImp: NetworkClient {
    init() {}
 }

-class Interactor: NetworkClientDelegate {
+class Interactor: NSObject, NetworkClientDelegate {
    let networkClient: NetworkClient
    init(networkClient: NetworkClient) {
        self.networkClient = networkClient
@@ -43,11 +44,11 @@ It's very important that _at least one_ of them uses property injection, because
 Now you can register those classes in container:
 */

-container.register(.Shared) {
+container.register {
    Interactor(networkClient: try container.resolve()) as NetworkClientDelegate
 }

-container.register(.Shared) { NetworkClientImp() as NetworkClient }
+container.register { NetworkClientImp() as NetworkClient }
    .resolvingProperties { (container, client) -> () in
        client.delegate = try container.resolve() as NetworkClientDelegate
 }
@@ -77,25 +78,25 @@ let networkClient = try! container.resolve() as NetworkClient
 networkClient.delegate // delegate was alread released =(

 /*:
-Note also that we used `.Shared` scope to register implementations. This is also very important to preserve consistency of objects relationships.
+Note also that we used `.shared` scope to register implementations. This is also very important to preserve consistency of objects relationships.

-If we would have used `.Unique` scope for both components then container would not reuse instances and we would have an infinite loop:
+If we would have used `.unique` scope for both components then container would not reuse instances and we would have an infinite loop:

 - Each attempt to resolve `NetworkClientDelegate` will create new instance of `Interactor`.
 - It will resolve `NetworkClient` which will create new instance of `NetworkClientImp`.
 - It will try to resolve it's delegate property and that will create new instance of `Interactor`
 - … And so on and so on.

-If we would have used `.Unique` for one of the components it will lead to the same infinite loop or one of the relationships will be invalid:
+If we would have used `.unique` for one of the components it will lead to the same infinite loop or one of the relationships will be invalid:
 */

 container.reset()

-container.register(.Unique) {
+container.register(.unique) {
    Interactor(networkClient: try container.resolve()) as NetworkClientDelegate
 }

-container.register(.Shared) { NetworkClientImp() as NetworkClient }
+container.register { NetworkClientImp() as NetworkClient }
    .resolvingProperties { (container, client) -> () in
        client.delegate = try container.resolve() as NetworkClientDelegate
 }
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Timeline
-   version = "3.0">
-   <TimelineItems>
-   </TimelineItems>
-</Timeline>
@@ -11,10 +11,10 @@ import Dip
 protocol DataStore {}
 class CoreDataStore: DataStore {}
 class AddEventWireframe {
-    var eventsListWireframe: EventsListWireframe!
+    var eventsListWireframe: EventsListWireframe?
 }
 class EventsListWireframe {
-    var addEventWireframe: AddEventWireframe!
+    var addEventWireframe: AddEventWireframe?
    let dataStore: DataStore
    init(dataStore: DataStore) {
        self.dataStore = dataStore
@@ -23,10 +23,10 @@ class EventsListWireframe {


 let rootContainer = DependencyContainer()
-rootContainer.register(.Singleton) { CoreDataStore() as DataStore }
+rootContainer.register(.singleton) { CoreDataStore() as DataStore }

 let eventsListModule = DependencyContainer()
-eventsListModule.register(.Shared) { EventsListWireframe(dataStore: $0) }
+eventsListModule.register { EventsListWireframe(dataStore: $0) }
    .resolvingProperties { container, wireframe in
        wireframe.addEventWireframe = try container.resolve()
 }
@@ -48,12 +48,12 @@ eventsListWireframe.addEventWireframe
 eventsListModule.reset()
 addEventModule.reset()

-eventsListModule.register(.Shared) { EventsListWireframe(dataStore: $0) }
+eventsListModule.register { EventsListWireframe(dataStore: $0) }
    .resolvingProperties { container, wireframe in
        wireframe.addEventWireframe = try container.resolve()
 }

-addEventModule.register(.Shared) { AddEventWireframe() }
+addEventModule.register { AddEventWireframe() }
    .resolvingProperties { container, wireframe in
        wireframe.eventsListWireframe = try container.resolve()
 }
@@ -62,7 +62,7 @@ addEventModule.collaborate(with: eventsListModule)

 eventsListWireframe = try eventsListModule.resolve() as EventsListWireframe
 eventsListWireframe.addEventWireframe
-eventsListWireframe.addEventWireframe.eventsListWireframe === eventsListWireframe
+eventsListWireframe.addEventWireframe?.eventsListWireframe === eventsListWireframe

 /*:
 If you try to link container with itself it will be silently ignored. When forwarding request collaborating containers will be iterated in the same order that they were added.
@@ -15,18 +15,15 @@ Note that __types__, __number__ and __order__ of arguments matters and you can r
 container.register { (url: NSURL, port: Int) in ServiceImp4(name: "1", baseURL: url, port: port) as Service }
 container.register { (port: Int, url: NSURL) in ServiceImp4(name: "2", baseURL: url, port: port) as Service }
 container.register { (port: Int, url: NSURL?) in ServiceImp4(name: "3", baseURL: url!, port: port) as Service }
-container.register { (port: Int, url: NSURL!) in ServiceImp4(name: "4", baseURL: url, port: port) as Service }

 let url: NSURL = NSURL(string: "http://example.com")!
 let service1 = try! container.resolve(arguments: url, 80) as Service
 let service2 = try! container.resolve(arguments: 80, url) as Service
 let service3 = try! container.resolve(arguments: 80, NSURL(string: "http://example.com")) as Service
-let service4 = try! container.resolve(arguments: 80, NSURL(string: "http://example.com")! as NSURL!) as Service

 (service1 as! ServiceImp4).name
 (service2 as! ServiceImp4).name
 (service3 as! ServiceImp4).name
-(service4 as! ServiceImp4).name

 /*:
 Note that all of the services were resolved using different factories.
@@ -35,12 +32,15 @@ _Dip_ supports up to six runtime arguments. If that is not enougth you can exten
 */

 extension DependencyContainer {
-    public func register<T, A, B, C, D, E, F, G>(tag tag: DependencyTagConvertible? = nil, _ scope: ComponentScope = .Unique, factory: (A, B, C, D, E, F, G) throws -> T) -> DefinitionOf<T, (A, B, C, D, E, F, G) throws -> T> {
-        return registerFactory(tag: tag, scope: scope, factory: factory, numberOfArguments: 7) { container, tag in try factory(container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag))
+    
+    @discardableResult
+    public func register<T, A, B, C, D, E, F, G>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: DependencyTagConvertible? = nil, factory: @escaping (A, B, C, D, E, F, G) throws -> T) -> Definition<T, (A, B, C, D, E, F, G)> {
+        return register(scope: scope, type: type, tag: tag, factory: factory, numberOfArguments: 7) { container, tag in
+            try factory(container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag))
        }
    }
    
-    public func resolve<T, A, B, C, D, E, F, G>(tag tag: DependencyTagConvertible? = nil, _ arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F, _ arg7: G) throws -> T {
+    public func resolve<T, A, B, C, D, E, F, G>(tag: DependencyTagConvertible? = nil, _ arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F, _ arg7: G) throws -> T {
        return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4, arg5, arg6, arg7) }
    }
 }
@@ -13,20 +13,20 @@ Dip supports three different scopes of objects: _Unique_, _Shared_ and _Singleto
 * The `Unique` scope will make the `DependencyContainer` resolve your type as __a new instance every time__ you call `resolve`. This is the default scope.
 * The `Shared` scope is like `Unique` scope, but it will make the `DependencyContainer` to reuse resolved instances during one (recursive) call to `resolve` method. When this call returns, all resolved instances will be discarded and next call to `resolve` will produce new instances. This scope should be used to resolve [circular dependencies](Circular%20dependencies).
 * The `Singleton` scope will make the `DependencyContainer` retain the instance once resolved the first time, and reuse it in the next calls to `resolve` during the container lifetime.
-* The `EagerSingleton` scope is the same as `Singleton` scope but instances with this cope will be created when you call `bootstrap()` method on the container.
+* The `EagerSingleton` scope is the same as `Singleton` scope but instances with this scope will be created when you call `bootstrap()` method on the container.
 * The `WeakSingleton` scope is the same as `Singleton` scope but instances are stored in container as weak references. This scope can be usefull when you need to recreate object graph without reseting container.

 The `Unique` scope is the default. To set a scope you pass it as an argument to `register` method.
 */

 container.register { ServiceImp1() as Service }
-container.register(tag: "prototype", .Unique) { ServiceImp1() as Service }
-container.register(tag: "object graph", .Shared) { ServiceImp2() as Service }
-container.register(tag: "shared instance", .Singleton) { ServiceImp3() as Service }
+container.register(.unique, tag: "prototype") { ServiceImp1() as Service }
+container.register(.shared, tag: "object graph") { ServiceImp2() as Service }
+container.register(.singleton, tag: "shared instance") { ServiceImp3() as Service }

 let service = try! container.resolve() as Service
 let anotherService = try! container.resolve() as Service
-// They are different instances as the scope defaults to .Unique
+// They are different instances as the scope defaults to .unique
 service as! ServiceImp1 === anotherService as! ServiceImp1 // false

 let prototypeService = try! container.resolve(tag: "prototype") as Service
@@ -53,7 +53,7 @@ sharedService as! ServiceImp3 === sameSharedService as! ServiceImp3
 */

 var resolvedEagerSingleton = false
-let definition = container.register(tag: "eager shared instance", .EagerSingleton) { ServiceImp1() as Service }
+let definition = container.register(.eagerSingleton, tag: "eager shared instance") { ServiceImp1() as Service }
    .resolvingProperties { _ in resolvedEagerSingleton = true }

 try! container.bootstrap()
@@ -33,7 +33,7 @@ class ApiClientSingleton {
 }

 class MyViewControllerWithSingleton: UIViewController {
-  override func viewDidAppear(amimated: Bool) {
+  override func viewDidAppear(_ amimated: Bool) {
    super.viewDidAppear(amimated)
    ApiClientSingleton.sharedInstance.get("/users") { /* refresh your UI */ }
  }
@@ -71,13 +71,13 @@ class MyViewController: UIViewController {
  var apiClient: ApiClientProtocol!
  
  override func viewDidAppear(amimated: Bool) {
-    super.viewDidAppear(amimated)
+    super.viewDidAppear(_ amimated)
    apiClient.get("path") {}
  }
  
  convenience init(apiClient: ApiClientProtocol) {
-    self.init()
    self.apiClient = apiClient
+    self.init()
  }
  
  init() {
@@ -107,7 +107,7 @@ viewController = try MyViewController(apiClient: container.resolve())
 viewController.apiClient = try container.resolve()

 /*:
-Of cource `DependencyContainer` should not be a singleton too. There is just no need for that because you never should call `DependencyContainer` from inside of your components. That will make it a [service locator antipatter]((http://blog.ploeh.dk/2010/02/03/ServiceLocatorisanAnti-Pattern/)). You may only call `DependencyContainer` from the _Composition root_ - the place where all the components are configured and wired together.
+Of cource `DependencyContainer` should not be a singleton too. There is just no need for that because you never should call `DependencyContainer` from inside of your components. That will make it a [service locator antipattern]((http://blog.ploeh.dk/2010/02/03/ServiceLocatorisanAnti-Pattern/)). You may only call `DependencyContainer` from the _Composition root_ - the place where all the components are configured and wired together.

 Dependency Injection is a pattern (more precisely - a set of patterns) as well as a singleton. And any pattern can be abused. DI can be used in a [wrong way]((http://www.loosecouplings.com/2011/01/dependency-injection-using-di-container.html)), container can easily become a service locator. You should carefully decide when to use DI, you should not inject everything and everywhere and define a protocol for every single class you use. For every tool there is a right time and the same way as singleton can harm you the same way DI and protocols abuse can make your code unnececerry complex.

@@ -73,7 +73,7 @@ class MyTests/*: XCTestCase*/ {
 Reset container configuration to normal state:
 */
        container.reset()
-        configure(container)
+        configure(container: container)
    }
    
    func testThatDoSomethingIsCalled() {
@@ -27,21 +27,21 @@ extension AddPresenter: AddModuleInterface {}
 We can achieve this result by explicitly rosolving concrete types:
 */

-container.register(.Shared) { ListWireframe(addWireFrame: $0, listPresenter: $1) }
-container.register(.Shared) { AddWireframe(addPresenter: $0) }
+container.register { ListWireframe(addWireFrame: $0, listPresenter: $1) }
+container.register { AddWireframe(addPresenter: $0) }

-var listInteractorDefinition = container.register(.Shared) { ListInteractor() }
+var listInteractorDefinition = container.register { ListInteractor() }
    .resolvingProperties { container, interactor in
        interactor.output = try container.resolve() as ListPresenter
 }

-var listPresenterDefinition = container.register(.Shared) { ListPresenter() }
+var listPresenterDefinition = container.register { ListPresenter() }
    .resolvingProperties { container, presenter in
        presenter.listInteractor = try container.resolve() as ListInteractor
        presenter.listWireframe = try container.resolve()
 }

-var addPresenterDefinition = container.register(.Shared) { AddPresenter() }
+var addPresenterDefinition = container.register { AddPresenter() }
    .resolvingProperties { container, presenter in
        presenter.addModuleDelegate = try container.resolve() as ListPresenter
 }
@@ -57,18 +57,18 @@ listWireframe?.listPresenter === listPresenter
 Alternatively we can use type-forwarding. With type-forwarding we register definition for one (source) type and also for another (forwarded) type. When container will try to resolve forwarded type it will use the same definition as for source type, and (if registered in `Shared` scope or as a singleton) will reuse the same instance. With that you don't need to resolve concrete types in definitions:
 */

-listInteractorDefinition = container.register(.Shared) { ListInteractor() }
+listInteractorDefinition = container.register { ListInteractor() }
    .resolvingProperties { container, interactor in
        interactor.output = try container.resolve()
 }

-listPresenterDefinition = container.register(.Shared) { ListPresenter() }
+listPresenterDefinition = container.register { ListPresenter() }
    .resolvingProperties { container, presenter in
        presenter.listInteractor = try container.resolve()
        presenter.listWireframe = try container.resolve()
 }

-addPresenterDefinition = container.register(.Shared) { AddPresenter() }
+addPresenterDefinition = container.register { AddPresenter() }
    .resolvingProperties { container, presenter in
        presenter.addModuleDelegate = try container.resolve()
 }
@@ -76,11 +76,12 @@ addPresenterDefinition = container.register(.Shared) { AddPresenter() }
 /*:
 And now we register definitions for type-forwarding:
 */
-
-container.register(listInteractorDefinition, type: ListInteractorInput.self)
-container.register(listPresenterDefinition, type: ListInteractorOutput.self)
-container.register(listPresenterDefinition, type: ListModuleInterface.self)
-container.register(listPresenterDefinition, type: AddModuleDelegate.self)
+listInteractorDefinition
+    .implements(ListInteractorInput.self)
+listPresenterDefinition
+    .implements(ListInteractorOutput.self)
+    .implements(ListModuleInterface.self)
+    .implements(AddModuleDelegate.self)

 addPresenter = try! container.resolve() as AddPresenter
 listPresenter = addPresenter.addModuleDelegate as! ListPresenter
@@ -100,7 +101,7 @@ listInteractorDefinition
    .resolvingProperties { container, interactor in
        print("resolved ListInteractor")
 }
-container.register(listInteractorDefinition, type: ListInteractorInput.self)
+let _ = container.register(listInteractorDefinition, type: ListInteractorInput.self)
    .resolvingProperties { container, interactor in
        print("resolved ListInteractorInput")
 }
@@ -0,0 +1 @@
+[]
@@ -5,8 +5,8 @@
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![License](https://img.shields.io/cocoapods/l/Dip.svg?style=flat)](http://cocoapods.org/pods/Dip)
 [![Platform](https://img.shields.io/cocoapods/p/Dip.svg?style=flat)](http://cocoapods.org/pods/Dip)
-[![Swift Version](https://img.shields.io/badge/Linux-compatible-4BC51D.svg?style=flat)](https://developer.apple.com/swift)
-[![Swift Version](https://img.shields.io/badge/Swift-2.2-F16D39.svg?style=flat)](https://developer.apple.com/swift)
+[![Swift Version](https://img.shields.io/badge/Swift-3.0--3.1-F16D39.svg?style=flat)](https://developer.apple.com/swift)
+[![Swift Version](https://img.shields.io/badge/Linux-3.0--3.1-4BC51D.svg?style=flat)](https://developer.apple.com/swift)

 ![Animated Dipping GIF](cinnamon-pretzels-caramel-dipping.gif)  
 _Photo courtesy of [www.kevinandamanda.com](http://www.kevinandamanda.com/recipes/appetizer/homemade-soft-cinnamon-sugar-pretzel-bites-with-salted-caramel-dipping-sauce.html)_
@@ -17,45 +17,12 @@ _Photo courtesy of [www.kevinandamanda.com](http://www.kevinandamanda.com/recipe

 It's aimed to be as simple as possible yet provide rich functionality usual for DI containers on other platforms. It's inspired by `.NET`'s [Unity Container](https://msdn.microsoft.com/library/ff647202.aspx) and other DI containers.

-* You start by creating `let container = DependencyContainer()` and **registering your dependencies, by associating a _protocol_ or _type_ to a `factory`**.
-* Then you can call `container.resolve()` to **resolve an instance of _protocol_ or _type_** using that `DependencyContainer`.
+* You start by creating `let container = DependencyContainer()` and **registering your dependencies, by associating a _protocol_ or _type_ to a `factory`** using `container.register { MyService() as Service }`.
+* Then you can call `container.resolve() as Service` to **resolve an instance of _protocol_ or _type_** using that `DependencyContainer`.
+* You can easily use Dip along with **Storyboards and Nibs** - checkout **[Dip-UI](https://github.com/AliSoftware/Dip-UI)** extensions. There is also a **[code generator](https://github.com/ilyapuchka/dipgen)** that can help to simplify registering new components.

-> You can easily use Dip along with Storyboards and Nibs - checkout [Dip-UI](https://github.com/AliSoftware/Dip-UI) extensions. 
-
-## Documentation & Usage Examples
-
-Dip is completely [documented](http://cocoadocs.org/docsets/Dip/4.6.1/) and comes with a Playground that lets you try all its features and become familiar with API. You can find it in `Dip.xcworkspace`.
-
-> Note: it may happen that you will need to build Dip framework before playground will be able to use it. For that select `Dip-iOS` scheme and build.
-
-You can find bunch of usage examples in a [wiki](../../wiki). 
-
-If your are using [VIPER](https://www.objc.io/issues/13-architecture/viper/) architecture - [here](https://github.com/ilyapuchka/VIPER-SWIFT) is VIPER demo app that uses Dip instead of manual dependency injection.
-
-There are also several blog posts that describe how to use Dip and some of its implementation details:
-
- [IoC container in Swift](http://ilya.puchka.me/ioc-container-in-swift/)
- [IoC container in Swift. Circular dependencies and auto-injection](http://ilya.puchka.me/ioc-container-in-swift-circular-dependencies-and-auto-injection/)
- [Dependency injection with Dip](http://ilya.puchka.me/dependency-injecinjection-with-dip/)
-
-File an issue if you have any question.
-
-
-## Features
-
- **[Scopes](../../wiki/scopes)**. Dip supports 5 different scopes (or life cycle strategies): _Prototype_, _Shared_, _Singleton_, _EagerSingleton_, _WeakSingleton_;
- **[Named definitions](../../wiki/named-definitions)**. You can register different factories for the same protocol or type by registering them with [tags]();
- **[Runtime arguments](../../wiki/runtime-arguments)**. You can register factories that accept up to 6 runtime arguments;
- **[Circular dependencies](../../wiki/circular-dependencies)**. Dip can resolve circular dependencies;
- **[Auto-wiring](../../wiki/auto-wiring)** & **[Auto-injection](../../wiki/auto-injection)**. Dip can infer your components' dependencies injected in constructor and automatically resolve them as well as dependencies injected with properties.
- **[Type forwarding](../../wiki/type-forwarding)**. You can register the same factory to resolve different types.
- **[Storyboards integration](../../wiki/storyboards-integration)**. You can easily use Dip along with storyboards and Xibs without ever referencing container in your view controller's code;
- **Weakly typed components**. Dip can resolve weak types when they are unknown at compile time.
- **[Easy configuration](../../wiki/containers-collaboration)**. No complex container hierarchy, no unneeded functionality;
- **Thread safety**. Registering and resolving components is thread safe;
- **Helpful error messages and configuration validation**. You can validate your container configuration. If something can not be resolved at runtime Dip throws an error that completely describes the issue;
-
-## Basic usage
+<details>
+<summary>Basic usage</summary>

 ```swift
 import Dip
@@ -81,7 +48,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

 ```

-## More sophisticated example
+</details>
+
+<details>
+<summary>More sophisticated example</summary>

 ```swift
 import Dip
@@ -99,6 +69,9 @@ extension DependencyContainer {

 	static func configure() -> DependencyContainer {
 		return DependencyContainer { container in 
+			unowned let container = container
+			DependencyContainer.uiContainers = [container]
+		
 			container.register(tag: "ViewController") { ViewController() }
 			  .resolvingProperties { container, controller in
 				  controller.animationsFactory = try container.resolve() as AnimatonsFactory
@@ -136,49 +109,95 @@ class ViewController {

 ```

+</details>
+
+## Documentation & Usage Examples
+
+Dip is completely [documented](http://cocoadocs.org/docsets/Dip/5.0.0/) and comes with a Playground that lets you try all its features and become familiar with API. You can find it in `Dip.xcworkspace`.
+
+> Note: it may happen that you will need to build Dip framework before playground will be able to use it. For that select `Dip` scheme and build for iPhone Simulator.
+
+You can find bunch of usage examples and usfull tips in a [wiki](../../wiki). 
+
+If your are using [VIPER](https://www.objc.io/issues/13-architecture/viper/) architecture - [here](https://github.com/ilyapuchka/VIPER-SWIFT) is VIPER demo app that uses Dip instead of manual dependency injection.
+
+There are also several blog posts that describe how to use Dip and some of its implementation details:
+
+- [IoC container in Swift](http://ilya.puchka.me/ioc-container-in-swift/)
+- [IoC container in Swift. Circular dependencies and auto-injection](http://ilya.puchka.me/ioc-container-in-swift-circular-dependencies-and-auto-injection/)
+- [Dependency injection with Dip](http://ilya.puchka.me/dependency-injecinjection-with-dip/)
+
+File an issue if you have any question. Pull requests are warmly welcome too.
+
+
+## Features
+
+- **[Scopes](../../wiki/scopes)**. Dip supports 5 different scopes (or life cycle strategies): _Unique_, _Shared_, _Singleton_, _EagerSingleton_, _WeakSingleton_;
+- **[Auto-wiring](../../wiki/auto-wiring)** & **[Auto-injection](../../wiki/auto-injection)**. Dip can infer your components' dependencies injected in constructor and automatically resolve them as well as dependencies injected with properties.
+- **[Resolving optionals](../../wiki/resolving-optionals)**. Dip is able to resolve constructor or property dependencies defined as optionals.
+- **[Type forwarding](../../wiki/type-forwarding)**. You can register the same factory to resolve different types implemeted by a single class.
+- **[Circular dependencies](../../wiki/circular-dependencies)**. Dip will be able to resolve circular dependencies if you will follow some simple rules;
+- **[Storyboards integration](../../wiki/storyboards-integration)**. You can easily use Dip along with storyboards and Xibs without ever referencing container in your view controller's code;
+- **[Named definitions](../../wiki/named-definitions)**. You can register different factories for the same protocol or type by registering them with [tags]();
+- **[Runtime arguments](../../wiki/runtime-arguments)**. You can register factories that accept up to 6 runtime arguments (and extend it if you need);
+- **[Easy configuration](../../wiki/containers-collaboration)** & **Code generation**. No complex containers hierarchy, no unneeded functionality. Tired of writing all registrations by hand? There is a [cool code generator](https://github.com/ilyapuchka/dipgen) that will create them for you. The only thing you need is to annotate your code with some comments.
+- **Weakly typed components**. Dip can resolve "weak" types when they are unknown at compile time.
+- **Thread safety**. Registering and resolving components is thread safe;
+- **Helpful error messages and configuration validation**. You can validate your container configuration. If something can not be resolved at runtime Dip throws an error that completely describes the issue;
+
+
 ## Installation

-Since version 4.3.1 Dip is built with Swift 2.2. The latest version built with Swift 2.1 is 4.3.0.
+Since version 5.0.0 Dip is built with Swift 3.0. You can install Dip using your favorite dependency manager:

-Dip is available through [CocoaPods](http://cocoapods.org). To install
-it, simply add the following line to your Podfile:
+<details>
+<summary>CocoaPods</summary>
+
+`pod "Dip"`
+
+To build for Swift 2.3 add this code to the bottom of your Podfile

 ```ruby
-pod "Dip"
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['SWIFT_VERSION'] = '2.3'
+    end
+  end
+end
 ```

-If you use [Carthage](https://github.com/Carthage/Carthage) add this line to your Cartfile:
+> You need at least 1.1.0.rc.2 version of CocoaPods.
+
+</details>
+
+<details>
+<summary>Carthage</summary>

 ```
 github "AliSoftware/Dip"
 ```

-If you use [Swift Package Manager](https://swift.org/package-manager/) add Dip as dependency to you `Package.swift`:
+To build for Swift 2.3 run Carthage with `--toolchain com.apple.dt.toolchain.Swift_2_3` option.
+
+</details>
+
+<details>
+<summary>Swift Package Manager</summary>

 ```swift
-let package = Package(
-  name: "MyPackage",
-  dependencies: [
-    .Package(url: "https://github.com/AliSoftware/Dip.git", "4.6.1")
-  ]
-)
+.Package(url: "https://github.com/AliSoftware/Dip", majorVersion: 5, minor: 0)
 ```

+</details>
+
 ## Running tests

-On OSX you can run tests from Xcode. On Linux you need to have Swift Package Manager installed and use it to build and run tests:
-
-```
-cd Dip
-swift build && swift test
-```
-
-> Note: Swift Package Manager is destributed with Swift development snapshots only, so it builds packages using Swift 3. To build Dip you will need to build it with Swift 2.2, for that you need to set [`$SWIFT_EXEC`](https://github.com/apple/swift-package-manager#choosing-swift-version) environment variable.
+On OSX you can run tests from Xcode. On Linux you need to have Swift Package Manager installed and use it to build and run tests using this command: `swift build --clean && swift build && swift test`

 ## Credits

-This library has been created by [**Olivier Halligon**](olivier@halligon.net).  
-I'd also like to thank [**Ilya Puchka**](https://twitter.com/ilyapuchka) for his big contribution to it, as he added a lot of great features to it.
+This library has been created by [**Olivier Halligon**](olivier@halligon.net) and is maintained by [**Ilya Puchka**](https://twitter.com/ilyapuchka).

 **Dip** is available under the **MIT license**. See the `LICENSE` file for more info.

@@ -279,7 +279,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = AliSoftware;
 				TargetAttributes = {
 					0990225E1BC123C000E76F43 = {
@@ -414,6 +414,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.alisoftware.DipSampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -426,13 +427,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -460,6 +471,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -471,13 +483,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -496,6 +518,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 4.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -521,6 +544,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0930"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -40,8 +40,8 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -16,11 +16,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    
    private let container = DependencyContainer()
    
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
        // Override point for customization after application launch.
        
        //This is a composition root where container is configured and all dependencies are resolved
-        configureContainer(container)
+        configure(container: container)
        
        let personProvider = try! container.resolve() as PersonProviderAPI
        let starshipProvider = try! container.resolve() as StarshipProviderAPI
@@ -1,5 +1,15 @@
 {
  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
    {
      "idiom" : "iphone",
      "size" : "29x29",
@@ -31,6 +41,16 @@
      "size" : "60x60",
      "scale" : "3x"
    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
    {
      "idiom" : "ipad",
      "size" : "29x29",
@@ -62,6 +82,16 @@
      "idiom" : "ipad",
      "filename" : "Icon-152.png",
      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
    }
  ],
  "info" : {
@@ -12,8 +12,8 @@ protocol BaseCell {
    static var identifier: String { get }
    static var nib: UINib? { get }
    
-    static func register(tableView: UITableView)
-    static func dequeueFromTableView(tableView: UITableView, forIndexPath indexPath: NSIndexPath) -> Self
+    static func register(_ tableView: UITableView)
+    static func dequeueFromTableView(_ tableView: UITableView, forIndexPath indexPath: IndexPath) -> Self
 }

 extension BaseCell where Self : UITableViewCell {
@@ -22,16 +22,16 @@ extension BaseCell where Self : UITableViewCell {
    }
    static var nib: UINib? { return nil }
    
-    static func register(tableView: UITableView) {
+    static func register(_ tableView: UITableView) {
        if let cellNib = self.nib {
-            tableView.registerNib(cellNib, forCellReuseIdentifier: identifier)
+            tableView.register(cellNib, forCellReuseIdentifier: identifier)
        } else {
-            tableView.registerClass(Self.self as AnyClass, forCellReuseIdentifier: identifier)
+            tableView.register(Self.self as AnyClass, forCellReuseIdentifier: identifier)
        }
    }
    
-    static func dequeueFromTableView(tableView: UITableView, forIndexPath indexPath: NSIndexPath) -> Self {
-        return tableView.dequeueReusableCellWithIdentifier(identifier, forIndexPath: indexPath) as! Self
+    static func dequeueFromTableView(_ tableView: UITableView, forIndexPath indexPath: IndexPath) -> Self {
+        return tableView.dequeueReusableCell(withIdentifier: identifier, for: indexPath) as! Self
    }
 }

@@ -16,22 +16,22 @@ final class PersonCell : UITableViewCell, FillableCell {
    @IBOutlet weak var hairLabel: UILabel!
    @IBOutlet weak var eyesLabel: UILabel!
    
-    let heightFormatter: NSLengthFormatter = {
-        let f = NSLengthFormatter()
-        f.forPersonHeightUse = true
+    let heightFormatter: LengthFormatter = {
+        let f = LengthFormatter()
+        f.isForPersonHeightUse = true
        return f
        }()
-    let massFormatter: NSMassFormatter = {
-        let f = NSMassFormatter()
-        f.forPersonMassUse = true
+    let massFormatter: MassFormatter = {
+        let f = MassFormatter()
+        f.isForPersonMassUse = true
        return f
    }()
    
-    func fillWithObject(person: Person) {
+    func fillWithObject(object person: Person) {
        nameLabel.text = person.name
        genderImageView.image = person.gender.flatMap { UIImage(named: $0.rawValue) }
-        heightLabel.text = heightFormatter.stringFromValue(Double(person.height), unit: .Centimeter)
-        massLabel.text = massFormatter.stringFromValue(Double(person.mass), unit: .Kilogram)
+        heightLabel.text = heightFormatter.string(fromValue: Double(person.height), unit: .centimeter)
+        massLabel.text = massFormatter.string(fromValue: Double(person.mass), unit: .kilogram)
        hairLabel.text = person.hairColor
        eyesLabel.text = person.eyeColor
    }
@@ -15,13 +15,13 @@ final class StarshipCell : UITableViewCell, FillableCell {
    @IBOutlet weak var crewLabel: UILabel!
    @IBOutlet weak var passengersLabel: UILabel!
    
-    let numberFormatter = NSNumberFormatter()
+    let numberFormatter = NumberFormatter()
    
-    func fillWithObject(starship: Starship) {
+    func fillWithObject(object starship: Starship) {
        nameLabel.text = starship.name
        modelLabel.text = starship.model
        manufacturerLabel.text = starship.manufacturer
-        crewLabel.text = numberFormatter.stringFromNumber(starship.crew)
-        passengersLabel.text = numberFormatter.stringFromNumber(starship.passengers)
+        crewLabel.text = numberFormatter.string(from: NSNumber(integerLiteral: starship.crew))
+        passengersLabel.text = numberFormatter.string(from: NSNumber(integerLiteral: starship.passengers))
    }
 }
@@ -23,10 +23,10 @@ enum DependencyTags: Int, DependencyTagConvertible {
 }

 // MARK: Dependency Container for Providers
-func configureContainer(dip: DependencyContainer) {
+func configure(container dip: DependencyContainer) {
    
    // Register the NetworkLayer, same for everyone here (but we have the ability to register a different one for a specific WebService if we wanted to)
-    dip.register(.Singleton) { URLSessionNetworkLayer(baseURL: "http://swapi.co/api/")! as NetworkLayer }
+    dip.register(.singleton) { URLSessionNetworkLayer(baseURL: "http://swapi.co/api/")! as NetworkLayer }

    if FAKE_PERSONS {
        
@@ -9,7 +9,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -11,12 +11,12 @@ import Foundation
 ///Provides some dummy Person entities
 struct DummyPilotProvider : PersonProviderAPI {
    
-    func fetchIDs(completion: [Int] -> Void) {
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
        completion(Array(0..<5))
    }
    
-    func fetch(id: Int, completion: Person? -> Void) {
-        completion(dummyPerson(id))
+    func fetch(id: Int, completion: @escaping (Person?) -> Void) {
+        completion(dummyPerson(idx: id))
    }
    
    private func dummyPerson(idx: Int) -> Person {
@@ -40,9 +40,9 @@ class PlistPersonProvider : PersonProviderAPI {
    
    init(plist basename: String) {
        guard
-            let path = NSBundle.mainBundle().pathForResource(basename, ofType: "plist"),
+            let path = Bundle.main.path(forResource: basename, ofType: "plist"),
            let list = NSArray(contentsOfFile: path),
-            peopleDict = list as? [[String:AnyObject]]
+            let peopleDict = list as? [[String:AnyObject]]
            else {
                fatalError("PLIST for \(basename) not found")
        }
@@ -50,11 +50,11 @@ class PlistPersonProvider : PersonProviderAPI {
        self.people = peopleDict.map(PlistPersonProvider.personFromDict)
    }
    
-    func fetchIDs(completion: [Int] -> Void) {
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
        completion(Array(0..<people.count))
    }
    
-    func fetch(id: Int, completion: Person? -> Void) {
+    func fetch(id: Int, completion: @escaping (Person?) -> Void) {
        guard id < people.count else {
            completion(nil)
            return
@@ -65,12 +65,12 @@ class PlistPersonProvider : PersonProviderAPI {
    private static func personFromDict(dict: [String:AnyObject]) -> Person {
        guard
            let name = dict["name"] as? String,
-            height = dict["height"] as? Int,
-            mass = dict["mass"] as? Int,
-            hairColor = dict["hairColor"] as? String,
-            eyeColor = dict["eyeColor"] as? String,
-            genderStr = dict["gender"] as? String,
-            starshipsIDs = dict["starships"] as? [Int]
+            let height = dict["height"] as? Int,
+            let mass = dict["mass"] as? Int,
+            let hairColor = dict["hairColor"] as? String,
+            let eyeColor = dict["eyeColor"] as? String,
+            let genderStr = dict["gender"] as? String,
+            let starshipsIDs = dict["starships"] as? [Int]
            else {
                fatalError("Invalid Plist")
        }
@@ -98,16 +98,16 @@ class FakePersonsProvider: PersonProviderAPI {
        self.dummyProvider = dummyProvider
    }
    
-    func fetchIDs(completion: [Int] -> Void) {
-        dummyProvider.fetchIDs(completion)
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
+        dummyProvider.fetchIDs(completion: completion)
    }
    
-    func fetch(id: Int, completion: Person? -> Void) {
-        if let plistProvider = plistProvider where id == 0 {
-            plistProvider.fetch(id, completion: completion)
+    func fetch(id: Int, completion: @escaping (Person?) -> Void) {
+        if let plistProvider = plistProvider, id == 0 {
+            plistProvider.fetch(id: id, completion: completion)
        }
        else {
-            dummyProvider.fetch(id, completion: completion)
+            dummyProvider.fetch(id: id, completion: completion)
        }
    }

@@ -12,13 +12,13 @@ import Foundation
 struct DummyStarshipProvider : StarshipProviderAPI {
    var pilotName: String
    
-    func fetchIDs(completion: [Int] -> Void) {
-        let nbShips = pilotName.characters.count
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
+        let nbShips = pilotName.count
        completion(Array(0..<nbShips))
    }
    
-    func fetch(id: Int, completion: Starship? -> Void) {
-        completion(dummyStarship(id))
+    func fetch(id: Int, completion: @escaping (Starship?) -> Void) {
+        completion(dummyStarship(idx: id))
    }
    
    private func dummyStarship(idx: Int) -> Starship {
@@ -42,11 +42,11 @@ class HardCodedStarshipProvider : StarshipProviderAPI {
        Starship(name: "Third Ship", model: "AwesomeShip Cargo", manufacturer: "HardCoded Inc.", crew: 12, passengers: 150, pilotIDs: [2]),
        ] + Array(4..<75).map { Starship(name: "Ship #\($0)", model: "AwesomeShip Fighter", manufacturer: "HardCoded Inc.", crew: 1, passengers: 2, pilotIDs: [1]) }
    
-    func fetchIDs(completion: [Int] -> Void) {
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
        completion(Array(0..<starships.count))
    }
    
-    func fetch(id: Int, completion: Starship? -> Void) {
+    func fetch(id: Int, completion: @escaping (Starship?) -> Void) {
        guard id < starships.count else {
            completion(nil)
            return
@@ -66,16 +66,16 @@ class FakeStarshipProvider: StarshipProviderAPI {
        self.hardCodedProvider = hardCodedProvider
    }
    
-    func fetchIDs(completion: [Int] -> Void) {
-        hardCodedProvider.fetchIDs(completion)
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
+        hardCodedProvider.fetchIDs(completion: completion)
    }
    
-    func fetch(id: Int, completion: Starship? -> Void) {
+    func fetch(id: Int, completion: @escaping (Starship?) -> Void) {
        if id == 0 {
-            dummyProvider.fetch(id, completion: completion)
+            dummyProvider.fetch(id: id, completion: completion)
        }
        else {
-            hardCodedProvider.fetch(id, completion: completion)
+            hardCodedProvider.fetch(id: id, completion: completion)
        }
    }
    
@@ -9,21 +9,21 @@
 import Foundation

 enum NetworkResponse {
-    case Success(NSData, NSHTTPURLResponse)
+    case Success(Data, HTTPURLResponse)
    case Error(NSError)
    
-    func unwrap() throws -> (NSData, NSHTTPURLResponse) {
+    func unwrap() throws -> (Data, HTTPURLResponse) {
        switch self {
-        case Success(let data, let response):
+        case .Success(let data, let response):
            return (data, response)
-        case Error(let error):
+        case .Error(let error):
            throw error
        }
    }
    
    func json<T>() throws -> T {
        let (data, _) = try self.unwrap()
-        let obj = try NSJSONSerialization.JSONObjectWithData(data, options: [])
+        let obj = try JSONSerialization.jsonObject(with: data, options: [])
        guard let json = obj as? T else {
            throw SWAPIError.InvalidJSON
        }
@@ -32,5 +32,5 @@ enum NetworkResponse {
 }

 protocol NetworkLayer {
-    func request(path: String, completion: NetworkResponse -> Void)
+    func request(path: String, completion: @escaping (NetworkResponse) -> Void)
 }
@@ -9,6 +9,6 @@
 import Foundation

 protocol PersonProviderAPI {
-    func fetchIDs(completion: [Int] -> Void)
-    func fetch(id: Int, completion: Person? -> Void)
+    func fetchIDs(completion: @escaping ([Int]) -> Void)
+    func fetch(id: Int, completion: @escaping (Person?) -> Void)
 }
@@ -9,7 +9,7 @@
 import Foundation
 import Dip

-enum SWAPIError: ErrorType {
+enum SWAPIError: Error {
    case InvalidJSON
 }

@@ -20,15 +20,15 @@ struct SWAPIPersonProvider : PersonProviderAPI {
        self.ws = webService
    }
    
-    func fetchIDs(completion: [Int] -> Void) {
-        ws.request("people") { response in
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
+        ws.request(path: "people") { response in
            do {
                let dict = try response.json() as NSDictionary
                guard let results = dict["results"] as? [NSDictionary] else { throw SWAPIError.InvalidJSON }
                
                // Extract URLs (flatten to ignore invalid ones)
-                let urlStrings = results.flatMap({ $0["url"] as? String })
-                let ids = urlStrings.flatMap(idFromURLString)
+                let urlStrings = results.compactMap({ $0["url"] as? String })
+                let ids = urlStrings.compactMap(idFromURLString)
                
                completion(ids)
            }
@@ -38,14 +38,14 @@ struct SWAPIPersonProvider : PersonProviderAPI {
        }
    }
    
-    func fetch(id: Int, completion: Person? -> Void) {
-        ws.request("people/\(id)") { response in
+    func fetch(id: Int, completion: @escaping (Person?) -> Void) {
+        ws.request(path: "people/\(id)") { response in
            do {
                let json = try response.json() as NSDictionary
                guard
                    let name = json["name"] as? String,
-                    let heightStr = json["height"] as? String, height = Int(heightStr),
-                    let massStr = json["mass"] as? String, mass = Int(massStr),
+                    let heightStr = json["height"] as? String, let height = Int(heightStr),
+                    let massStr = json["mass"] as? String, let mass = Int(massStr),
                    let hairColor = json["hair_color"] as? String,
                    let eyeColor = json["eye_color"] as? String,
                    let gender = json["gender"] as? String,
@@ -61,7 +61,7 @@ struct SWAPIPersonProvider : PersonProviderAPI {
                    hairColor: hairColor,
                    eyeColor: eyeColor,
                    gender: Gender(rawValue: gender),
-                    starshipIDs: starshipURLStrings.flatMap(idFromURLString)
+                    starshipIDs: starshipURLStrings.compactMap(idFromURLString)
                )
                completion(person)
            }
@@ -20,15 +20,15 @@ struct SWAPIStarshipProvider : StarshipProviderAPI {
        self.ws = webService
    }
    
-    func fetchIDs(completion: [Int] -> Void) {
-        ws.request("starships") { response in
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
+        ws.request(path: "starships") { response in
            do {
                let dict = try response.json() as NSDictionary
                guard let results = dict["results"] as? [NSDictionary] else { throw SWAPIError.InvalidJSON }
                
                // Extract URLs (flatten to ignore invalid ones)
-                let urlStrings = results.flatMap({ $0["url"] as? String })
-                let ids = urlStrings.flatMap(idFromURLString)
+                let urlStrings = results.compactMap({ $0["url"] as? String })
+                let ids = urlStrings.compactMap(idFromURLString)
                
                completion(ids)
            }
@@ -38,16 +38,16 @@ struct SWAPIStarshipProvider : StarshipProviderAPI {
        }
    }
    
-    func fetch(id: Int, completion: Starship? -> Void) {
-        ws.request("starships/\(id)") { response in
+    func fetch(id: Int, completion: @escaping (Starship?) -> Void) {
+        ws.request(path: "starships/\(id)") { response in
            do {
                let json = try response.json() as NSDictionary
                guard
                    let name = json["name"] as? String,
                    let model = json["model"] as? String,
                    let manufacturer = json["manufacturer"] as? String,
-                    let crewStr = json["crew"] as? String, crew = Int(crewStr),
-                    let passengersStr = json["passengers"] as? String, passengers = Int(passengersStr),
+                    let crewStr = json["crew"] as? String, let crew = Int(crewStr),
+                    let passengersStr = json["passengers"] as? String, let passengers = Int(passengersStr),
                    let pilotIDStrings = json["pilots"] as? [String]
                    else {
                        throw SWAPIError.InvalidJSON
@@ -59,7 +59,7 @@ struct SWAPIStarshipProvider : StarshipProviderAPI {
                    manufacturer: manufacturer,
                    crew: crew,
                    passengers: passengers,
-                    pilotIDs: pilotIDStrings.flatMap(idFromURLString)
+                    pilotIDs: pilotIDStrings.compactMap(idFromURLString)
                )
                completion(ship)
            }
@@ -9,6 +9,6 @@
 import Foundation

 protocol StarshipProviderAPI {
-    func fetchIDs(completion: [Int] -> Void)
-    func fetch(id: Int, completion: Starship? -> Void)
+    func fetchIDs(completion: @escaping ([Int]) -> Void)
+    func fetch(id: Int, completion: @escaping (Starship?) -> Void)
 }
@@ -10,33 +10,33 @@ import Foundation

 ///NetworkLayer implementation on top of NSURLSession
 struct URLSessionNetworkLayer : NetworkLayer {
-    let baseURL: NSURL
-    let session: NSURLSession
-    let responseQueue: dispatch_queue_t
+    let baseURL: URL
+    let session: URLSession
+    let responseQueue: DispatchQueue
    
-    init?(baseURL: String, session: NSURLSession = .sharedSession(), responseQueue: dispatch_queue_t = dispatch_get_main_queue()) {
-        guard let url = NSURL(string: baseURL) else { return nil }
+    init?(baseURL: String, session: URLSession = URLSession.shared, responseQueue: DispatchQueue = DispatchQueue.main) {
+        guard let url = URL(string: baseURL) else { return nil }
        self.init(baseURL: url, session: session)
    }
    
-    init(baseURL: NSURL, session: NSURLSession = .sharedSession(), responseQueue: dispatch_queue_t = dispatch_get_main_queue()) {
+    init(baseURL: URL, session: URLSession = URLSession.shared, responseQueue: DispatchQueue = DispatchQueue.main) {
        self.baseURL = baseURL
        self.session = session
        self.responseQueue = responseQueue
    }
    
-    func request(path: String, completion: NetworkResponse -> Void) {
-        let url = self.baseURL.URLByAppendingPathComponent(path)
-        let task = session.dataTaskWithURL(url) { data, response, error in
-            if let data = data, let response = response as? NSHTTPURLResponse {
-                dispatch_async(self.responseQueue) {
+    func request(path: String, completion: @escaping (NetworkResponse) -> Void) {
+        let url = self.baseURL.appendingPathComponent(path)
+        let task = session.dataTask(with: url) { data, response, error in
+            if let data = data, let response = response as? HTTPURLResponse {
+                self.responseQueue.async() {
                    completion(NetworkResponse.Success(data, response))
                }
            }
            else {
-                let err = error ?? NSError(domain: NSURLErrorDomain, code: NSURLError.Unknown.rawValue, userInfo: nil)
-                dispatch_async(self.responseQueue) {
-                    completion(NetworkResponse.Error(err))
+                let err = error ?? NSError(domain: NSURLErrorDomain, code: URLError.unknown.rawValue, userInfo: nil)
+                self.responseQueue.async() {
+                    completion(NetworkResponse.Error(err as NSError))
                }
            }
        }
@@ -21,7 +21,7 @@ extension StoryboardScene where Self.RawValue == String {
    }

    func viewController() -> UIViewController {
-        return Self.storyboard().instantiateViewControllerWithIdentifier(self.rawValue)
+        return Self.storyboard().instantiateViewController(withIdentifier: self.rawValue)
    }
    static func viewController(identifier: Self) -> UIViewController {
        return identifier.viewController()
@@ -14,8 +14,8 @@ protocol FetchableTrait: class {
    var batchRequestID: Int { get set }
    var tableView: UITableView! { get }
    
-    func fetchIDs(completion: [Int] -> Void)
-    func fetchOne(id: Int, completion: ObjectType? -> Void)
+    func fetchIDs(completion: @escaping ([Int]) -> Void)
+    func fetchOne(id: Int, completion: @escaping (ObjectType?) -> Void)
    var fetchProgress: (current: Int, total: Int?) { get set }
 }

@@ -27,10 +27,10 @@ extension FetchableTrait {
        objects?.removeAll()
        fetchProgress = (0,objectIDs.count)
        for objectID in objectIDs {
-            fetchOne(objectID) { (object: ObjectType?) in
+            fetchOne(id: objectID) { (object: ObjectType?) in
                // Exit if we failed to retrive an object for this ID, or if the request
                // should be ignored because a new batch request has been started since
-                guard let object = object where batch == self.batchRequestID else { return }
+                guard let object = object, batch == self.batchRequestID else { return }

                if self.objects == nil { self.objects = [] }
                self.objects?.append(object)
@@ -46,7 +46,7 @@ extension FetchableTrait {
        fetchProgress = (0, nil)
        fetchIDs() { objectIDs in
            guard batch == self.batchRequestID else { return }
-            self.loadObjects(objectIDs)
+            self.loadObjects(objectIDs: objectIDs)
        }
    }
    
@@ -63,8 +63,8 @@ extension FetchableTrait {
        }
        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
        label.text = text
-        label.textColor = .grayColor()
-        label.font = .systemFontOfSize(12)
+        label.textColor = .gray
+        label.font = UIFont.systemFont(ofSize: 12)
        label.sizeToFit()
        navigationItem.rightBarButtonItem = UIBarButtonItem(customView: label)
    }
@@ -14,45 +14,46 @@ class PersonListViewController: UITableViewController, FetchableTrait {
    
    var personProvider: PersonProviderAPI!
    var starshipProvider: StarshipProviderAPI!
-        
-    func fetchIDs(completion: [Int] -> Void) {
-        return personProvider.fetchIDs(completion)
+    
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
+        return personProvider.fetchIDs(completion: completion)
    }
    
-    func fetchOne(personID: Int, completion: Person? -> Void) {
-        return personProvider.fetch(personID, completion: completion)
+    func fetchOne(id personID: Int, completion: @escaping (Person?) -> Void) {
+        return personProvider.fetch(id: personID, completion: completion)
    }
    
    var fetchProgress: (current: Int, total: Int?) = (0, nil) {
        didSet {
-            displayProgressInNavBar(self.navigationItem)
+            displayProgressInNavBar(navigationItem: self.navigationItem)
        }
    }

-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
        guard
-            let id = segue.identifier, segueID = UIStoryboard.Segue.Main(rawValue: id)
-            where segueID == .StarshipsSegue,
+            let id = segue.identifier,
+            let segueID = UIStoryboard.Segue.Main(rawValue: id),
+            segueID == .StarshipsSegue,
            let indexPath = self.tableView.indexPathForSelectedRow,
-            let destVC = segue.destinationViewController as? StarshipListViewController,
+            let destVC = segue.destination as? StarshipListViewController,
            let person = self.objects?[indexPath.row]
            else {
                fatalError()
        }
        destVC.starshipProvider = starshipProvider
-        destVC.loadObjects(person.starshipIDs)
+        destVC.loadObjects(objectIDs: person.starshipIDs)
    }
 }

 extension PersonListViewController {
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
        return objects?.count ?? 0
    }
    
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
        guard let object = self.objects?[indexPath.row] else { fatalError() }
        let cell = PersonCell.dequeueFromTableView(tableView, forIndexPath: indexPath)
-        cell.fillWithObject(object)
+        cell.fillWithObject(object: object)
        return cell
    }
 }
@@ -16,44 +16,45 @@ class StarshipListViewController : UITableViewController, FetchableTrait {
    var starshipProvider: StarshipProviderAPI!
    var personProvider: PersonProviderAPI!
    
-    func fetchIDs(completion: [Int] -> Void) {
-        starshipProvider.fetchIDs(completion)
+    func fetchIDs(completion: @escaping ([Int]) -> Void) {
+        starshipProvider.fetchIDs(completion: completion)
    }
-    func fetchOne(shipID:Int, completion: Starship? -> Void) {
-        starshipProvider.fetch(shipID, completion: completion)
+    func fetchOne(id shipID:Int, completion: @escaping (Starship?) -> Void) {
+        starshipProvider.fetch(id: shipID, completion: completion)
    }
    
    var fetchProgress: (current: Int, total: Int?) = (0, nil) {
        didSet {
-            displayProgressInNavBar(self.navigationItem)
+            displayProgressInNavBar(navigationItem: self.navigationItem)
        }
    }
    
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
        guard
-            let id = segue.identifier, segueID = UIStoryboard.Segue.Main(rawValue: id)
-            where segueID == .PilotsSegue,
+            let id = segue.identifier,
+            let segueID = UIStoryboard.Segue.Main(rawValue: id),
+            segueID == .PilotsSegue,
            let indexPath = self.tableView.indexPathForSelectedRow,
-            let destVC = segue.destinationViewController as? PersonListViewController,
+            let destVC = segue.destination as? PersonListViewController,
            let starship = self.objects?[indexPath.row]
            else {
                fatalError()
        }
        
        destVC.personProvider = personProvider
-        destVC.loadObjects(starship.pilotIDs)
+        destVC.loadObjects(objectIDs: starship.pilotIDs)
    }
 }

 extension StarshipListViewController {
-    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
        return objects?.count ?? 0
    }
    
-    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
        guard let object = self.objects?[indexPath.row] else { fatalError() }
        let cell = StarshipCell.dequeueFromTableView(tableView, forIndexPath: indexPath)
-        cell.fillWithObject(object)
+        cell.fillWithObject(object: object)
        return cell
    }
 }
@@ -9,7 +9,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -14,24 +14,24 @@ var wsDependencies = DependencyContainer()
 // MARK: - Mock object used for tests

 struct NetworkMock : NetworkLayer {
-    let fakeData: NSData?
+    let fakeData: Data?
    
-    init(json: AnyObject) {
+    init(json: Any) {
        do {
-            fakeData = try NSJSONSerialization.dataWithJSONObject(json, options: [])
+            fakeData = try JSONSerialization.data(withJSONObject: json, options: [])
        } catch {
            fakeData = nil
        }
    }
    
-    func request(path: String, completion: NetworkResponse -> Void) {
-        let fakeURL = NSURL(string: "stub://")!.URLByAppendingPathComponent(path)
+    func request(path: String, completion: @escaping (NetworkResponse) -> Void) {
+        let fakeURL = NSURL(string: "http://stub")?.appendingPathComponent(path)
        if let data = fakeData {
-            let response = NSHTTPURLResponse(URL: fakeURL, statusCode: 200, HTTPVersion: "1.1", headerFields:nil)!
+            let response = HTTPURLResponse(url: fakeURL!, statusCode: 200, httpVersion: "1.1", headerFields:nil)!
            completion(.Success(data, response))
        } else {
-            let response = NSHTTPURLResponse(URL: fakeURL, statusCode: 204, HTTPVersion: "1.1", headerFields:nil)!
-            completion(.Success(NSData(), response))
+            let response = HTTPURLResponse(url: fakeURL!, statusCode: 204, httpVersion: "1.1", headerFields:nil)!
+            completion(.Success(Data(), response))
        }
    }
 }
@@ -10,10 +10,10 @@ import XCTest
 import Dip

 class SWAPIPersonProviderTests: XCTestCase {
-    let fakePerson1 = ["name": "John Doe", "mass": "72", "height": "172", "eye_color": "brown", "hair_color": "black", "gender": "male",
-        "starships": ["stub://starship/7/", "stub://starship/15"], "url": "stub://people/1"]
-    let fakePerson2 = ["name": "Jane Doe", "mass": "63", "height": "167", "eye_color": "blue", "hair_color": "red", "gender": "female",
-        "starships": ["stub://starship/11/"], "url": "stub://people/12"]
+    let fakePerson1: [String : Any] = ["name": "John Doe", "mass": "72", "height": "172", "eye_color": "brown", "hair_color": "black", "gender": "male",
+        "starships": ["http://starship/7/", "http://starship/15"], "url": "http://people/1"]
+    let fakePerson2: [String: Any] = ["name": "Jane Doe", "mass": "63", "height": "167", "eye_color": "blue", "hair_color": "red", "gender": "female",
+        "starships": ["http://starship/11/"], "url": "http://people/12"]
    
    override func setUp() {
        super.setUp()
@@ -23,7 +23,7 @@ class SWAPIPersonProviderTests: XCTestCase {
    
    func testFetchPersonIDs() {
        let mock = NetworkMock(json: ["results": [fakePerson1, fakePerson2]])
-        wsDependencies.register(.Singleton) { mock as NetworkLayer }
+        wsDependencies.register(.singleton) { mock as NetworkLayer }
        
        let provider = SWAPIPersonProvider(webService: try! wsDependencies.resolve())
        provider.fetchIDs { personIDs in
@@ -37,10 +37,10 @@ class SWAPIPersonProviderTests: XCTestCase {
    
    func testFetchOnePerson() {
        let mock = NetworkMock(json: fakePerson1)
-        wsDependencies.register(.Singleton) { mock as NetworkLayer }
+        wsDependencies.register(.singleton) { mock as NetworkLayer }
        
        let provider = SWAPIPersonProvider(webService: try! wsDependencies.resolve())
-        provider.fetch(1) { person in
+        provider.fetch(id: 1) { person in
            XCTAssertNotNil(person)
            XCTAssertEqual(person?.name, "John Doe")
            XCTAssertEqual(person?.mass, 72)
@@ -57,10 +57,10 @@ class SWAPIPersonProviderTests: XCTestCase {
    func testFetchInvalidPerson() {
        let json = ["error":"whoops"]
        let mock = NetworkMock(json: json)
-        wsDependencies.register(.Singleton) { mock as NetworkLayer }
+        wsDependencies.register(.singleton) { mock as NetworkLayer }
        
        let provider = SWAPIPersonProvider(webService: try! wsDependencies.resolve())
-        provider.fetch(12) { person in
+        provider.fetch(id: 12) { person in
            XCTAssertNil(person)
        }
    }
@@ -10,10 +10,10 @@ import XCTest
 import Dip

 class SWAPIStarshipProviderTests: XCTestCase {
-    let fakeShip1 = ["name": "Falcon", "model": "Fighter", "manufacturer": "Fake Industries", "crew": "7", "passengers": "15",
-        "pilots": ["stub://people/1/", "stub://people/9"], "url": "stub://starship/4"]
-    let fakeShip2 = ["name": "Voyager", "model": "Cargo", "manufacturer": "Fake Industries", "crew": "18", "passengers": "150",
-        "pilots": ["stub://people/2/", "stub://people/3"], "url": "stub://starship/31"]
+    let fakeShip1: [String: Any] = ["name": "Falcon", "model": "Fighter", "manufacturer": "Fake Industries", "crew": "7", "passengers": "15",
+        "pilots": ["http://people/1/", "http://people/9"], "url": "http://starship/4"]
+    let fakeShip2: [String: Any] = ["name": "Voyager", "model": "Cargo", "manufacturer": "Fake Industries", "crew": "18", "passengers": "150",
+        "pilots": ["http://people/2/", "http://people/3"], "url": "http://starship/31"]
    
    override func setUp() {
        super.setUp()
@@ -23,7 +23,7 @@ class SWAPIStarshipProviderTests: XCTestCase {
    
    func testFetchStarshipIDs() {
        let mock = NetworkMock(json: ["results": [fakeShip1, fakeShip2]])
-        wsDependencies.register(.Singleton) { mock as NetworkLayer }
+        wsDependencies.register(.singleton) { mock as NetworkLayer }
        
        let provider = SWAPIStarshipProvider(webService: try! wsDependencies.resolve())
        provider.fetchIDs { shipIDs in
@@ -38,10 +38,10 @@ class SWAPIStarshipProviderTests: XCTestCase {
    func testFetchOneStarship() {
        
        let mock = NetworkMock(json: fakeShip1)
-        wsDependencies.register(.Singleton) { mock as NetworkLayer }
+        wsDependencies.register(.singleton) { mock as NetworkLayer }
        
        let provider = SWAPIStarshipProvider(webService: try! wsDependencies.resolve())
-        provider.fetch(1) { starship in
+        provider.fetch(id: 1) { starship in
            XCTAssertNotNil(starship)
            XCTAssertEqual(starship?.name, "Falcon")
            XCTAssertEqual(starship?.model, "Fighter")
@@ -57,10 +57,10 @@ class SWAPIStarshipProviderTests: XCTestCase {
    func testFetchInvalidStarship() {
        let json = ["error":"whoops"]
        let mock = NetworkMock(json: json)
-        wsDependencies.register(.Singleton) { mock as NetworkLayer }
+        wsDependencies.register(.singleton) { mock as NetworkLayer }
        
        let provider = SWAPIStarshipProvider(webService: try! wsDependencies.resolve())
-        provider.fetch(12) { starship in
+        provider.fetch(id: 12) { starship in
            XCTAssertNil(starship)
        }
    }
@@ -27,16 +27,30 @@ extension DependencyContainer {
  /**
   Resolves properties of passed object wrapped with `Injected<T>` or `InjectedWeak<T>`
   */
-  func autoInjectProperties(instance: Any) throws {
-    try Mirror(reflecting: instance).children.forEach(resolveChild)
+  func autoInjectProperties(in instance: Any) throws {
+    let mirror = Mirror(reflecting: instance)
+    
+    //mirror only contains class own properties
+    //so we need to walk through super class mirrors
+    //to resolve super class auto-injected properties
+    var superClassMirror = mirror.superclassMirror
+    while superClassMirror != nil {
+      try superClassMirror?.children.forEach(resolveChild)
+      superClassMirror = superClassMirror?.superclassMirror
+    }
+    
+    try mirror.children.forEach(resolveChild)
  }
  
  private func resolveChild(child: Mirror.Child) throws {
+    //HOTFIX for https://bugs.swift.org/browse/SR-2282
+    guard !String(describing: type(of: child.value)).has(prefix: "ImplicitlyUnwrappedOptional") else { return }
    guard let injectedPropertyBox = child.value as? AutoInjectedPropertyBox else { return }
    
-    let contextKey = DefinitionKey(type: injectedPropertyBox.dynamicType.wrappedType, typeOfArguments: Void.self, tag: context.tag)
-    try inContext(contextKey, injectedInProperty: child.label, logErrors: false) {
-        try injectedPropertyBox.resolve(self)
+    let wrappedType = type(of: injectedPropertyBox).wrappedType
+    let contextKey = DefinitionKey(type: wrappedType, typeOfArguments: Void.self, tag: context.tag)
+    try inContext(key:contextKey, injectedInType: context?.resolvingType, injectedInProperty: child.label, logErrors: false) {
+      try injectedPropertyBox.resolve(self)
    }
  }
  
@@ -76,7 +90,7 @@ public protocol AutoInjectedPropertyBox: class {
   
   - note: This method is not intended to be called manually, `DependencyContainer` will call it by itself.
   */
-  func resolve(container: DependencyContainer) throws
+  func resolve(_ container: DependencyContainer) throws
 }

 /**
@@ -104,50 +118,50 @@ public final class Injected<T>: _InjectedPropertyBox<T>, AutoInjectedPropertyBox
  }

  ///Wrapped value.
-  public private(set) var value: T? {
+  public internal(set) var value: T? {
    didSet {
      if let value = value { didInject(value) }
    }
  }

+  init(value: T?, required: Bool = true, tag: DependencyTagConvertible?, overrideTag: Bool, didInject: @escaping (T) -> ()) {
+    self.value = value
+    super.init(required: required, tag: tag, overrideTag: overrideTag, didInject: didInject)
+  }
+
  /**
   Creates a new wrapper for auto-injected property.
   
   - parameters:
-      - required: Defines if the property is required or not. 
-                  If container fails to inject required property it will als fail to resolve 
+      - required: Defines if the property is required or not.
+                  If container fails to inject required property it will als fail to resolve
                  the instance that defines that property. Default is `true`.
      - tag: An optional tag to use to lookup definitions when injecting this property. Default is `nil`.
-      - didInject: block that will be called when concrete instance is injected in this property. 
+      - didInject: Block that will be called when concrete instance is injected in this property.
                   Similar to `didSet` property observer. Default value does nothing.
-  */
-  public convenience init(required: Bool = true, didInject: T -> () = { _ in }) {
+   */
+  public convenience init(required: Bool = true, didInject: @escaping (T) -> () = { _ in }) {
    self.init(value: nil, required: required, tag: nil, overrideTag: false, didInject: didInject)
  }
-
-  public convenience init(required: Bool = true, tag: DependencyTagConvertible?, didInject: T -> () = { _ in }) {
+  
+  public convenience init(required: Bool = true, tag: DependencyTagConvertible?, didInject: @escaping (T) -> () = { _ in }) {
    self.init(value: nil, required: required, tag: tag, overrideTag: true, didInject: didInject)
  }

-  private init(value: T?, required: Bool = true, tag: DependencyTagConvertible?, overrideTag: Bool, didInject: T -> ()) {
-    self.value = value
-    super.init(required: required, tag: tag, overrideTag: overrideTag, didInject: didInject)
-  }
-
-  public func resolve(container: DependencyContainer) throws {
-    let resolved: T? = try super.resolve(container)
+  public func resolve(_ container: DependencyContainer) throws {
+    let resolved: T? = try super.resolve(with: container)
    value = resolved
  }
-  
+
  /// Returns a new wrapper with provided value.
-  public func setValue(value: T?) -> Injected {
+  public func setValue(_ value: T?) -> Injected {
    guard (required && value != nil) || !required else {
      fatalError("Can not set required property to nil.")
    }
    
    return Injected(value: value, required: required, tag: tag, overrideTag: overrideTag, didInject: didInject)
  }
-  
+
 }

 /**
@@ -191,7 +205,7 @@ public final class InjectedWeak<T>: _InjectedPropertyBox<T>, AutoInjectedPropert
    return T.self
  }

-  private weak var _value: AnyObject? = nil {
+  var valueBox: WeakBox<T>? = nil {
    didSet {
      if let value = value { didInject(value) }
    }
@@ -199,9 +213,14 @@ public final class InjectedWeak<T>: _InjectedPropertyBox<T>, AutoInjectedPropert
  
  ///Wrapped value.
  public var value: T? {
-    return _value as? T
+    return valueBox?.value
  }

+  init(value: T?, required: Bool = true, tag: DependencyTagConvertible?, overrideTag: Bool, didInject: @escaping (T) -> ()) {
+    self.valueBox = value.map(WeakBox.init)
+    super.init(required: required, tag: tag, overrideTag: overrideTag, didInject: didInject)
+  }
+  
  /**
   Creates a new wrapper for weak auto-injected property.
   
@@ -210,81 +229,68 @@ public final class InjectedWeak<T>: _InjectedPropertyBox<T>, AutoInjectedPropert
                  If container fails to inject required property it will als fail to resolve
                  the instance that defines that property. Default is `true`.
      - tag: An optional tag to use to lookup definitions when injecting this property. Default is `nil`.
-      - didInject: block that will be called when concrete instance is injected in this property.
+      - didInject: Block that will be called when concrete instance is injected in this property.
                   Similar to `didSet` property observer. Default value does nothing.
   */
-  public convenience init(required: Bool = true, didInject: T -> () = { _ in }) {
+  public convenience init(required: Bool = true, didInject: @escaping (T) -> () = { _ in }) {
    self.init(value: nil, required: required, tag: nil, overrideTag: false, didInject: didInject)
  }
-
-  public convenience init(required: Bool = true, tag: DependencyTagConvertible?, didInject: T -> () = { _ in }) {
+  
+  public convenience init(required: Bool = true, tag: DependencyTagConvertible?, didInject: @escaping (T) -> () = { _ in }) {
    self.init(value: nil, required: required, tag: tag, overrideTag: true, didInject: didInject)
  }
-
-  private init(value: T?, required: Bool = true, tag: DependencyTagConvertible?, overrideTag: Bool, didInject: T -> ()) {
-    self._value = value as? AnyObject
-    super.init(required: required, tag: tag, overrideTag: overrideTag, didInject: didInject)
-  }
-
-  public func resolve(container: DependencyContainer) throws {
-    let resolved: T? = try super.resolve(container)
-    if required && !(resolved is AnyObject) {
-      fatalError("\(T.self) can not be casted to AnyObject. InjectedWeak wrapper should be used to wrap only classes.")
-    }
-    _value = resolved as? AnyObject
-  }
  
+  public func resolve(_ container: DependencyContainer) throws {
+    let resolved: T? = try super.resolve(with: container)
+    valueBox = resolved.map(WeakBox.init)
+  }
+
  /// Returns a new wrapper with provided value.
-  public func setValue(value: T?) -> InjectedWeak {
-    let _value = value as? AnyObject
-    if value != nil && _value == nil {
-      fatalError("\(T.self) can not be casted to AnyObject. InjectedWeak wrapper should be used to wrap only classes.")
-    }
-    guard (required && _value != nil) || !required else {
+  public func setValue(_ value: T?) -> InjectedWeak {
+    guard (required && value != nil) || !required else {
      fatalError("Can not set required property to nil.")
    }
-
+    
    return InjectedWeak(value: value, required: required, tag: tag, overrideTag: overrideTag, didInject: didInject)
  }

 }

-private class _InjectedPropertyBox<T> {
+public class _InjectedPropertyBox<T> {

  let required: Bool
-  let didInject: T -> ()
+  let didInject: (T) -> ()
  let tag: DependencyContainer.Tag?
  let overrideTag: Bool

-  init(required: Bool = true, tag: DependencyTagConvertible?, overrideTag: Bool, didInject: T -> () = { _ in }) {
+  init(required: Bool = true, tag: DependencyTagConvertible?, overrideTag: Bool, didInject: @escaping (T) -> () = { _ in }) {
    self.required = required
    self.tag = tag?.dependencyTag
    self.overrideTag = overrideTag
    self.didInject = didInject
  }

-  private func resolve(container: DependencyContainer) throws -> T? {
+  func resolve(with container: DependencyContainer) throws -> T? {
    let tag = overrideTag ? self.tag : container.context.tag
    do {
-      container.context.key = container.context.key.tagged(tag)
+      container.context.key = container.context.key.tagged(with: tag)
      let key = DefinitionKey(type: T.self, typeOfArguments: Void.self, tag: tag?.dependencyTag)
-      return try resolve(container, key: key, builder: { factory in try factory() }) as? T
+      return try resolve(with: container, key: key, builder: { (factory: (Any) throws -> Any) in try factory(()) }) as? T
    }
    catch {
-      let error = DipError.AutoInjectionFailed(label: container.context.injectedInProperty, type: container.context.resolvingType, underlyingError: error)
-      
+        let error = DipError.autoInjectionFailed(label: container.context.injectedInProperty, type: container.context.resolvingType, underlyingError: error)
      if required {
        throw error
      }
      else {
-        log(.Errors, error)
+        log(level: .Errors, error)
        return nil
      }
    }
  }
  
-  private func resolve<U>(container: DependencyContainer, key: DefinitionKey, builder: (U throws -> Any) throws -> Any) throws -> Any {
-    return try container.resolveKey(key, builder: { definition throws -> Any in
+  private func resolve<U>(with container: DependencyContainer, key: DefinitionKey, builder: ((U) throws -> Any) throws -> Any) throws -> Any {
+    return try container._resolve(key: key, builder: { definition throws -> Any in
      try builder(definition.weakFactory)
    })
  }
@@ -22,121 +22,65 @@
 // THE SOFTWARE.
 //

-protocol AutoWiringDefinition: Definition {
-  var numberOfArguments: Int? { get }
+protocol AutoWiringDefinition: DefinitionType {
+  var numberOfArguments: Int { get }
  var autoWiringFactory: ((DependencyContainer, DependencyContainer.Tag?) throws -> Any)? { get }
 }

-extension AutoWiringDefinition {
-  func supportsAutoWiring() -> Bool {
-    return autoWiringFactory != nil && numberOfArguments > 0
-  }
-}
-
 extension DependencyContainer {
  
-  /// Tries to resolve instance using auto-wire factories
-  func autowire<T>(key: DefinitionKey) throws -> T {
-    let shouldLogErrors = context.logErrors
-    defer { context.logErrors = shouldLogErrors }
-    context.logErrors = false
-    
+  /// Tries to resolve instance using auto-wiring
+  func autowire<T>(key aKey: DefinitionKey) throws -> T {
+    let key = aKey
    guard key.typeOfArguments == Void.self else {
-      throw DipError.DefinitionNotFound(key: key)
+      throw DipError.definitionNotFound(key: key)
    }
    
-    let tag = key.tag
-    let type = key.type
-    let resolved: Any?
+    let autoWiringKey = try autoWiringDefinition(byKey: key).key
+    
    do {
-      let definitions = autoWiringDefinitions(byKey: key)
-      resolved = try resolve(enumerating: definitions, tag: tag)
+      let key = autoWiringKey.tagged(with: key.tag ?? context.tag)
+      return try _resolve(key: key) { definition in
+        try definition.autoWiringFactory!(self, key.tag) as! T
+      }
    }
    catch {
-      throw DipError.AutoWiringFailed(type: type, underlyingError: error)
-    }
-    
-    if let resolved = resolved as? T  {
-      return resolved
-    }
-    else {
-      throw DipError.DefinitionNotFound(key: key)
+      throw DipError.autoWiringFailed(type: key.type, underlyingError: error)
    }
  }

-  private func autoWiringDefinitions(byKey key: DefinitionKey) -> [KeyDefinitionPair] {
+  private func autoWiringDefinition(byKey key: DefinitionKey) throws -> KeyDefinitionPair {
+    do {
+      return try autoWiringDefinition(byKey: key, strictByTag: true)
+    } catch  {
+      if key.tag != nil {
+        return try autoWiringDefinition(byKey: key, strictByTag: false)
+      } else {
+        throw error
+      }
+    }
+  }
+  
+  private func autoWiringDefinition(byKey key: DefinitionKey, strictByTag: Bool) throws -> KeyDefinitionPair {
    var definitions = self.definitions.map({ (key: $0.0, definition: $0.1) })
    
-    //filter definitions
-    definitions = definitions
-      .filter({ $0.definition.supportsAutoWiring() })
-      .sort({ $0.definition.numberOfArguments > $1.definition.numberOfArguments })
+    definitions = filter(definitions: definitions, byKey: key, strictByTag: strictByTag)
+    definitions = definitions.sorted(by: { $0.definition.numberOfArguments > $1.definition.numberOfArguments })
    
-    definitions = filter(definitions, byKey: key)
-    definitions = order(definitions, byTag: key.tag)
-
-    return definitions
-  }
-  
-  /// Enumerates definitions one by one until one of them succeeds, otherwise returns nil
-  private func resolve(enumerating autoWiringDefinitions: [KeyDefinitionPair], tag: DependencyContainer.Tag?) throws -> Any? {
-    for (index, autoWiringDefinition) in autoWiringDefinitions.enumerate() {
-      //If the next definition matches current definition then they are ambigous
-      if let nextPair = autoWiringDefinitions[next: index], case autoWiringDefinition = nextPair {
-          throw DipError.AmbiguousDefinitions(
-            type: autoWiringDefinition.key.type,
-            definitions: [autoWiringDefinition.definition, nextPair.definition]
-        )
-      }
-      
-      let key = autoWiringDefinition.key.tagged(tag ?? context.tag)
-      let resolved: Any? = try? resolveKey(key) { definition in
-        try definition.autoWiringFactory!(self, tag)
-      }
-      if let resolved = resolved {
-        return resolved
-      }
+    guard definitions.count > 0 && definitions[0].definition.numberOfArguments > 0 else {
+      throw DipError.definitionNotFound(key: key)
+    }
+    
+    let maximumNumberOfArguments = definitions.first?.definition.numberOfArguments
+    definitions = definitions.filter({ $0.definition.numberOfArguments == maximumNumberOfArguments })
+    
+    //when there are several definitions with the same number of arguments but different arguments types
+    if definitions.count > 1 && definitions[0].key.typeOfArguments != definitions[1].key.typeOfArguments {
+      let error = DipError.ambiguousDefinitions(type: key.type, definitions: definitions.map({ $0.definition }))
+      throw DipError.autoWiringFailed(type: key.type, underlyingError: error)
+    } else {
+      return definitions[0]
    }
-    return nil
  }
  
 }
-
-extension CollectionType where Self.Index: Comparable {
-  subscript(safe index: Index) -> Generator.Element? {
-    guard indices ~= index else { return nil }
-    return self[index]
-  }
-  subscript(next index: Index) -> Generator.Element? {
-    return self[safe: index.advancedBy(1)]
-  }
-}
-
-typealias KeyDefinitionPair = (key: DefinitionKey, definition: _Definition)
-
-/// Definitions are matched if they are registered for the same tag and thier factories accept the same number of runtime arguments.
-private func ~=(lhs: KeyDefinitionPair, rhs: KeyDefinitionPair) -> Bool {
-  guard lhs.key.type == rhs.key.type else { return false }
-  guard lhs.key.tag == rhs.key.tag else { return false }
-  guard lhs.definition.numberOfArguments == rhs.definition.numberOfArguments else { return false }
-  return true
-}
-
-func filter(definitions: [KeyDefinitionPair], byKey key: DefinitionKey) -> [KeyDefinitionPair] {
-  return definitions
-    .filter({ $0.key.type == key.type || $0.definition.doesImplements(key.type) })
-    .filter({ $0.key.tag == key.tag || $0.key.tag == nil })
-}
-
-func filter(definitions: [KeyDefinitionPair], byKeyAndTypeOfArguments key: DefinitionKey) -> [KeyDefinitionPair] {
-  return filter(definitions, byKey: key)
-    .filter({ $0.key.typeOfArguments == key.typeOfArguments })
-}
-
-func order(definitions: [KeyDefinitionPair], byTag tag: DependencyContainer.Tag?) -> [KeyDefinitionPair] {
-  return
-    //first will try to use tagged definitions
-    definitions.filter({ $0.key.tag == tag }) +
-    //then will use not tagged definitions
-    definitions.filter({ $0.key.tag != tag })
-}
@@ -0,0 +1,17 @@
+#if _runtime(_ObjC)
+  extension String {
+    func has(prefix aPrefix: String) -> Bool {
+      return hasPrefix(aPrefix)
+    }
+  }
+  
+#else
+  
+  extension String {
+    func has(prefix aPrefix: String) -> Bool {
+      return aPrefix ==
+        String(self.characters.prefix(aPrefix.characters.count))
+    }
+
+  }
+#endif
@@ -0,0 +1,120 @@
+//
+// Dip
+//
+// Copyright (c) 2015 Olivier Halligon <olivier@halligon.net>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+///Component scope defines a strategy used by the `DependencyContainer` to manage resolved instances life cycle.
+public enum ComponentScope {
+  
+  /**
+   A new instance will be created every time it's resolved.
+   This is a default strategy. Use this strategy when you don't want instances to be shared
+   between different consumers (i.e. if it is not thread safe).
+   
+   **Example**:
+   
+   ```
+   container.register { ServiceImp() as Service }
+   container.register {
+   ServiceConsumerImp(
+   service1: try container.resolve() as Service
+   service2: try container.resolve() as Service
+   ) as ServiceConsumer
+   }
+   let consumer = container.resolve() as ServiceConsumer
+   consumer.service1 !== consumer.service2 //true
+   
+   ```
+   */
+  case unique
+  
+  /**
+   Instance resolved with the same definition will be reused until topmost `resolve(tag:)` method returns.
+   When you resolve the same object graph again the container will create new instances.
+   Use this strategy if you want different object in objects graph to share the same instance.
+   
+   - warning: Make sure this component is thread safe or accessed always from the same thread.
+   
+   **Example**:
+   
+   ```
+   container.register { ServiceImp() as Service }
+   container.register {
+   ServiceConsumerImp(
+   service1: try container.resolve() as Service
+   service2: try container.resolve() as Service
+   ) as ServiceConsumer
+   }
+   let consumer1 = container.resolve() as ServiceConsumer
+   let consumer2 = container.resolve() as ServiceConsumer
+   consumer1.service1 === consumer1.service2 //true
+   consumer2.service1 === consumer2.service2 //true
+   consumer1.service1 !== consumer2.service1 //true
+   ```
+   */
+  case shared
+  
+  /**
+   Resolved instance will be retained by the container and always reused.
+   Do not mix this life cycle with _singleton pattern_.
+   Instance will be not shared between different containers unless they collaborate.
+   
+   - warning: Make sure this component is thread safe or accessed always from the same thread.
+   
+   - note: When you override or remove definition from the container an instance
+   that was resolved with this definition will be released. When you reset
+   the container it will release all singleton instances.
+   
+   **Example**:
+   
+   ```
+   container.register(.singleton) { ServiceImp() as Service }
+   container.register {
+   ServiceConsumerImp(
+   service1: try container.resolve() as Service
+   service2: try container.resolve() as Service
+   ) as ServiceConsumer
+   }
+   let consumer1 = container.resolve() as ServiceConsumer
+   let consumer2 = container.resolve() as ServiceConsumer
+   consumer1.service1 === consumer1.service2 //true
+   consumer2.service1 === consumer2.service2 //true
+   consumer1.service1 === consumer2.service1 //true
+   ```
+   */
+  case singleton
+  
+  /**
+   The same scope as a `Singleton`, but instance will be created when container is bootstrapped.
+   
+   - seealso: `bootstrap()`
+   */
+  case eagerSingleton
+  
+  /**
+   The same scope as a `Singleton`, but container stores week reference to the resolved instance.
+   While a strong reference to the resolved instance exists resolve will return the same instance.
+   After the resolved instance is deallocated next resolve will produce a new instance.
+   */
+  case weakSingleton
+  
+}
@@ -23,7 +23,7 @@
 //

 ///A key used to store definitons in a container.
-public struct DefinitionKey : Hashable, CustomStringConvertible {
+public struct DefinitionKey: Hashable, CustomStringConvertible {
  public let type: Any.Type
  public let typeOfArguments: Any.Type
  public private(set) var tag: DependencyContainer.Tag?
@@ -35,171 +35,62 @@ public struct DefinitionKey : Hashable, CustomStringConvertible {
  }
  
  public var hashValue: Int {
-    return "\(type)-\(typeOfArguments)-\(tag)".hashValue
+    return "\(type)-\(typeOfArguments)-\(tag.desc)".hashValue
  }
  
  public var description: String {
    return "type: \(type), arguments: \(typeOfArguments), tag: \(tag.desc)"
  }
  
-  func tagged(tag: DependencyContainer.Tag?) -> DefinitionKey {
+  func tagged(with tag: DependencyContainer.Tag?) -> DefinitionKey {
    var tagged = self
    tagged.tag = tag
    return tagged
  }
-  
-}

-//MARK: - Deprecated
-extension DefinitionKey {
-  
-  @available(*, deprecated=4.6.1, message="Property protocolType was renamed to type")
-  public var protocolType: Any.Type { return type }
-  @available(*, deprecated=4.6.1, message="Property argumentsType was renamed to typeOfArguments")
-  public var argumentsType: Any.Type { return typeOfArguments }
-  @available(*, deprecated=4.6.1, message="Property associatedTag was renamed to tag")
-  public var associatedTag: DependencyContainer.Tag? { return tag }
-}
-
-/// Check two definition keys on equality by comparing their `type`, `factoryType` and `tag` properties.
-public func ==(lhs: DefinitionKey, rhs: DefinitionKey) -> Bool {
-  return
-    lhs.type == rhs.type &&
+  /// Check two definition keys on equality by comparing their `type`, `factoryType` and `tag` properties.
+  public static func ==(lhs: DefinitionKey, rhs: DefinitionKey) -> Bool {
+    return
+      lhs.type == rhs.type &&
      lhs.typeOfArguments == rhs.typeOfArguments &&
      lhs.tag == rhs.tag
-}
-
-///Component scope defines a strategy used by the `DependencyContainer` to manage resolved instances life cycle.
-public enum ComponentScope {
-  /**
-   A new instance will be created every time it's resolved.
-   This is a default strategy. Use this strategy when you don't want instances to be shared
-   between different consumers (i.e. if it is not thread safe).
-   
-   **Example**:
-   
-   ```
-   container.register { ServiceImp() as Service }
-   container.register { 
-     ServiceConsumerImp(
-       service1: try container.resolve() as Service
-       service2: try container.resolve() as Service
-     ) as ServiceConsumer
-   }
-   let consumer = container.resolve() as ServiceConsumer
-   consumer.service1 !== consumer.service2 //true
-   
-   ```
-   */
-  case Unique
+  }
  
-  @available(*, deprecated=4.6.1, message="Prototype scope is renamed to Unique")
-  case Prototype
-  
-  /**
-   Instance resolved with the same definition will be reused until topmost `resolve(tag:)` method returns.
-   When you resolve the same object graph again the container will create new instances.
-   Use this strategy if you want different object in objects graph to share the same instance.
-   
-   - warning: Make sure this component is thread safe or accessed always from the same thread.
-   
-   **Example**:
-   
-   ```
-   container.register(.Shared) { ServiceImp() as Service }
-   container.register {
-     ServiceConsumerImp(
-       service1: try container.resolve() as Service
-       service2: try container.resolve() as Service
-     ) as ServiceConsumer
-   }
-   let consumer1 = container.resolve() as ServiceConsumer
-   let consumer2 = container.resolve() as ServiceConsumer
-   consumer1.service1 === consumer1.service2 //true
-   consumer2.service1 === consumer2.service2 //true
-   consumer1.service1 !== consumer2.service1 //true
-   ```
-   */
-  case Shared
-  
-  @available(*, deprecated=4.6.1, message="ObjectGraph scope is renamed to Shared")
-  case ObjectGraph
-
-  /**
-   Resolved instance will be retained by the container and always reused.
-   Do not mix this life cycle with _singleton pattern_.
-   Instance will be not shared between different containers unless they collaborate.
-   
-   - warning: Make sure this component is thread safe or accessed always from the same thread.
-   
-   - note: When you override or remove definition from the container an instance 
-           that was resolved with this definition will be released. When you reset 
-           the container it will release all singleton instances.
-   
-   **Example**:
-   
-   ```
-   container.register(.Singleton) { ServiceImp() as Service }
-   container.register {
-     ServiceConsumerImp(
-       service1: try container.resolve() as Service
-       service2: try container.resolve() as Service
-     ) as ServiceConsumer
-   }
-   let consumer1 = container.resolve() as ServiceConsumer
-   let consumer2 = container.resolve() as ServiceConsumer
-   consumer1.service1 === consumer1.service2 //true
-   consumer2.service1 === consumer2.service2 //true
-   consumer1.service1 === consumer2.service1 //true
-   ```
-   */
-  case Singleton
-  
-  /**
-   The same scope as a `Singleton`, but instance will be created when container is bootstrapped.
-   
-   - seealso: `bootstrap()`
-  */
-  case EagerSingleton
-  
-  /**
-   The same scope as a `Singleton`, but container stores week reference to the resolved instance.
-   While a strong reference to the resolved instance exists resolve will return the same instance.
-   After the resolved instance is deallocated next resolve will produce a new instance.
-  */
-  case WeakSingleton
 }

 ///Dummy protocol to store definitions for different types in collection
-public protocol Definition: class { }
+public protocol DefinitionType: class { }

 /**
- `DefinitionOf<T, F>` describes how instances of type `T` should be created when this type is resolved by the `DependencyContainer`.
+ `Definition<T, U>` describes how instances of type `T` should be created when this type is resolved by the `DependencyContainer`.
 
 - `T` is the type of the instance to resolve
- - `F` is the type of the factory that will create an instance of T.
+ - `U` is the type of runtime arguments accepted by factory that will create an instance of T.
 
- For example `DefinitionOf<Service, (String) -> Service>` is the type of definition that will create an instance of type `Service` using factory that accepts `String` argument.
+ For example `Definition<Service, String>` is the type of definition that will create an instance of type `Service` using factory that accepts `String` argument.
 */
-public final class DefinitionOf<T, F>: Definition {
-  
-  init(scope: ComponentScope, factory: F) {
-    self.factory = factory
-    self.scope = scope
-  }
+public final class Definition<T, U>: DefinitionType {
+  public typealias F = (U) throws -> T
  
  //MARK: - _Definition

+  weak var container: DependencyContainer?
+  
  let factory: F
  let scope: ComponentScope
-  private(set) var weakFactory: (Any throws -> Any)!
-  private(set) var resolveDependenciesBlock: ((DependencyContainer, Any) throws -> ())?
+  var weakFactory: ((Any) throws -> Any)!
+  var resolveProperties: ((DependencyContainer, Any) throws -> ())?
  
+  init(scope: ComponentScope, factory: @escaping F) {
+    self.factory = factory
+    self.scope = scope
+  }
+
  /**
   Set the block that will be used to resolve dependencies of the instance.
   This block will be called before `resolve(tag:)` returns.
   
-   - parameter block: The block to use to resolve dependencies of the instance.
+   - parameter block: The block to resolve property dependencies of the instance.
   
   - returns: modified definition
   
@@ -221,27 +112,34 @@ public final class DefinitionOf<T, F>: Definition {
   ```
   
   */
-  public func resolvingProperties(block: (DependencyContainer, T) throws -> ()) -> DefinitionOf {
-    let oldBlock = self.resolveDependenciesBlock
-    self.resolveDependenciesBlock = {
-      try oldBlock?($0, $1 as! T)
-      try block($0, $1 as! T)
+  @discardableResult public func resolvingProperties(_ block: @escaping (DependencyContainer, T) throws -> ()) -> Definition {
+    if let oldBlock = self.resolveProperties {
+      self.resolveProperties = {
+        try oldBlock($0, $1 as! T)
+        try block($0, $1 as! T)
+      }
+    }
+    else {
+      self.resolveProperties = { try block($0, $1 as! T) }
    }
    return self
  }

  /// Calls `resolveDependencies` block if it was set.
-  func resolveProperties(instance instance: Any, container: DependencyContainer) throws {
+  func resolveProperties(of instance: Any, container: DependencyContainer) throws {
    guard let resolvedInstance = instance as? T else { return }
-    if let resolveDependenciesBlock = self.resolveDependenciesBlock {
-      try resolveDependenciesBlock(container, resolvedInstance)
+    if let forwardsTo = forwardsTo {
+      try forwardsTo.resolveProperties(of: resolvedInstance, container: container)
+    }
+    if let resolveProperties = self.resolveProperties {
+      try resolveProperties(container, resolvedInstance)
    }
  }
  
  //MARK: - AutoWiringDefinition
  
-  private(set) var autoWiringFactory: ((DependencyContainer, DependencyContainer.Tag?) throws -> Any)?
-  private(set) var numberOfArguments: Int?
+  var autoWiringFactory: ((DependencyContainer, DependencyContainer.Tag?) throws -> Any)?
+  var numberOfArguments: Int = 0
  
  //MARK: - TypeForwardingDefinition
  
@@ -249,69 +147,81 @@ public final class DefinitionOf<T, F>: Definition {
  private(set) var implementingTypes: [Any.Type] = [(T?).self, (T!).self]
  
  /// Return `true` if type can be resolved using this definition
-  func doesImplements(type: Any.Type) -> Bool {
-    return implementingTypes.contains({ $0 == type })
+  func doesImplements(type aType: Any.Type) -> Bool {
+    return implementingTypes.contains(where: { $0 == aType })
  }
  
  //MARK: - _TypeForwardingDefinition

  /// Adds type as being able to be resolved using this definition
-  private func implements(type: Any.Type) {
-    implements([type])
+  func _implements(type aType: Any.Type) {
+    _implements(types: [aType])
  }
  
  /// Adds types as being able to be resolved using this definition
-  private func implements(types: [Any.Type]) {
-    implementingTypes.appendContentsOf(types.filter({ !doesImplements($0) }))
+  func _implements(types aTypes: [Any.Type]) {
+    implementingTypes.append(contentsOf: aTypes.filter({ !doesImplements(type: $0) }))
  }
-
+  
  /// Definition to which resolution will be forwarded to
-  private weak var forwardsToDefinition: _TypeForwardingDefinition? {
+  weak var forwardsTo: _TypeForwardingDefinition? {
    didSet {
-      if let forwardsToDefinition = forwardsToDefinition {
-        implements(forwardsToDefinition.type)
-        implements(forwardsToDefinition.implementingTypes)
+      //both definitions (self and forwardsTo) can resolve
+      //each other types and each other implementing types
+      //this relationship can be used to reuse previously resolved instances
+      if let forwardsTo = forwardsTo {
+        _implements(type: forwardsTo.type)
+        _implements(types: forwardsTo.implementingTypes)
        
-        for definition in [forwardsToDefinition] + forwardsToDefinition.forwardsFromDefinitions {
-          definition.implements(type)
-          definition.implements(implementingTypes)
+        //definitions for types that can be resolved by `forwardsTo` definition
+        //can also be used to resolve self type and it's implementing types
+        //this way container properly reuses previosly resolved instances
+        //when there are several forwarded definitions
+        //see testThatItReusesInstanceResolvedByTypeForwarding)
+        for definition in forwardsTo.forwardsFrom {
+          definition._implements(type: type)
+          definition._implements(types: implementingTypes)
        }
-        forwardsToDefinition.forwardsFromDefinitions.append(self)
-        resolvingProperties({ try forwardsToDefinition.resolveProperties(instance: $1, container: $0) })
+        
+        //forwardsTo can be used to resolve self type and it's implementing types
+        forwardsTo._implements(type: type)
+        forwardsTo._implements(types: implementingTypes)
+        forwardsTo.forwardsFrom.append(self)
      }
    }
  }
  
  /// Definitions that will forward resolution to this definition
-  private var forwardsFromDefinitions: [_TypeForwardingDefinition] = []
+  var forwardsFrom: [_TypeForwardingDefinition] = []
  
 }

 //MARK: - _Definition

-protocol _Definition: Definition, AutoWiringDefinition, TypeForwardingDefinition {
+protocol _Definition: AutoWiringDefinition, TypeForwardingDefinition {
  var type: Any.Type { get }
  var scope: ComponentScope { get }
-  var weakFactory: (Any throws -> Any)! { get }
-  func resolveProperties(instance instance: Any, container: DependencyContainer) throws
+  var weakFactory: ((Any) throws -> Any)! { get }
+  func resolveProperties(of instance: Any, container: DependencyContainer) throws
+  var container: DependencyContainer? { get set }
 }

 //MARK: - Type Forwarding

-private protocol _TypeForwardingDefinition: TypeForwardingDefinition, _Definition {
-  weak var forwardsToDefinition: _TypeForwardingDefinition? { get set }
-  var forwardsFromDefinitions: [_TypeForwardingDefinition] { get set }
-  func implements(type: Any.Type)
-  func implements(type: [Any.Type])
+protocol _TypeForwardingDefinition: _Definition {
+  var forwardsTo: _TypeForwardingDefinition? { get }
+  var forwardsFrom: [_TypeForwardingDefinition] { get set }
+  func _implements(type aType: Any.Type)
+  func _implements(types aTypes: [Any.Type])
 }

-extension DefinitionOf: _TypeForwardingDefinition {
+extension Definition: _TypeForwardingDefinition {
  var type: Any.Type {
    return T.self
  }
 }

-extension DefinitionOf: CustomStringConvertible {
+extension Definition: CustomStringConvertible {
  public var description: String {
    return "type: \(T.self), factory: \(F.self), scope: \(scope)"
  }
@@ -320,40 +230,62 @@ extension DefinitionOf: CustomStringConvertible {
 //MARK: - Definition Builder

 /// Internal class used to build definition
-/// Need this builder as alternative to changing to DefinitionOf<T, U> where U - type of arguments
 class DefinitionBuilder<T, U> {
-  typealias F = U throws -> T
+  typealias F = (U) throws -> T
  
  var scope: ComponentScope!
  var factory: F!
  
-  var numberOfArguments: Int?
+  var numberOfArguments: Int = 0
  var autoWiringFactory: ((DependencyContainer, DependencyContainer.Tag?) throws -> T)?
  
-  var forwardsDefinition: _Definition?
+  var forwardsTo: _Definition?
  
-  init(@noescape configure: (DefinitionBuilder -> ())) {
+  init(configure: (DefinitionBuilder) -> ()) {
    configure(self)
  }
  
-  func build() -> DefinitionOf<T, F> {
-    let factory = self.factory
-    let definition = DefinitionOf<T, F>(scope: scope, factory: factory)
+  func build() -> Definition<T, U> {
+    let factory = self.factory!
+    let definition = Definition<T, U>(scope: scope, factory: factory)
    definition.numberOfArguments = numberOfArguments
    definition.autoWiringFactory = autoWiringFactory
    definition.weakFactory = { try factory($0 as! U) }
-    definition.forwardsToDefinition = forwardsDefinition as? _TypeForwardingDefinition
+    definition.forwardsTo = forwardsTo as? _TypeForwardingDefinition
    return definition
  }
 }

-//MARK: - Deprecated methods
+//MARK: - KeyDefinitionPair

-extension DefinitionOf {
-  
-  @available(*, deprecated=4.6.1, message="Use resolvingProperties(_:)")
-  public func resolveDependencies(block: (DependencyContainer, T) throws -> ()) -> DefinitionOf {
-    return resolvingProperties(block)
-  }
+typealias KeyDefinitionPair = (key: DefinitionKey, definition: _Definition)

+/// Definitions are matched if they are registered for the same tag and thier factories accept the same number of runtime arguments.
+private func ~=(lhs: KeyDefinitionPair, rhs: KeyDefinitionPair) -> Bool {
+  guard lhs.key.type == rhs.key.type else { return false }
+  guard lhs.key.tag == rhs.key.tag else { return false }
+  guard lhs.definition.numberOfArguments == rhs.definition.numberOfArguments else { return false }
+  return true
+}
+
+/// Returns key-defintion pairs with definitions able to resolve that type (directly or via type forwarding)
+/// and which tag matches provided key's tag or is nil if strictByTag is false.
+/// In the end filters defintions by type of runtime arguments.
+func filter(definitions _definitions: [KeyDefinitionPair], byKey key: DefinitionKey, strictByTag: Bool = false, byTypeOfArguments: Bool = false) -> [KeyDefinitionPair] {
+  let definitions = _definitions
+    .filter({ $0.key.type == key.type || $0.definition.doesImplements(type: key.type) })
+    .filter({ $0.key.tag == key.tag || (!strictByTag && $0.key.tag == nil) })
+  if byTypeOfArguments {
+    return definitions.filter({ $0.key.typeOfArguments == key.typeOfArguments })
+  }
+  else {
+    return definitions
+  }
+}
+
+/// Orders key-definition pairs putting first definitions registered for provided tag.
+func order(definitions _definitions: [KeyDefinitionPair], byTag tag: DependencyContainer.Tag?) -> [KeyDefinitionPair] {
+  return
+    _definitions.filter({ $0.key.tag == tag }) +
+      _definitions.filter({ $0.key.tag != tag })
 }
@@ -34,23 +34,23 @@ public final class DependencyContainer {
   
   - seealso: `DependencyTagConvertible`
   */
-  public enum Tag: Equatable {
+  public enum Tag {
    case String(StringLiteralType)
    case Int(IntegerLiteralType)
  }
  
  internal(set) public var context: Context!
-  var definitions = [DefinitionKey : _Definition]()
-  private var resolvedInstances = ResolvedInstances()
+  var definitions = [DefinitionKey: _Definition]()
+  var resolvedInstances = ResolvedInstances()
  private let lock = RecursiveLock()
  
-  private(set) var bootstrapped = false
-  private var bootstrapQueue: [() throws -> ()] = []
+  var bootstrapped = false
+  var bootstrapQueue: [() throws -> ()] = []
  
  private var _weakCollaborators: [WeakBox<DependencyContainer>] = []
-  private(set) var _collaborators: [DependencyContainer] {
+  var _collaborators: [DependencyContainer] {
    get {
-      return _weakCollaborators.flatMap({ $0.value })
+      return _weakCollaborators.compactMap({ $0.value })
    }
    set {
      _weakCollaborators = newValue.filter({ $0 !== self }).map(WeakBox.init)
@@ -79,7 +79,7 @@ public final class DependencyContainer {
   
   - returns: A new DependencyContainer.
   */
-  public init(@noescape configBlock: (DependencyContainer->()) = { _ in }) {
+  public init(configBlock: (DependencyContainer)->() = { _ in }) {
    configBlock(self)
  }
  
@@ -99,11 +99,9 @@ public final class DependencyContainer {
    }
  }

-  private func threadSafe<T>(@noescape closure: () throws -> T) rethrows -> T {
+  func threadSafe<T>(_ closure: () throws -> T) rethrows -> T {
    lock.lock()
-    defer {
-      lock.unlock()
-    }
+    defer { lock.unlock() }
    return try closure()
  }
  
@@ -169,12 +167,15 @@ extension DependencyContainer {
    /// The label of the property where resolved instance will be auto-injected.
    private(set) public var injectedInProperty: String?
    
+    let inCollaboration: Bool
+    
    var logErrors: Bool = true
    
-    init(key: DefinitionKey, injectedInType: Any.Type?, injectedInProperty: String?) {
+    init(key: DefinitionKey, injectedInType: Any.Type?, injectedInProperty: String?, inCollaboration: Bool) {
      self.key = key
      self.injectedInType = injectedInType
      self.injectedInProperty = injectedInProperty
+      self.inCollaboration = inCollaboration
    }
    
    public var debugDescription: String {
@@ -182,7 +183,7 @@ extension DependencyContainer {
    }
    
    public var description: String {
-      let resolvingDescription = "Resolving type \(key.type) with arguments \(key.typeOfArguments) tagged with \(key.tag.desc)"
+      let resolvingDescription = "Resolving type \(key.type) with arguments \(key.typeOfArguments) \(key.tag != nil ? "tagged with \(key.tag!)" : "")"
      if injectedInProperty != nil {
        return "\(resolvingDescription) while auto-injecting property \(injectedInProperty.desc) of \(injectedInType.desc)"
      }
@@ -197,9 +198,9 @@ extension DependencyContainer {
  }

  /// Pushes new context created with provided values and calls block. When block returns previous context is restored.
-  /// For `nil` values (except tag) new context will use values from the current context.
-  /// Will releas resolved instances and call `Resolvable` callbacks when popped to initial context.
-  func inContext<T>(key: DefinitionKey, injectedInProperty: String? = nil, injectedInType: Any.Type? = nil, logErrors: Bool! = nil, @noescape block: () throws -> T) rethrows -> T {
+  /// When popped to initial (root) context will release all references to resolved instances and call `Resolvable` callbacks.
+  func inContext<T>(key aKey: DefinitionKey, injectedInType: Any.Type?, injectedInProperty: String? = nil, inCollaboration: Bool = false, container: DependencyContainer? = nil, logErrors: Bool! = nil, block: () throws -> T) rethrows -> T {
+    let key = aKey
    return try threadSafe {
      let currentContext = self.context
      
@@ -209,14 +210,16 @@ extension DependencyContainer {
        //clean instances pool if it is owned not by other container
        if context == nil {
          resolvedInstances.resolvedInstances.removeAll()
+          for (key, instance) in resolvedInstances.sharedWeakSingletons {
+            if resolvedInstances.sharedWeakSingletons[key] is WeakBoxType { continue }
+            resolvedInstances.sharedWeakSingletons[key] = WeakBox(instance)
+          }
          for (key, instance) in resolvedInstances.weakSingletons {
            if resolvedInstances.weakSingletons[key] is WeakBoxType { continue }
            resolvedInstances.weakSingletons[key] = WeakBox(instance)
          }
          
-          // We call didResolveDependencies only at this point
-          // because this is a point when dependencies graph is complete.
-          for resolvedInstance in resolvedInstances.resolvableInstances.reverse() {
+          for resolvedInstance in resolvedInstances.resolvableInstances.reversed() {
            resolvedInstance.didResolveDependencies()
          }
          resolvedInstances.resolvableInstances.removeAll()
@@ -225,8 +228,9 @@ extension DependencyContainer {
      
      context = Context(
        key: key,
-        injectedInType: injectedInType ?? currentContext?.resolvingType,
-        injectedInProperty: injectedInProperty
+        injectedInType: injectedInType,
+        injectedInProperty: injectedInProperty,
+        inCollaboration: inCollaboration
      )
      context.logErrors = logErrors ?? currentContext?.logErrors ?? true
      
@@ -234,7 +238,7 @@ extension DependencyContainer {
        return try block()
      }
      catch {
-        if context.logErrors { log(.Errors, error) }
+        if context.logErrors { log(level: .Errors, error) }
        throw error
      }
    }
@@ -242,281 +246,6 @@ extension DependencyContainer {

 }

-// MARK: - Registering definitions
-
-extension DependencyContainer {
-  
-  /**
-   Register factory for type `T` and associate it with an optional tag.
-
-   - parameters:
-      - tag: The arbitrary tag to associate this factory with. Pass `nil` to associate with any tag. Default value is `nil`.
-      - scope: The scope to use for instance created by the factory.
-      - factory: The factory to register.
-
-   - returns: A registered definition.
-
-   - note: You should cast the factory return type to the protocol you want to register it for
-           (unless you want to register concrete type).
-
-   **Example**:
-   ```swift
-   container.register { ServiceImp() as Service }
-   container.register(tag: "service") { ServiceImp() as Service }
-   container.register(.Shared) { ServiceImp() as Service }
-   container.register { try ClientImp(service: container.resolve() as Service) as Client }
-   ```
-   */
-  public func register<T>(scope: ComponentScope = .Unique, tag: DependencyTagConvertible? = nil, factory: () throws -> T) -> DefinitionOf<T, () throws -> T> {
-    let definition = DefinitionBuilder<T, ()> {
-      $0.scope = scope
-      $0.factory = factory
-    }.build()
-    register(definition, forTag: tag)
-    return definition
-  }
-  
-  /**
-   Register generic factory and auto-wiring factory and associate it with an optional tag.
-   
-   - parameters:
-      - tag: The arbitrary tag to associate this factory with. Pass `nil` to associate with any tag. Default value is `nil`.
-      - scope: The scope to use for instance created by the factory.
-      - factory: The factory to register.
-      - numberOfArguments: The number of factory arguments. Will be used on auto-wiring to sort definitions.
-      - autoWiringFactory: The factory to be used on auto-wiring to resolve component.
-   
-   - returns: A registered definition.
-   
-   - note: You _should not_ call this method directly, instead call any of other `register` methods.
-   You _should_ use this method only to register dependency with more runtime arguments
-   than _Dip_ supports (currently it's up to six) like in the following example:
-   
-   ```swift
-   public func register<T, A, B, C, ...>(tag: Tag? = nil, scope: ComponentScope = .Unique, factory: (A, B, C, ...) throws -> T) -> DefinitionOf<T, (A, B, C, ...) throws -> T> {
-     return registerFactory(tag: tag, scope: scope, factory: factory, numberOfArguments: ...) { container, tag in
-        try factory(container.resolve(tag: tag), ...)
-      }
-   }
-   ```
-   
-   Though before you do so you should probably review your design and try to reduce number of depnedencies.
-   */
-  public func registerFactory<T, U>(tag tag: DependencyTagConvertible? = nil, scope: ComponentScope, factory: U throws -> T, numberOfArguments: Int, autoWiringFactory: (DependencyContainer, Tag?) throws -> T) -> DefinitionOf<T, U throws -> T> {
-    let definition = DefinitionBuilder<T, U> {
-      $0.scope = scope
-      $0.factory = factory
-      $0.numberOfArguments = numberOfArguments
-      $0.autoWiringFactory = autoWiringFactory
-    }.build()
-    register(definition, forTag: tag)
-    return definition
-  }
-
-  /**
-   Register definiton in the container and associate it with an optional tag.
-   Will override already registered definition for the same type and factory, associated with the same tag.
-   
-   - parameters:
-      - tag: The arbitrary tag to associate this definition with. Pass `nil` to associate with any tag. Default value is `nil`.
-      - definition: The definition to register in the container.
-   
-   */
-  public func register<T, U>(definition: DefinitionOf<T, U throws -> T>, forTag tag: DependencyTagConvertible? = nil) {
-    precondition(!bootstrapped, "You can not modify container's definitions after it was bootstrapped.")
-    
-    threadSafe {
-      let key = DefinitionKey(type: T.self, typeOfArguments: U.self, tag: tag?.dependencyTag)
-      
-      definitions[key] = definition
-      resolvedInstances.singletons[key] = nil
-      resolvedInstances.weakSingletons[key] = nil
-      
-      if case .EagerSingleton = definition.scope {
-        bootstrapQueue.append({ let _ = try self.resolve(tag: tag) as T })
-      }
-    }
-  }
-  
-}
-
-// MARK: - Resolve dependencies
-
-extension DependencyContainer {
-  
-  /**
-   Resolve a an instance of type `T`.
-   
-   If no matching definition was registered with provided `tag`,
-   container will lookup definition associated with `nil` tag.
-   
-   - parameter tag: The arbitrary tag to use to lookup definition.
-   
-   - throws: `DipError.DefinitionNotFound`, `DipError.AutoInjectionFailed`, `DipError.AmbiguousDefinitions`
-   
-   - returns: An instance of type `T`.
-   
-   - seealso: `register(tag:_:factory:)`
-   
-   **Example**:
-   ```swift
-   let service = try! container.resolve() as Service
-   let service = try! container.resolve(tag: "service") as Service
-   let service: Service = try! container.resolve()
-   ```
-   
-   */
-  public func resolve<T>(tag tag: DependencyTagConvertible? = nil) throws -> T {
-    return try resolve(tag: tag) { factory in try factory() }
-  }
-  
-  /**
-   Resolve an instance of provided type. Weakly-typed alternative of `resolve(tag:)`
-   
-   - warning: This method does not make any type checks, so there is no guaranty that
-              resulting instance is actually an instance of requested type.
-              That can happen if you register forwarded type that is not implemented by resolved instance.
-   
-   **Example**:
-   ```swift
-   let service = try! container.resolve(Service.self) as! Service
-   let service = try! container.resolve(Service.self, tag: "service") as! Service
-   ```
-   
-   - seealso: `resolve(tag:)`, `register(tag:_:factory:)`
-   */
-  public func resolve(type: Any.Type, tag: DependencyTagConvertible? = nil) throws -> Any {
-    return try resolve(type, tag: tag) { factory in try factory() }
-  }
-
-  /**
-   Resolve an instance of type `T` using generic builder closure that accepts generic factory and returns created instance.
-   
-   - parameters:
-      - tag: The arbitrary tag to use to lookup definition.
-      - builder: Generic closure that accepts generic factory and returns inctance created by that factory.
-   
-   - throws: `DipError.DefinitionNotFound`, `DipError.AutoInjectionFailed`, `DipError.AmbiguousDefinitions`
-   
-   - returns: An instance of type `T`.
-   
-   - note: You _should not_ call this method directly, instead call any of other 
-           `resolve(tag:)` or `resolve(tag:withArguments:)` methods.
-           You _should_ use this method only to resolve dependency with more runtime arguments than
-           _Dip_ supports (currently it's up to six) like in the following example:
-   
-   ```swift
-   public func resolve<T, A, B, C, ...>(tag tag: Tag? = nil, _ arg1: A, _ arg2: B, _ arg3: C, ...) throws -> T {
-     return try resolve(tag: tag) { factory in factory(arg1, arg2, arg3, ...) }
-   }
-   ```
-   
-   Though before you do so you should probably review your design and try to reduce the number of dependencies.
-   */
-  public func resolve<T, U>(tag tag: DependencyTagConvertible? = nil, builder: (U throws -> T) throws -> T) rethrows -> T {
-    return try resolve(T.self, tag: tag, builder: { factory in
-      try builder({ try factory($0) as! T })
-    }) as! T
-  }
-  
-  /**
-   Resolve an instance of provided type using builder closure. Weakly-typed alternative of `resolve(tag:builder:)`
-   
-   - seealso: `resolve(tag:builder:)`
-  */
-  public func resolve<U>(type: Any.Type, tag: DependencyTagConvertible? = nil, builder: (U throws -> Any) throws -> Any) rethrows -> Any {
-    let key = DefinitionKey(type: type, typeOfArguments: U.self, tag: tag?.dependencyTag)
-    
-    return try inContext(key) {
-      try resolveKey(key, builder: { definition in
-        try builder(definition.weakFactory)
-      })
-    }
-  }
-  
-  /// Lookup definition by the key and use it to resolve instance. Fallback to the key with `nil` tag.
-  func resolveKey<T>(key: DefinitionKey, builder: (_Definition throws -> T)) throws -> T {
-    guard let matching = self.definition(matching: key) else {
-      return try resolveWithCollaborators(key, builder: builder) ?? autowire(key)
-    }
-    
-    let (key, definition) = matching
-    
-    //first search for already resolved instance for this type or any of forwarding types
-    if let previouslyResolved: T = previouslyResolved(definition, key: key) {
-      log(.Verbose, "Reusing previously resolved instance \(previouslyResolved)")
-      return previouslyResolved
-    }
-    
-    log(.Verbose, context)
-    var resolvedInstance = try builder(definition)
-    
-    /*
-     Strongly-typed `resolve(tag:builder:)` calls weakly-typed `resolve(_:tag:builder:)`,
-     so `T` will be `Any` at runtime, erasing type information when this method returns.
-     When we try to cast result of `Any` to generic type T Swift fails to cast it.
-     The same happens in the following code snippet:
-     
-     let optService: Service? = ServiceImp()
-     let anyService: Any = optService
-     let service: Service = anyService as! Service
-     
-     That happens because when Optional is casted to Any Swift can not implicitly unwrap it with as operator.
-     As a workaround we detect boxing here and unwrap it so that we return not a box, but wrapped instance.
-     */
-    if let box = resolvedInstance as? BoxType, unboxed = box.unboxed as? T {
-      resolvedInstance = unboxed
-    }
-    
-    //when builder calls factory it will in turn resolve sub-dependencies (if there are any)
-    //when it returns instance that we try to resolve here can be already resolved
-    //so we return it, throwing away instance created by previous call to builder
-    if let previouslyResolved: T = previouslyResolved(definition, key: key) {
-      log(.Verbose, "Reusing previously resolved instance \(previouslyResolved)")
-      return previouslyResolved
-    }
-
-    resolvedInstances[forKey: key, inScope: definition.scope] = resolvedInstance
-
-    if let resolvable = resolvedInstance as? Resolvable {
-      resolvedInstances.resolvableInstances.append(resolvable)
-    }
-
-    try autoInjectProperties(resolvedInstance)
-    try definition.resolveProperties(instance: resolvedInstance, container: self)
-    
-    log(.Verbose, "Resolved type \(key.type) with \(resolvedInstance)")
-    return resolvedInstance
-  }
-  
-  private func previouslyResolved<T>(definition: _Definition, key: DefinitionKey) -> T? {
-    let keys = definition.implementingTypes.map({
-      DefinitionKey(type: $0, typeOfArguments: key.typeOfArguments, tag: key.tag)
-    })
-    for key in [key] + keys {
-      if let previouslyResolved = resolvedInstances[forKey: key, inScope: definition.scope] as? T {
-        return previouslyResolved
-      }
-    }
-    return nil
-  }
-  
-  /// Searches for definition that matches provided key
-  private func definition(matching key: DefinitionKey) -> KeyDefinitionPair? {
-    let typeDefinitions = definitions.filter({ $0.0.type ==  key.type })
-    guard !typeDefinitions.isEmpty else {
-      return typeForwardingDefinition(key)
-    }
-    
-    if let definition = (self.definitions[key] ?? self.definitions[key.tagged(nil)]) {
-      return (key, definition)
-    }
-
-    return nil
-  }
-  
-}
-
 //MARK: - Collaborating containers

 extension DependencyContainer {
@@ -536,23 +265,33 @@ extension DependencyContainer {
  public func collaborate(with containers: [DependencyContainer]) {
    _collaborators += containers
    for container in containers {
-      container.resolvedInstances.singletonsBox = self.resolvedInstances.singletonsBox
-      container.resolvedInstances.weakSingletonsBox = self.resolvedInstances.weakSingletonsBox
+      container._collaborators += [self]
+      container.resolvedInstances.sharedSingletonsBox = self.resolvedInstances.sharedSingletonsBox
+      container.resolvedInstances.sharedWeakSingletonsBox = self.resolvedInstances.sharedWeakSingletonsBox
+      updateCollaborationReferences(between: container, and: self)
+    }
+  }
+  
+  private func updateCollaborationReferences(between container: DependencyContainer, and collaborator: DependencyContainer) {
+    for container in container._collaborators {
+      guard container.resolvedInstances.sharedSingletonsBox !== collaborator.resolvedInstances.sharedSingletonsBox else { continue }
+      container.resolvedInstances.sharedSingletonsBox = collaborator.resolvedInstances.sharedSingletonsBox
+      container.resolvedInstances.sharedWeakSingletonsBox = collaborator.resolvedInstances.sharedWeakSingletonsBox
+      updateCollaborationReferences(between: container, and: collaborator)
    }
  }
  
  /// Tries to resolve key using collaborating containers
-  private func resolveWithCollaborators<T>(key: DefinitionKey, builder: _Definition throws -> T) -> T? {
+  func collaboratingResolve<T>(key aKey: DefinitionKey, builder: (_Definition) throws -> T) -> T? {
+    let key = aKey
    for collaborator in _collaborators {
+      //if container is already in a context resolving this type
+      //it means that it has been already called to resolve this type,
+      //so there is probably a cercular reference between containers.
+      //To break it skip this container
+      if let context = collaborator.context, context.resolvingType == key.type && context.tag == key.tag { continue }
+      
      do {
-        //if container is already in a context resolving this type 
-        //it means that it has been already called to resolve this type,
-        //so there is probably a cercular reference between containers.
-        //To break it skip this container
-        if let context = collaborator.context where
-          context.resolvingType == key.type &&
-          context.tag == key.tag { continue }
-
        //Pass current container's instances pool to collect instances resolved by collaborator
        let resolvedInstances = collaborator.resolvedInstances
        collaborator.resolvedInstances = self.resolvedInstances
@@ -560,19 +299,29 @@ extension DependencyContainer {
        let context = collaborator.context
        collaborator.context = self.context
        defer {
-          collaborator.resolvedInstances = resolvedInstances
          collaborator.context = context
+          collaborator.resolvedInstances = resolvedInstances
+          
+          for (key, resolvedSingleton) in self.resolvedInstances.singletons {
+            collaborator.resolvedInstances.singletons[key] = resolvedSingleton
+          }
+          for (key, resolvedSingleton) in self.resolvedInstances.weakSingletons {
+            guard collaborator.definition(matching: key) == nil else { continue }
+            collaborator.resolvedInstances.weakSingletons[key] = resolvedSingleton is WeakBoxType ? resolvedSingleton :  WeakBox(resolvedSingleton)
+          }
+          for (key, resolved) in self.resolvedInstances.resolvedInstances {
+            guard collaborator.definition(matching: key) == nil else { continue }
+            collaborator.resolvedInstances.resolvedInstances[key] = resolved
+          }
        }
        
-        let resolved = try collaborator.inContext(key, injectedInProperty: self.context.injectedInProperty, injectedInType: self.context.injectedInType, logErrors: false) {
-          try collaborator.resolveKey(key, builder: builder)
+        let resolved = try collaborator.inContext(key:key, injectedInType: self.context.injectedInType, injectedInProperty: self.context.injectedInProperty, inCollaboration: true, logErrors: false) {
+          try collaborator._resolve(key: key, builder: builder)
        }

        return resolved
      }
-      catch {
-        continue
-      }
+      catch { }
    }
    return nil
  }
@@ -585,23 +334,30 @@ extension DependencyContainer {
  
  /**
   Removes definition registered in the container.
-
+   
   - parameters:
      - tag: The tag used to register definition.
      - definition: The definition to remove
   */
-  public func remove<T, U>(definition: DefinitionOf<T, U>, forTag tag: DependencyTagConvertible? = nil) {
-    let key = DefinitionKey(type: T.self, typeOfArguments: U.self, tag: tag?.dependencyTag)
-    remove(definitionForKey: key)
+  public func remove<T, U>(_ definition: Definition<T, U>, tag: DependencyTagConvertible? = nil) {
+    _remove(definition: definition, tag: tag)
  }
  
-  private func remove(definitionForKey key: DefinitionKey) {
+  func _remove<T, U>(definition aDefinition: Definition<T, U>, tag: DependencyTagConvertible? = nil) {
+    let key = DefinitionKey(type: T.self, typeOfArguments: U.self, tag: tag?.dependencyTag)
+    _remove(definitionForKey: key)
+  }
+  
+  func _remove(definitionForKey key: DefinitionKey) {
    precondition(!bootstrapped, "You can not modify container's definitions after it was bootstrapped.")
    
    threadSafe {
+      definitions[key]?.container = nil
      definitions[key] = nil
      resolvedInstances.singletons[key] = nil
      resolvedInstances.weakSingletons[key] = nil
+      resolvedInstances.sharedSingletons[key] = nil
+      resolvedInstances.sharedWeakSingletons[key] = nil
    }
  }

@@ -610,15 +366,20 @@ extension DependencyContainer {
   */
  public func reset() {
    threadSafe {
+      definitions.forEach { $0.1.container = nil }
      definitions.removeAll()
      resolvedInstances.singletons.removeAll()
      resolvedInstances.weakSingletons.removeAll()
+      resolvedInstances.sharedSingletons.removeAll()
+      resolvedInstances.sharedWeakSingletons.removeAll()
      bootstrapped = false
    }
  }

 }

+// MARK: - Validation
+
 extension DependencyContainer {
  
  /**
@@ -629,15 +390,21 @@ extension DependencyContainer {
   
   - parameter arguments: set of arguments to use to resolve registered definitions.
                          Use a tuple for registered factories that accept several runtime arguments.
-  */
-  public func validate(arguments: Any...) throws {
+   */
+  public func validate(_ arguments: Any...) throws {
+    try _validate(arguments: arguments)
+  }
+  
+  func _validate(arguments _arguments: [Any]) throws {
+    let arguments = _arguments
    validateNextDefinition: for (key, _) in definitions {
      do {
        //try to resolve key using provided arguments
-        for argumentsSet in arguments where argumentsSet.dynamicType == key.typeOfArguments {
+        for argumentsSet in arguments {
+          guard type(of: argumentsSet) == key.typeOfArguments else { continue }
          do {
-            try inContext(key) {
-              try resolveKey(key, builder: { definition throws -> Any in
+            let _ = try inContext(key:key, injectedInType: nil) {
+              try self._resolve(key: key, builder: { definition throws -> Any in
                try definition.weakFactory(argumentsSet)
              })
            }
@@ -647,83 +414,34 @@ extension DependencyContainer {
            throw error
          }
            //ignore other errors
-          catch { log(.Errors, error) }
+          catch { log(level: .Errors, error) }
        }
        
        //try to resolve key using auto-wiring
        do {
-          try self.resolve(key.type, tag: key.tag)
+          let _ = try self.resolve(key.type, tag: key.tag)
        }
        catch let error as DipError {
          throw error
        }
          //ignore other errors
-        catch { log(.Errors, error) }
+        catch { log(level: .Errors, error) }
      }
    }
  }
 }

-///Pool to hold instances, created during call to `resolve()`.
-///Before `resolve()` returns pool is drained.
-private class ResolvedInstances {
-  
-  var resolvedInstances = [DefinitionKey: Any]()
-  var resolvableInstances = [Resolvable]()
-  
-  //singletons are stored using reference type wrapper to be able to share them between containers
-  private var singletonsBox = Box<[DefinitionKey: Any]>([:])
-  var singletons: [DefinitionKey: Any] {
-    get { return singletonsBox.unboxed }
-    set { singletonsBox.unboxed = newValue }
-  }
-  
-  private var weakSingletonsBox = Box<[DefinitionKey: Any]>([:])
-  var weakSingletons: [DefinitionKey: Any] {
-    get { return weakSingletonsBox.unboxed }
-    set { weakSingletonsBox.unboxed = newValue }
-  }
-
-  subscript(forKey key: DefinitionKey, inScope scope: ComponentScope) -> Any? {
-    get {
-      switch scope {
-      case .Singleton, .EagerSingleton: return singletons[key]
-      case .WeakSingleton: return (weakSingletons[key] as? WeakBoxType)?.unboxed ?? weakSingletons[key]
-      case .Shared, .ObjectGraph: return resolvedInstances[key]
-      case .Unique, .Prototype: return nil
-      }
-    }
-    set {
-      switch scope {
-      case .Singleton, .EagerSingleton: singletons[key] = newValue
-      case .WeakSingleton: weakSingletons[key] = newValue
-      case .Shared, .ObjectGraph: resolvedInstances[key] = newValue
-      case .Unique, .Prototype: break
-      }
-    }
-  }
-  
-}
-
 extension DependencyContainer: CustomStringConvertible {
  
  public var description: String {
-    return "Definitions: \(definitions.count)\n" + definitions.map({ "\($0.0)" }).joinWithSeparator("\n")
+    return "Definitions: \(definitions.count)\n" + definitions.map({ "\($0.0)" }).joined(separator: "\n")
  }
  
 }

-//MARK: - Resolvable
-
-/// Conform to this protocol when you need to have a callback when all the dependencies are injected.
-public protocol Resolvable {
-  /// This method is called by the container when all dependencies of the instance are resolved.
-  func didResolveDependencies()
-}
-
 //MARK: - DependencyTagConvertible

-/// Implement this protocol of your type if you want to use its instances as `DependencyContainer`'s tags.
+/// Implement this protocol on your type if you want to use its instances as `DependencyContainer`'s tags.
 /// `DependencyContainer.Tag`, `String`, `Int` and any `RawRepresentable` with `RawType` of `String` or `Int` by default confrom to this protocol.
 public protocol DependencyTagConvertible {
  var dependencyTag: DependencyContainer.Tag { get }
@@ -759,7 +477,7 @@ extension DependencyTagConvertible where Self: RawRepresentable, Self.RawValue =
  }
 }

-extension DependencyContainer.Tag: StringLiteralConvertible {
+extension DependencyContainer.Tag: ExpressibleByStringLiteral {
  
  public init(stringLiteral value: StringLiteralType) {
    self = .String(value)
@@ -775,7 +493,7 @@ extension DependencyContainer.Tag: StringLiteralConvertible {
  
 }

-extension DependencyContainer.Tag: IntegerLiteralConvertible {
+extension DependencyContainer.Tag: ExpressibleByIntegerLiteral {
  
  public init(integerLiteral value: IntegerLiteralType) {
    self = .Int(value)
@@ -783,88 +501,17 @@ extension DependencyContainer.Tag: IntegerLiteralConvertible {
  
 }

-public func ==(lhs: DependencyContainer.Tag, rhs: DependencyContainer.Tag) -> Bool {
-  switch (lhs, rhs) {
-  case let (.String(lhsString), .String(rhsString)):
-    return lhsString == rhsString
-  case let (.Int(lhsInt), .Int(rhsInt)):
-    return lhsInt == rhsInt
-  default:
-    return false
-  }
-}
+extension DependencyContainer.Tag: Equatable {

-//MARK: - DipError
-
-/**
- Errors thrown by `DependencyContainer`'s methods.
- 
- - seealso: `resolve(tag:)`
-*/
-public enum DipError: ErrorType, CustomStringConvertible {
-  
-  /**
-   Thrown by `resolve(tag:)` if no matching definition was registered in container.
-   
-   - parameter key: definition key used to lookup matching definition
-  */
-  case DefinitionNotFound(key: DefinitionKey)
-
-  /**
-   Thrown by `resolve(tag:)` if failed to auto-inject required property.
-   
-   - parameters:
-      - label: The name of the property
-      - type: The type of the property
-      - underlyingError: The error that caused auto-injection to fail
-  */
-  case AutoInjectionFailed(label: String?, type: Any.Type, underlyingError: ErrorType)
-  
-  /**
-   Thrown by `resolve(tag:)` if failed to auto-wire a type.
-   
-   - parameters:
-      - type: The type that failed to be resolved by auto-wiring
-      - underlyingError: The error that cause auto-wiring to fail
-  */
-  case AutoWiringFailed(type: Any.Type, underlyingError: ErrorType)
-
-  /**
-   Thrown when auto-wiring type if several definitions with the same number of runtime arguments
-   are registered for that type.
-   
-   - parameters:
-      - type: The type that failed to be resolved by auto-wiring
-      - definitions: Ambiguous definitions
-  */
-  case AmbiguousDefinitions(type: Any.Type, definitions: [Definition])
-  
-  public var description: String {
-    switch self {
-    case let .DefinitionNotFound(key):
-      return "No definition registered for \(key).\nCheck the tag, type you try to resolve, number, order and types of runtime arguments passed to `resolve()` and match them with registered factories for type \(key.type)."
-    case let .AutoInjectionFailed(label, type, error):
-      return "Failed to auto-inject property \"\(label.desc)\" of type \(type). \(error)"
-    case let .AutoWiringFailed(type, error):
-      return "Failed to auto-wire type \"\(type)\". \(error)"
-    case let .AmbiguousDefinitions(type, definitions):
-      return "Ambiguous definitions for \(type):\n" +
-      definitions.map({ "\($0)" }).joinWithSeparator(";\n")
+  public static func ==(lhs: DependencyContainer.Tag, rhs: DependencyContainer.Tag) -> Bool {
+    switch (lhs, rhs) {
+    case let (.String(lhsString), .String(rhsString)):
+      return lhsString == rhsString
+    case let (.Int(lhsInt), .Int(rhsInt)):
+      return lhsInt == rhsInt
+    default:
+      return false
    }
  }
-  
-}

-//MARK: - Deprecated methods
-
-extension DependencyContainer {
-  @available(*, deprecated=4.3.0, message="Use registerFactory(tag:scope:factory:numberOfArguments:autoWiringFactory:) instead.")
-  public func registerFactory<T, U>(tag tag: DependencyTagConvertible? = nil, scope: ComponentScope, factory: U throws -> T) -> DefinitionOf<T, U throws -> T> {
-    let definition = DefinitionBuilder<T, U> {
-      $0.scope = scope
-      $0.factory = factory
-      }.build()
-    register(definition, forTag: tag)
-    return definition
-  }
 }
@@ -0,0 +1,94 @@
+//
+// Dip
+//
+// Copyright (c) 2015 Olivier Halligon <olivier@halligon.net>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+/**
+ Errors thrown by `DependencyContainer`'s methods.
+ 
+ - seealso: `resolve(tag:)`
+ */
+public enum DipError: Error, CustomStringConvertible {
+  
+  /**
+   Thrown by `resolve(tag:)` if no matching definition was registered in container.
+   
+   - parameter key: definition key used to lookup matching definition
+   */
+  case definitionNotFound(key: DefinitionKey)
+  
+  /**
+   Thrown by `resolve(tag:)` if failed to auto-inject required property.
+   
+   - parameters:
+      - label: The name of the property
+      - type: The type of the property
+      - underlyingError: The error that caused auto-injection to fail
+   */
+  case autoInjectionFailed(label: String?, type: Any.Type, underlyingError: Error)
+  
+  /**
+   Thrown by `resolve(tag:)` if failed to auto-wire a type.
+   
+   - parameters:
+      - type: The type that failed to be resolved by auto-wiring
+      - underlyingError: The error that cause auto-wiring to fail
+   */
+  case autoWiringFailed(type: Any.Type, underlyingError: Error)
+  
+  /**
+   Thrown when auto-wiring type if several definitions with the same number of runtime arguments
+   are registered for that type.
+   
+   - parameters:
+      - type: The type that failed to be resolved by auto-wiring
+      - definitions: Ambiguous definitions
+   */
+  case ambiguousDefinitions(type: Any.Type, definitions: [DefinitionType])
+  
+  /**
+   Thrown by `resolve(tag:)` if resolved instance does not implemenet resolved type (i.e. when type-forwarding).
+   
+   - parameters:
+      - resolved: Resolved instance
+      - key: Definition key used to resolve instance
+   */
+  case invalidType(resolved: Any?, key: DefinitionKey)
+  
+  public var description: String {
+    switch self {
+    case let .definitionNotFound(key):
+      return "No definition registered for \(key).\nCheck the tag, type you try to resolve, number, order and types of runtime arguments passed to `resolve()` and match them with registered factories for type \(key.type)."
+    case let .autoInjectionFailed(label, type, error):
+      return "Failed to auto-inject property \"\(label.desc)\" of type \(type). \(error)"
+    case let .autoWiringFailed(type, error):
+      return "Failed to auto-wire type \"\(type)\". \(error)"
+    case let .ambiguousDefinitions(type, definitions):
+      return "Ambiguous definitions for \(type):\n" +
+        definitions.map({ "\($0)" }).joined(separator: ";\n")
+    case let .invalidType(resolved, key):
+      return "Resolved instance \(resolved ?? "nil") does not implement expected type \(key.type)."
+    }
+  }
+  
+}
+
@@ -0,0 +1,84 @@
+//
+// Dip
+//
+// Copyright (c) 2015 Olivier Halligon <olivier@halligon.net>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+extension DependencyContainer {
+  /**
+   Registers definition for passed type.
+   
+   If instance created by factory of definition, passed as a first parameter,
+   does not implement type passed in a `type` parameter,
+   container will throw `DipError.DefinitionNotFound` error when trying to resolve that type.
+   
+   - parameters:
+      - definition: Definition to register
+      - type: Type to register definition for
+      - tag: Optional tag to associate definition with. Default is `nil`.
+   
+   - returns: New definition registered for passed type.
+   */
+  @discardableResult public func register<T, U, F>(_ definition: Definition<T, U>, type: F.Type, tag: DependencyTagConvertible? = nil) -> Definition<F, U> {
+    return _register(definition: definition, type: type, tag: tag)
+  }
+
+  /**
+   Register definiton in the container and associate it with an optional tag.
+   Will override already registered definition for the same type and factory, associated with the same tag.
+   
+   - parameters:
+      - tag: The arbitrary tag to associate this definition with. Pass `nil` to associate with any tag. Default value is `nil`.
+      - definition: The definition to register in the container.
+   
+   */
+  public func register<T, U>(_ definition: Definition<T, U>, tag: DependencyTagConvertible? = nil) {
+    _register(definition: definition, tag: tag)
+  }
+
+}
+
+extension DependencyContainer {
+  
+  func _register<T, U>(definition aDefinition: Definition<T, U>, tag: DependencyTagConvertible? = nil) {
+    precondition(!bootstrapped, "You can not modify container's definitions after it was bootstrapped.")
+    let definition = aDefinition
+    threadSafe {
+      let key = DefinitionKey(type: T.self, typeOfArguments: U.self, tag: tag?.dependencyTag)
+      if let _ = definitions[key] {
+        _remove(definitionForKey: key)
+      }
+      
+      definition.container = self
+      definitions[key] = definition
+      resolvedInstances.singletons[key] = nil
+      resolvedInstances.weakSingletons[key] = nil
+      resolvedInstances.sharedSingletons[key] = nil
+      resolvedInstances.sharedWeakSingletons[key] = nil
+      
+      if .eagerSingleton == definition.scope {
+        bootstrapQueue.append({ _ = try self.resolve(tag: tag) as T })
+      }
+    }
+  }
+  
+}
+
@@ -0,0 +1,330 @@
+//
+// Dip
+//
+// Copyright (c) 2015 Olivier Halligon <olivier@halligon.net>
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+extension DependencyContainer {
+  
+  /**
+   Resolve an instance of type `T`.
+   
+   If no matching definition was registered with provided `tag`,
+   container will lookup definition associated with `nil` tag.
+   
+   - parameter tag: The arbitrary tag to use to lookup definition.
+   
+   - throws: `DipError.DefinitionNotFound`, `DipError.AutoInjectionFailed`, `DipError.AmbiguousDefinitions`, `DipError.InvalidType`
+   
+   - returns: An instance of type `T`.
+   
+   **Example**:
+   ```swift
+   let service = try! container.resolve() as Service
+   let service = try! container.resolve(tag: "service") as Service
+   let service: Service = try! container.resolve()
+   ```
+   
+   - seealso: `register(_:type:tag:factory:)`
+   */
+  public func resolve<T>(tag: DependencyTagConvertible? = nil) throws -> T {
+    return try _resolve(tag: tag) { (factory: () throws -> T) in try factory() }
+  }
+
+  /**
+   Resolve an instance of requested type. Weakly-typed alternative of `resolve(tag:)`
+   
+   - warning: This method does not make any type checks, so there is no guaranty that
+              resulting instance is actually an instance of requested type.
+              That can happen if you register forwarded type that is not implemented by resolved instance.
+   
+   - parameters:
+      - type: Type to resolve
+      - tag: The arbitrary tag to use to lookup definition.
+   
+   - throws: `DipError.DefinitionNotFound`, `DipError.AutoInjectionFailed`, `DipError.AmbiguousDefinitions`, `DipError.InvalidType`
+   
+   - returns: An instance of requested type.
+
+   **Example**:
+   ```swift
+   let service = try! container.resolve(Service.self) as! Service
+   let service = try! container.resolve(Service.self, tag: "service") as! Service
+   ```
+
+   - seealso: `resolve(tag:)`, `register(_:type:tag:factory:)`
+   */
+  public func resolve(_ type: Any.Type, tag: DependencyTagConvertible? = nil) throws -> Any {
+    return try resolve(type, tag: tag) { (factory: () throws -> Any) in try factory() }
+  }
+  
+  /**
+   Resolve an instance of type `T` using generic builder closure that accepts generic factory and returns created instance.
+   
+   - parameters:
+      - tag: The arbitrary tag to use to lookup definition.
+      - builder: Generic closure that accepts generic factory and returns inctance created by that factory.
+   
+   - throws: `DipError.DefinitionNotFound`, `DipError.AutoInjectionFailed`, `DipError.AmbiguousDefinitions`, `DipError.InvalidType`
+   
+   - returns: An instance of type `T`.
+   
+   - note: You _should not_ call this method directly, instead call any of other 
+           `resolve(tag:)` or `resolve(tag:withArguments:)` methods.
+           You _should_ use this method only to resolve dependency with more runtime arguments than
+           _Dip_ supports (currently it's up to six) like in the following example:
+   
+   ```swift
+   public func resolve<T, A, B, C, ...>(tag: Tag? = nil, _ arg1: A, _ arg2: B, _ arg3: C, ...) throws -> T {
+     return try resolve(tag: tag) { factory in factory(arg1, arg2, arg3, ...) }
+   }
+   ```
+   
+   Though before you do so you should probably review your design and try to reduce the number of dependencies.
+   */
+  public func resolve<T, U>(tag: DependencyTagConvertible? = nil, builder: ((U) throws -> T) throws -> T) throws -> T {
+    return try _resolve(tag: tag, builder: builder)
+  }
+
+  public func resolve<T>(tag: DependencyTagConvertible? = nil, builder: (() throws -> T) throws -> T) throws -> T {
+    return try _resolve(tag: tag, builder: builder)
+  }
+
+  /**
+   Resolve an instance of provided type using builder closure. Weakly-typed alternative of `resolve(tag:builder:)`
+   
+   - seealso: `resolve(tag:builder:)`
+  */
+  public func resolve<U>(_ type: Any.Type, tag: DependencyTagConvertible? = nil, builder: ((U) throws -> Any) throws -> Any) throws -> Any {
+    return try _resolve(type: type, tag: tag, builder: builder)
+  }
+
+  public func resolve(_ type: Any.Type, tag: DependencyTagConvertible? = nil, builder: (() throws -> Any) throws -> Any) throws -> Any {
+    return try _resolve(type: type, tag: tag, builder: builder)
+  }
+
+}
+
+extension DependencyContainer {
+  
+  func _resolve<T>(tag aTag: DependencyTagConvertible? = nil, builder: (() throws -> T) throws -> T) throws -> T {
+    return try resolve(T.self, tag: aTag, builder: { factory in
+      try withoutActuallyEscaping(factory, do: { (factory) throws -> T in
+        try builder({ try factory() as! T })
+      })
+    }) as! T
+  }
+  
+  func _resolve(type aType: Any.Type, tag: DependencyTagConvertible? = nil, builder: (() throws -> Any) throws -> Any) throws -> Any {
+    let key = DefinitionKey(type: aType, typeOfArguments: Void.self, tag: tag?.dependencyTag)
+    
+    return try inContext(key:key, injectedInType: context?.resolvingType) {
+      try self._resolve(key: key, builder: { definition in
+        try builder { try definition.weakFactory(()) }
+      })
+    }
+  }
+  
+  func _resolve<T, U>(tag aTag: DependencyTagConvertible? = nil, builder: ((U) throws -> T) throws -> T) throws -> T {
+    return try resolve(T.self, tag: aTag, builder: { factory in
+      try withoutActuallyEscaping(factory, do: { (factory) throws -> T in
+        try builder({ try factory($0) as! T })
+      })
+    }) as! T
+  }
+  
+  func _resolve<U>(type aType: Any.Type, tag: DependencyTagConvertible? = nil, builder: ((U) throws -> Any) throws -> Any) throws -> Any {
+    let key = DefinitionKey(type: aType, typeOfArguments: U.self, tag: tag?.dependencyTag)
+    
+    return try inContext(key:key, injectedInType: context?.resolvingType) {
+      try self._resolve(key: key, builder: { definition in
+        try builder(definition.weakFactory)
+      })
+    }
+  }
+  
+  /// Lookup definition by the key and use it to resolve instance. Fallback to the key with `nil` tag.
+  func _resolve<T>(key aKey: DefinitionKey, builder: (_Definition) throws -> T) throws -> T {
+    guard let matching = self.definition(matching: aKey) else {
+      do {
+        return try autowire(key: aKey)
+      } catch {
+        if let resolved = collaboratingResolve(key: aKey, builder: builder) {
+          return resolved
+        } else {
+          throw error
+        }
+      }
+    }
+    
+    let (key, definition) = matching
+    
+    //first search for already resolved instance for this type or any of forwarding types
+    if let previouslyResolved: T = previouslyResolved(for: definition, key: key) {
+      log(level: .Verbose, "Reusing previously resolved instance \(previouslyResolved)")
+      return previouslyResolved
+    }
+    
+    log(level: .Verbose, context)
+    var resolvedInstance = try builder(definition)
+    
+    /*
+     Strongly-typed `resolve(tag:builder:)` calls weakly-typed `resolve(_:tag:builder:)`,
+     so `T` will be `Any` at runtime, erasing type information when this method returns.
+     When we try to cast result of `Any` to generic type T Swift fails to cast it.
+     The same happens in the following code snippet:
+     
+     let optService: Service? = ServiceImp()
+     let anyService: Any = optService
+     let service: Service = anyService as! Service
+     
+     That happens because when Optional is casted to Any Swift can not implicitly unwrap it with as operator.
+     As a workaround we detect boxing here and unwrap it so that we return not a box, but wrapped instance.
+     */
+    if let box = resolvedInstance as? BoxType, let unboxed = box.unboxed as? T {
+      resolvedInstance = unboxed
+    }
+    
+    //when builder calls factory it will in turn resolve sub-dependencies (if there are any)
+    //when it returns instance that we try to resolve here can be already resolved
+    //so we return it, throwing away instance created by previous call to builder
+    if let previouslyResolved: T = previouslyResolved(for: definition, key: key) {
+      log(level: .Verbose, "Reusing previously resolved instance \(previouslyResolved)")
+      return previouslyResolved
+    }
+    
+    resolvedInstances[key: key, inScope: definition.scope, context: context] = resolvedInstance
+    
+    if let resolvable = resolvedInstance as? Resolvable {
+      resolvedInstances.resolvableInstances.append(resolvable)
+      resolvable.resolveDependencies(self)
+    }
+    
+    try autoInjectProperties(in: resolvedInstance)
+    try definition.resolveProperties(of: resolvedInstance, container: self)
+    
+    log(level: .Verbose, "Resolved type \(key.type) with \(resolvedInstance)")
+    return resolvedInstance
+  }
+  
+  private func previouslyResolved<T>(for definition: _Definition, key: DefinitionKey) -> T? {
+    //first check if exact key was already resolved
+    if let previouslyResolved = resolvedInstances[key: key, inScope: definition.scope, context: context] as? T {
+      return previouslyResolved
+    }
+    //then check if any related type was already resolved
+    let keys = definition.implementingTypes.map({
+      DefinitionKey(type: $0, typeOfArguments: key.typeOfArguments, tag: key.tag)
+    })
+    for key in keys {
+      if let previouslyResolved = resolvedInstances[key: key, inScope: definition.scope, context: context] as? T {
+        return previouslyResolved
+      }
+    }
+    return nil
+  }
+  
+  /// Searches for definition that matches provided key
+  func definition(matching key: DefinitionKey) -> KeyDefinitionPair? {
+    if let definition = (self.definitions[key] ?? self.definitions[key.tagged(with: nil)]) {
+      return (key, definition)
+    }
+    
+    //if no definition registered for exact type try to find type-forwarding definition that can resolve the type
+    //that will actually happen only when resolving optionals
+    if definitions.filter({ $0.0.type == key.type }).isEmpty {
+      return typeForwardingDefinition(forKey: key)
+    }
+    return nil
+  }
+  
+}
+
+///Pool to hold instances, created during call to `resolve()`.
+///Before `resolve()` returns pool is drained.
+class ResolvedInstances {
+  
+  var resolvedInstances = [DefinitionKey: Any]()
+  var resolvableInstances = [Resolvable]()
+  
+  //singletons are stored using reference type wrapper to be able to share them between containers
+  var sharedSingletonsBox = Box<[DefinitionKey: Any]>([:])
+  var sharedSingletons: [DefinitionKey: Any] {
+    get { return sharedSingletonsBox.unboxed }
+    set { sharedSingletonsBox.unboxed = newValue }
+  }
+  var singletons = [DefinitionKey: Any]()
+  
+  var sharedWeakSingletonsBox = Box<[DefinitionKey: Any]>([:])
+  var sharedWeakSingletons: [DefinitionKey: Any] {
+    get { return sharedWeakSingletonsBox.unboxed }
+    set { sharedWeakSingletonsBox.unboxed = newValue }
+  }
+  var weakSingletons = [DefinitionKey: Any]()
+  
+  subscript(key key: DefinitionKey, inScope scope: ComponentScope, context context: DependencyContainer.Context) -> Any? {
+    get {
+      switch scope {
+      case .singleton, .eagerSingleton:
+        return context.inCollaboration ? sharedSingletons[key] : singletons[key]
+      case .weakSingleton:
+        let singletons = context.inCollaboration ? sharedWeakSingletons : weakSingletons
+        if let boxed = singletons[key] as? WeakBoxType { return boxed.unboxed }
+        else { return singletons[key] }
+      case .shared:
+        return resolvedInstances[key]
+      case .unique:
+        return nil
+      }
+    }
+    set {
+      switch scope {
+      case .singleton, .eagerSingleton:
+        sharedSingletons[key] = newValue
+        singletons[key] = newValue
+      case .weakSingleton:
+        sharedWeakSingletons[key] = newValue
+        weakSingletons[key] = newValue
+      case .shared:
+        resolvedInstances[key] = newValue
+      case .unique:
+        break
+      }
+    }
+  }
+  
+}
+
+//MARK: - Resolvable
+
+/// Resolvable protocol provides some extension points for resolving dependencies with property injection.
+public protocol Resolvable {
+  /// This method will be called right after instance is created by the container.
+  func resolveDependencies(_ container: DependencyContainer)
+  /// This method will be called when all dependencies of the instance are resolved.
+  /// When resolving objects graph the last resolved instance will receive this callback first.
+  func didResolveDependencies()
+}
+
+extension Resolvable {
+  func resolveDependencies(_ container: DependencyContainer) {}
+  func didResolveDependencies() {}
+}
@@ -22,10 +22,95 @@
 // THE SOFTWARE.
 //

-// MARK: - Register/resolve dependencies with runtime arguments
-
 extension DependencyContainer {
  
+  /**
+   Register factory for type `T` and associate it with an optional tag.
+   
+   - parameters:
+      - scope: The scope to use for instance created by the factory. Default value is `Shared`.
+      - type: Type to register definition for. Default value is return value of factory.
+      - tag: The arbitrary tag to associate this factory with. Pass `nil` to associate with any tag. Default value is `nil`.
+      - factory: The factory that produces instance of `type`. Will be used to resolve instances of `type`.
+   
+   - returns: A registered definition.
+   
+   - note: You should cast the factory return type to the protocol you want to register it for
+           (unless you want to register concrete type) or provide `type` parameter.
+   
+   - seealso: `Definition`, `ComponentScope`, `DependencyTagConvertible`
+   
+   **Example**:
+   ```swift
+   //Register ServiceImp as Service
+   container.register { ServiceImp() as Service }
+   
+   //Register ServiceImp as Service named by "service"
+   container.register(tag: "service") { ServiceImp() as Service }
+   
+   //Register unique ServiceImp as Service
+   container.register(.unique) { ServiceImp() as Service }
+   
+   //Register ClientImp as Client and resolve it's service dependency
+   container.register { try ClientImp(service: container.resolve() as Service) as Client }
+   
+   //Register ServiceImp as concrete type
+   container.register { ServiceImp() }
+   container.register(factory: ServiceImp.init)
+   
+   //Register ServiceImp as Service
+   container.register(Service.self, factory: ServiceImp.init)
+   
+   //Register ClientImp as Client
+   container.register(Client.self, factory: ClientImp.init(service:))
+   ```
+   */
+  @discardableResult public func register<T>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: DependencyTagConvertible? = nil, factory: @escaping (()) throws -> T) -> Definition<T, ()> {
+    let definition = DefinitionBuilder<T, ()> {
+      $0.scope = scope
+      $0.factory = factory
+      }.build()
+    register(definition, tag: tag)
+    return definition
+  }
+  
+  /**
+   Register generic factory and auto-wiring factory and associate it with an optional tag.
+   
+   - parameters:
+      - tag: The arbitrary tag to associate this factory with. Pass `nil` to associate with any tag. Default value is `nil`.
+      - scope: The scope to use for instance created by the factory.
+      - factory: The factory to register.
+      - numberOfArguments: The number of factory arguments. Will be used on auto-wiring to sort definitions.
+      - autoWiringFactory: The factory to be used on auto-wiring to resolve component.
+   
+   - returns: A registered definition.
+   
+   - note: You _should not_ call this method directly, instead call any of other `register` methods.
+           You _should_ use this method only to register dependency with more runtime arguments
+           than _Dip_ supports (currently it's up to six) like in the following example:
+   
+   ```swift
+   public func register<T, A, B, C, ...>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: Tag? = nil, factory: (A, B, C, ...) throws -> T) -> Definition<T, (A, B, C, ...)> {
+     return register(scope: scope, type: type, tag: tag, factory: factory, numberOfArguments: ...) { container, tag in
+       try factory(container.resolve(tag: tag), ...)
+     }
+   }
+   ```
+   
+   Though before you do so you should probably review your design and try to reduce number of depnedencies.
+   */
+  public func register<T, U>(scope: ComponentScope, type: T.Type, tag: DependencyTagConvertible?, factory: @escaping (U) throws -> T, numberOfArguments: Int, autoWiringFactory: @escaping (DependencyContainer, Tag?) throws -> T) -> Definition<T, U> {
+    let definition = DefinitionBuilder<T, U> {
+      $0.scope = scope
+      $0.factory = factory
+      $0.numberOfArguments = numberOfArguments
+      $0.autoWiringFactory = autoWiringFactory
+      }.build()
+    register(definition, tag: tag)
+    return definition
+  }
+  
  // MARK: 1 Runtime Argument
  
  /**
@@ -33,19 +118,19 @@ extension DependencyContainer {

  - note: You can have several factories with different number or types of arguments registered for same type,
          optionally associated with some tags. When container resolves that type it matches the type,
-          __number__, __types__ and __order__ of runtime arguments and optional tag that you pass to `resolve(tag:withArguments:)` method.
+          __number__, __types__ and __order__ of runtime arguments and optional tag that you pass to `resolve(tag:arguments:)` method.

  - parameters:
    - tag: The arbitrary tag to associate this factory with. Pass `nil` to associate with any tag. Default value is `nil`.
-    - scope: The scope to use for this component. Default value is `.Unique`.
+    - scope: The scope to use for this component. Default value is `Shared`.
    - factory: The factory to register.
  
-  - seealso: `registerFactory(tag:scope:factory:)`
+  - seealso: `register(_:type:tag:factory:)`
  */
-  public func register<T, A>(scope: ComponentScope = .Unique, tag: DependencyTagConvertible? = nil, factory: (A) throws -> T) -> DefinitionOf<T, (A) throws -> T> {
-    return registerFactory(tag: tag, scope: scope, factory: factory, numberOfArguments: 1) { container, tag in try factory(container.resolve(tag: tag)) }
+  @discardableResult public func register<T, A>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: DependencyTagConvertible? = nil, factory: @escaping ((A)) throws -> T) -> Definition<T, A> {
+    return register(scope: scope, type: type, tag: tag, factory: factory, numberOfArguments: 1) { container, tag in try factory(container.resolve(tag: tag)) }
  }
-  
+
  /**
   Resolve type `T` using one runtime argument.
   
@@ -68,167 +153,101 @@ extension DependencyContainer {

   - returns: An instance of type `T`.

-   - seealso: `register(tag:_:factory:)`, `resolve(tag:builder:)`
+   - seealso: `register(_:type:tag:factory:)`, `resolve(tag:builder:)`
   */
-  public func resolve<T, A>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A) throws -> T {
+  public func resolve<T, A>(tag: DependencyTagConvertible? = nil, arguments arg1: A) throws -> T {
    return try resolve(tag: tag) { factory in try factory(arg1) }
  }

-  ///- seealso: `resolve(_:tag:)`, `resolve(tag:withArguments:)`
-  public func resolve<A>(type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A) throws -> Any {
+  ///- seealso: `resolve(_:tag:)`, `resolve(tag:arguments:)`
+  public func resolve<A>(_ type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A) throws -> Any {
    return try resolve(type, tag: tag) { factory in try factory(arg1) }
  }

  // MARK: 2 Runtime Arguments
  
-  /// - seealso: `register(tag:scope:factory:)`
-  public func register<T, A, B>(scope: ComponentScope = .Unique, tag: DependencyTagConvertible? = nil, factory: (A, B) throws -> T) -> DefinitionOf<T, (A, B) throws -> T> {
-    return registerFactory(tag: tag, scope: scope, factory: factory, numberOfArguments: 2) { container, tag in try factory(container.resolve(tag: tag), container.resolve(tag: tag)) }
+  /// - seealso: `register(_:type:tag:factory:)`
+  @discardableResult public func register<T, A, B>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: DependencyTagConvertible? = nil, factory: @escaping ((A, B)
+    ) throws -> T) -> Definition<T, (A, B)> {
+    return register(scope: scope, type: type, tag: tag, factory: factory, numberOfArguments: 2) { container, tag in try factory((container.resolve(tag: tag), container.resolve(tag: tag))) }
+  }
+
+  /// - seealso: `resolve(tag:arguments:)`
+  public func resolve<T, A, B>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B) throws -> T {
+    return try resolve(T.self, tag: tag) { factory in try factory((arg1, arg2)) } as! T
  }
  
-  /// - seealso: `resolve(tag:withArguments:)`
-  public func resolve<T, A, B>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2) }
-  }
-  
-  ///- seealso: `resolve(_:tag:)`, `resolve(tag:withArguments:)`
-  public func resolve<A, B>(type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B) throws -> Any {
+  ///- seealso: `resolve(_:tag:)`, `resolve(tag:arguments:)`
+  public func resolve<A, B>(_ type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B) throws -> Any {
    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2)) }
  }
  
  // MARK: 3 Runtime Arguments
  
-  /// - seealso: `register(tag:scope:factory:)`
-  public func register<T, A, B, C>(scope: ComponentScope = .Unique, tag: DependencyTagConvertible? = nil, factory: (A, B, C) throws -> T) -> DefinitionOf<T, (A, B, C) throws -> T> {
-    return registerFactory(tag: tag, scope: scope, factory: factory, numberOfArguments: 3)  { container, tag in try factory(container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag)) }
+  /// - seealso: `register(_:type:tag:factory:)`
+  @discardableResult public func register<T, A, B, C>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: DependencyTagConvertible? = nil, factory: @escaping ((A, B, C)) throws -> T) -> Definition<T, (A, B, C)> {
+    return register(scope: scope, type: type, tag: tag, factory: factory, numberOfArguments: 3)  { container, tag in try factory((container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag))) }
+  }
+
+  /// - seealso: `resolve(tag:arguments:)`
+  public func resolve<T, A, B, C>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C) throws -> T {
+    return try resolve(T.self, tag: tag) { factory in try factory((arg1, arg2, arg3)) } as! T
  }
  
-  /// - seealso: `resolve(tag:withArguments:)`
-  public func resolve<T, A, B, C>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3) }
-  }
-  
-  ///- seealso: `resolve(_:tag:)`, `resolve(tag:withArguments:)`
-  public func resolve<A, B, C>(type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C) throws -> Any {
+  ///- seealso: `resolve(_:tag:)`, `resolve(tag:arguments:)`
+  public func resolve<A, B, C>(_ type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C) throws -> Any {
    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2, arg3)) }
  }

  // MARK: 4 Runtime Arguments
  
-  /// - seealso: `register(tag:scope:factory:)`
-  public func register<T, A, B, C, D>(scope: ComponentScope = .Unique, tag: DependencyTagConvertible? = nil, factory: (A, B, C, D) throws -> T) -> DefinitionOf<T, (A, B, C, D) throws -> T> {
-    return registerFactory(tag: tag, scope: scope, factory: factory, numberOfArguments: 4) { container, tag in try factory(container.resolve(tag: tag),  container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag)) }
-  }
-  
-  /// - seealso: `resolve(tag:withArguments:)`
-  public func resolve<T, A, B, C, D>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4) }
+  /// - seealso: `register(_:type:tag:factory:)`
+  @discardableResult public func register<T, A, B, C, D>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: DependencyTagConvertible? = nil, factory: @escaping ((A, B, C, D)) throws -> T) -> Definition<T, (A, B, C, D)> {
+    return register(scope: scope, type: type, tag: tag, factory: factory, numberOfArguments: 4) { container, tag in try factory((container.resolve(tag: tag),  container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag))) }
  }

-  /// - seealso: `resolve(_:tag:)`, `resolve(tag:withArguments:)`
-  public func resolve<A, B, C, D>(type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> Any {
+  /// - seealso: `resolve(tag:arguments:)`
+  public func resolve<T, A, B, C, D>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> T {
+    return try resolve(T.self, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4)) } as! T
+  }
+
+  /// - seealso: `resolve(_:tag:)`, `resolve(tag:arguments:)`
+  public func resolve<A, B, C, D>(_ type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> Any {
    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4)) }
  }

  // MARK: 5 Runtime Arguments
  
-  /// - seealso: `register(tag:scope:factory:)`
-  public func register<T, A, B, C, D, E>(scope: ComponentScope = .Unique, tag: DependencyTagConvertible? = nil, factory: (A, B, C, D, E) throws -> T) -> DefinitionOf<T, (A, B, C, D, E) throws -> T> {
-    return registerFactory(tag: tag, scope: scope, factory: factory, numberOfArguments: 5) { container, tag in try factory(container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag)) }
-  }
-  
-  /// - seealso: `resolve(tag:withArguments:)`
-  public func resolve<T, A, B, C, D, E>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4, arg5) }
+  /// - seealso: `register(_:type:tag:factory:)`
+  @discardableResult public func register<T, A, B, C, D, E>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: DependencyTagConvertible? = nil, factory: @escaping ((A, B, C, D, E)) throws -> T) -> Definition<T, (A, B, C, D, E)> {
+    return register(scope: scope, type: type, tag: tag, factory: factory, numberOfArguments: 5) { container, tag in try factory((container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag))) }
  }

-  ///- seealso: `resolve(_:tag:)`, `resolve(tag:withArguments:)`
-  public func resolve<A, B, C, D, E>(type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> Any {
+  /// - seealso: `resolve(tag:arguments:)`
+  public func resolve<T, A, B, C, D, E>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> T {
+    return try resolve(T.self, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4, arg5)) } as! T
+  }
+
+  ///- seealso: `resolve(_:tag:)`, `resolve(tag:arguments:)`
+  public func resolve<A, B, C, D, E>(_ type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> Any {
    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4, arg5)) }
  }

  // MARK: 6 Runtime Arguments
  
-  /// - seealso: `register(tag:scope:factory:)`
-  public func register<T, A, B, C, D, E, F>(scope: ComponentScope = .Unique, tag: DependencyTagConvertible? = nil, factory: (A, B, C, D, E, F) throws -> T) -> DefinitionOf<T, (A, B, C, D, E, F) throws -> T> {
-    return registerFactory(tag: tag, scope: scope, factory: factory, numberOfArguments: 6) { container, tag in try factory(container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag)) }
-  }
-  
-  /// - seealso: `resolve(tag:withArguments:)`
-  public func resolve<T, A, B, C, D, E, F>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4, arg5, arg6) }
+  /// - seealso: `register(_:type:tag:factory:)`
+  @discardableResult public func register<T, A, B, C, D, E, F>(_ scope: ComponentScope = .shared, type: T.Type = T.self, tag: DependencyTagConvertible? = nil, factory: @escaping ((A, B, C, D, E, F)) throws -> T) -> Definition<T, (A, B, C, D, E, F)> {
+    return register(scope: scope, type: type, tag: tag, factory: factory, numberOfArguments: 6) { container, tag in try factory((container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag), container.resolve(tag: tag))) }
  }

-  /// - seealso: `resolve(_:tag:)`, `resolve(tag:withArguments:)`
-  public func resolve<A, B, C, D, E, F>(type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> Any {
+  /// - seealso: `resolve(tag:arguments:)`
+  public func resolve<T, A, B, C, D, E, F>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> T {
+    return try resolve(T.self, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4, arg5, arg6)) } as! T
+  }
+
+  /// - seealso: `resolve(_:tag:)`, `resolve(tag:arguments:)`
+  public func resolve<A, B, C, D, E, F>(_ type: Any.Type, tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> Any {
    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4, arg5, arg6)) }
  }

 }
-
-//MARK - Deprecated methods
-
-extension DependencyContainer {
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(tag:arguments:) instead")
-  public func resolve<T, A>(tag tag: DependencyTagConvertible? = nil, withArguments arg1: A) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(_:tag:arguments:) instead")
-  public func resolve<A>(type: Any.Type, tag: DependencyTagConvertible? = nil, withArguments arg1: A) throws -> Any {
-    return try resolve(type, tag: tag) { factory in try factory(arg1) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(tag:arguments:_:) instead")
-  public func resolve<T, A, B>(tag tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(_:tag:arguments:_:) instead")
-  public func resolve<A, B>(type: Any.Type, tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B) throws -> Any {
-    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2)) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(tag:arguments:_:_:) instead")
-  public func resolve<T, A, B, C>(tag tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B, _ arg3: C) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(_:tag:arguments:_:_:) instead")
-  public func resolve<A, B, C>(type: Any.Type, tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B, _ arg3: C) throws -> Any {
-    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2, arg3)) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(tag:arguments:_:_:_:) instead")
-  public func resolve<T, A, B, C, D>(tag tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(_:tag:arguments:_:_:_:) instead")
-  public func resolve<A, B, C, D>(type: Any.Type, tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> Any {
-    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4)) }
-  }
-
-  @available(*, deprecated=4.6.1, message="Use resolve(tag:arguments:_:_:_:_:) instead")
-  public func resolve<T, A, B, C, D, E>(tag tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4, arg5) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(_: tag:arguments:_:_:_:_:) instead")
-  public func resolve<A, B, C, D, E>(type: Any.Type, tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> Any {
-    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4, arg5)) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(tag:arguments:_:_:_:_:_:) instead")
-  public func resolve<T, A, B, C, D, E, F>(tag tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> T {
-    return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4, arg5, arg6) }
-  }
-  
-  @available(*, deprecated=4.6.1, message="Use resolve(_:tag:arguments:_:_:_:_:_:) instead")
-  public func resolve<A, B, C, D, E, F>(type: Any.Type, tag: DependencyTagConvertible? = nil, withArguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> Any {
-    return try resolve(type, tag: tag) { factory in try factory((arg1, arg2, arg3, arg4, arg5, arg6)) }
-  }
-  
-}
-
@@ -22,27 +22,78 @@
 // THE SOFTWARE.
 //

-protocol TypeForwardingDefinition: Definition {
+protocol TypeForwardingDefinition: DefinitionType {
  var implementingTypes: [Any.Type] { get }
-  func doesImplements(type: Any.Type) -> Bool
+  func doesImplements(type aType: Any.Type) -> Bool
 }

-extension DependencyContainer {
+extension Definition {
  
  /**
   Registers definition for passed type.
   
-   If instance created by definition factory does not implement registered type
+   If instance created by factory of definition on which method is called 
+   does not implement type passed in a `type` parameter,
   container will throw `DipError.DefinitionNotFound` error when trying to resolve that type.
   
   - parameters:
-      - definition: Definition to register
      - type: Type to register definition for
      - tag: Optional tag to associate definition with. Default is `nil`.
   
-   - returns: New definition for passed type.
+   - returns: definition on which `implements` was called
   */
-  public func register<T, U, F>(definition: DefinitionOf<T, U throws -> T>, type: F.Type, tag: DependencyTagConvertible? = nil) -> DefinitionOf<F, U throws -> F> {
+  @discardableResult public func implements<F>(_ type: F.Type, tag: DependencyTagConvertible? = nil) -> Definition {
+    precondition(container != nil, "Definition should be registered in the container.")
+
+    container!.register(self, type: type, tag: tag)
+    return self
+  }
+  
+  /**
+   Registers definition for passed type.
+   
+   If instance created by factory of definition on which method is called
+   does not implement type passed in a `type` parameter,
+   container will throw `DipError.DefinitionNotFound` error when trying to resolve that type.
+   
+   - parameters:
+      - type: Type to register definition for
+      - tag: Optional tag to associate definition with. Default is `nil`.
+      - resolvingProperties: Optional block to be called to resolve instance property dependencies
+   
+   - returns: definition on which `implements` was called
+   */
+  @discardableResult public func implements<F>(_ type: F.Type, tag: DependencyTagConvertible? = nil, resolvingProperties: @escaping (DependencyContainer, F) throws -> ()) -> Definition {
+    precondition(container != nil, "Definition should be registered in the container.")
+
+    let forwardDefinition = container!.register(self, type: type, tag: tag)
+    forwardDefinition.resolvingProperties(resolvingProperties)
+    return self
+  }
+
+  ///Registers definition for types passed as parameters
+  @discardableResult public func implements<A, B>(_ a: A.Type, _ b: B.Type) -> Definition {
+    return implements(a).implements(b)
+  }
+
+  ///Registers definition for types passed as parameters
+  @discardableResult public func implements<A, B, C>(_ a: A.Type, _ b: B.Type, _ c: C.Type) -> Definition {
+    return implements(a).implements(b).implements(c)
+  }
+
+  ///Registers definition for types passed as parameters
+  @discardableResult public func implements<A, B, C, D>(_ a: A.Type, _ b: B.Type, _ c: C.Type, _ d: D.Type) -> Definition {
+    return implements(a).implements(b).implements(c).implements(d)
+  }
+  
+}
+
+extension DependencyContainer {
+  
+  func _register<T, U, F>(definition aDefinition: Definition<T, U>, type: F.Type, tag: DependencyTagConvertible? = nil) -> Definition<F, U> {
+    let definition = aDefinition
+    precondition(definition.container === self, "Definition should be registered in the container.")
+    
    let key = DefinitionKey(type: F.self, typeOfArguments: U.self)
    
    let forwardDefinition = DefinitionBuilder<F, U> {
@@ -50,38 +101,43 @@ extension DependencyContainer {
      
      let factory = definition.factory
      $0.factory = { [unowned self] in
-        guard let resolved = try factory($0) as? F else {
-          throw DipError.DefinitionNotFound(key: key.tagged(self.context.tag))
+        let resolved = try factory($0)
+        if let resolved = resolved as? F {
+          return resolved
+        }
+        else {
+          throw DipError.invalidType(resolved: resolved, key: key.tagged(with: self.context.tag))
        }
-        return resolved
      }

      $0.numberOfArguments = definition.numberOfArguments
-      $0.autoWiringFactory = definition.autoWiringFactory.map({ autoWiringFactory in
+      $0.autoWiringFactory = definition.autoWiringFactory.map({ factory in
        { [unowned self] in
-          guard let resolved = try autoWiringFactory($0, $1) as? F else {
-            throw DipError.DefinitionNotFound(key: key.tagged(self.context.tag))
+          let resolved = try factory($0, $1)
+          if let resolved = resolved as? F {
+            return resolved
+          }
+          else {
+            throw DipError.invalidType(resolved: resolved, key: key.tagged(with: self.context.tag))
          }
-          return resolved
        }
      })
-
-      $0.forwardsDefinition = definition
+      $0.forwardsTo = definition
      }.build()
    
-    register(forwardDefinition, forTag: tag)
+    register(forwardDefinition, tag: tag)
    return forwardDefinition
  }
  
  /// Searches for definition that forwards requested type
-  func typeForwardingDefinition(key: DefinitionKey) -> KeyDefinitionPair? {
+  func typeForwardingDefinition(forKey key: DefinitionKey) -> KeyDefinitionPair? {
    var forwardingDefinitions = self.definitions.map({ (key: $0.0, definition: $0.1) })
    
-    forwardingDefinitions = filter(forwardingDefinitions, byKeyAndTypeOfArguments: key)
-    forwardingDefinitions = order(forwardingDefinitions, byTag: key.tag)
+    forwardingDefinitions = filter(definitions: forwardingDefinitions, byKey: key, byTypeOfArguments: true)
+    forwardingDefinitions = order(definitions: forwardingDefinitions, byTag: key.tag)

    //we need to carry on original tag
-    return forwardingDefinitions.first.map({ ($0.key.tagged(key.tag), $0.definition) })
+    return forwardingDefinitions.first.map({ ($0.key.tagged(with: key.tag), $0.definition) })
  }
  
 }
@@ -22,16 +22,19 @@
 // THE SOFTWARE.
 //

-public enum LogLevel {
-  case Verbose
-  case Errors
+public enum LogLevel: Int {
  case None
+  case Errors
+  case Verbose
 }
+
 public var logLevel: LogLevel = .Errors

-func log(logLevel: LogLevel, _ message: Any) {
-  guard case logLevel = Dip.logLevel else { return }
-  print(message)
+public var logger: (LogLevel, Any) -> Void = { print($1) }
+
+func log(level logLevel: LogLevel, _ message: Any) {
+  guard logLevel.rawValue <= Dip.logLevel.rawValue else { return }
+  logger(logLevel, message)
 }

 ///Internal protocol used to unwrap optional values.
@@ -41,19 +44,13 @@ protocol BoxType {

 extension Optional: BoxType {
  var unboxed: Any? {
-    switch self {
-    case let .Some(value): return value
-    default: return nil
-    }
+    return self ?? nil
  }
 }

 extension ImplicitlyUnwrappedOptional: BoxType {
  var unboxed: Any? {
-    switch self {
-    case let .Some(value): return value
-    default: return nil
-    }
+    return self ?? nil
  }
 }

@@ -75,7 +72,12 @@ class WeakBox<T>: WeakBoxType {
  }

  init(_ value: T) {
-    guard let value = value as? AnyObject else {
+    #if _runtime(_ObjC)
+      weak var value: AnyObject? = value as AnyObject
+    #else
+      weak var value: AnyObject? = value as? AnyObject
+    #endif
+    guard value != nil else {
      fatalError("Can not store weak reference to not a class instance (\(T.self))")
    }
    self.unboxed = value
@@ -101,7 +103,7 @@ extension Optional {
  }
 }

-#if os(Linux)
+#if !_runtime(_ObjC)
  import Glibc
  class RecursiveLock {
    private var _lock = _initializeRecursiveMutex()
@@ -131,7 +133,7 @@ extension Optional {
  
  extension pthread_mutex_t {
    mutating func lock() {
-      pthread_mutex_trylock(&self)
+      pthread_mutex_lock(&self)
    }
    mutating func unlock() {
      pthread_mutex_unlock(&self)
@@ -26,13 +26,13 @@ import XCTest
@testable import Dip

 private protocol Server: class {
-  weak var client: Client? {get}
-  var anotherClient: Client? {get set}
+  weak var client: Client! {get}
+  var anotherClient: Client! {get set}
 }

 private protocol Client: class {
  var server: Server? {get}
-  var anotherServer: Server? {get set}
+  var anotherServer: Server! {get set}
 }

 private class ServerImp: Server {
@@ -40,11 +40,12 @@ private class ServerImp: Server {
  var _client = InjectedWeak<Client>() { _ in
    AutoInjectionTests.clientDidInjectCalled = true
  }
-  var client: Client? {
+
+  var client: Client! {
    return _client.value
  }
  
-  weak var anotherClient: Client?
+  weak var anotherClient: Client!
  
  weak var _optionalProperty = InjectedWeak<AnyObject>(required: false)
 }
@@ -54,11 +55,12 @@ private class ClientImp: Client {
  var _server = Injected<Server>() { _ in
    AutoInjectionTests.serverDidInjectCalled = true
  }
+
  var server: Server? {
    return _server.value
  }

-  var anotherServer: Server?
+  var anotherServer: Server!
  
  var _optionalProperty = Injected<AnyObject>(required: false)
  
@@ -91,10 +93,10 @@ class AutoInjectionTests: XCTestCase {

  let container = DependencyContainer()
  
-  #if os(Linux)
-  static var allTests: [(String, AutoInjectionTests -> () throws -> Void)] {
+  static var allTests = {
    return [
      ("testThatItResolvesAutoInjectedDependencies", testThatItResolvesAutoInjectedDependencies),
+      ("testThatItResolvesInheritedDependencies", testThatItResolvesInheritedDependencies),
      ("testThatItCanSetInjectedProperty", testThatItCanSetInjectedProperty),
      ("testThatItThrowsErrorIfFailsToAutoInjectDependency", testThatItThrowsErrorIfFailsToAutoInjectDependency),
      ("testThatItResolvesAutoInjectedSingletons", testThatItResolvesAutoInjectedSingletons),
@@ -106,31 +108,45 @@ class AutoInjectionTests: XCTestCase {
      ("testThatNoErrorThrownWhenOptionalPropertiesAreNotAutoInjected", testThatNoErrorThrownWhenOptionalPropertiesAreNotAutoInjected),
      ("testThatItResolvesTaggedAutoInjectedProperties", testThatItResolvesTaggedAutoInjectedProperties),
      ("testThatItPassesTagToAutoInjectedProperty", testThatItPassesTagToAutoInjectedProperty),
-      ("testThatItDoesNotPassTagToAutoInjectedPropertyWithExplicitTag", testThatItDoesNotPassTagToAutoInjectedPropertyWithExplicitTag)
+      ("testThatItDoesNotPassTagToAutoInjectedPropertyWithExplicitTag", testThatItDoesNotPassTagToAutoInjectedPropertyWithExplicitTag),
+      ("testThatItAutoInjectsPropertyWithCollaboratingContainer", testThatItAutoInjectsPropertyWithCollaboratingContainer)
    ]
-  }
+  }()

-  func setUp() {
-    container.reset()
-  }
-  #else
  override func setUp() {
    container.reset()
  }
-  #endif

  func testThatItResolvesAutoInjectedDependencies() {
-    container.register(.Shared) { ServerImp() as Server }
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ServerImp() as Server }
+    container.register { ClientImp() as Client }
    
    let client = try! container.resolve() as Client
    let server = client.server
    XCTAssertTrue(client === server?.client)
  }
  
+  func testThatItResolvesInheritedDependencies() {
+    class ServerImp2: ServerImp {
+      var _client2 = InjectedWeak<Client>() { _ in
+        XCTAssertTrue(AutoInjectionTests.serverDidInjectCalled, "Inherited properties should be resolved first")
+      }
+      var client2: Client? { return _client2.value }
+    }
+
+    container.register { ServerImp2() as Server }
+    container.register { ClientImp() as Client }
+    
+    //when
+    let client = try! container.resolve() as Client
+    let server = client.server as? ServerImp2
+    XCTAssertTrue(client === server?.client)
+    XCTAssertTrue(client === server?.client2)
+  }
+  
  func testThatItCanSetInjectedProperty() {
-    container.register(.Shared) { ServerImp() as Server }
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ServerImp() as Server }
+    container.register { ClientImp() as Client }
    
    let client = (try! container.resolve() as Client) as! ClientImp
    let server = client.server as! ServerImp
@@ -145,15 +161,15 @@ class AutoInjectionTests: XCTestCase {
  }
  
  func testThatItThrowsErrorIfFailsToAutoInjectDependency() {
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ClientImp() as Client }
    
    AssertThrows(expression: try container.resolve() as Client)
  }

  func testThatItResolvesAutoInjectedSingletons() {
    //given
-    container.register(.Singleton) { ServerImp() as Server }
-    container.register(.Singleton) { ClientImp() as Client }
+    container.register(.singleton) { ServerImp() as Server }
+    container.register(.singleton) { ClientImp() as Client }
    
    //when
    let sharedClient = try! container.resolve() as Client
@@ -172,33 +188,33 @@ class AutoInjectionTests: XCTestCase {
    var serverBlockWasCalled = false
    
    //given
-    container.register(.Shared) { ServerImp() as Server }
+    container.register { ServerImp() as Server }
      .resolvingProperties { (container, server) -> () in
        serverBlockWasCalled = true
    }

    var clientBlockWasCalled = false
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ClientImp() as Client }
      .resolvingProperties { (container, client) -> () in
        clientBlockWasCalled = true
    }

    //when
-    try! container.resolve() as Client
+    let _ = try! container.resolve() as Client
    XCTAssertTrue(serverBlockWasCalled)
    
-    try! container.resolve() as Server
+    let _ = try! container.resolve() as Server
    XCTAssertTrue(clientBlockWasCalled)
  }
  
  func testThatItReusesResolvedAutoInjectedInstances() {
    //given
-    container.register(.Shared) { ServerImp() as Server }
+    container.register { ServerImp() as Server }
      .resolvingProperties { (container, server) -> () in
        server.anotherClient = try! container.resolve() as Client
    }

-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ClientImp() as Client }
      .resolvingProperties { (container, client) -> () in
        client.anotherServer = try! container.resolve() as Server
    }
@@ -221,9 +237,9 @@ class AutoInjectionTests: XCTestCase {
  
  func testThatItReusesAutoInjectedInstancesOnNextResolveOrAutoInjection() {
    //given
-    container.register(.Shared) { Obj1() }
-    container.register(.Shared) { Obj2() }
-    container.register(.Shared) { Obj3(obj: try self.container.resolve()) }
+    container.register { Obj1() }
+    container.register { Obj2() }
+    container.register { Obj3(obj: try self.container.resolve()) }
    
    //when
    let obj2 = try! container.resolve() as Obj2
@@ -238,8 +254,8 @@ class AutoInjectionTests: XCTestCase {
  
  func testThatThereIsNoRetainCycleBetweenAutoInjectedCircularDependencies() {
    //given
-    container.register(.Shared) { ServerImp() as Server }
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ServerImp() as Server }
+    container.register { ClientImp() as Client }

    //when
    var client: Client? = try! container.resolve() as Client
@@ -262,11 +278,11 @@ class AutoInjectionTests: XCTestCase {
    AutoInjectionTests.serverDidInjectCalled = false
    
    //given
-    container.register(.Shared) { ServerImp() as Server }
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ServerImp() as Server }
+    container.register { ClientImp() as Client }
    
    //when
-    try! container.resolve() as Client
+    let _ = try! container.resolve() as Client
    
    //then
    XCTAssertTrue(AutoInjectionTests.clientDidInjectCalled)
@@ -275,17 +291,17 @@ class AutoInjectionTests: XCTestCase {
  
  func testThatNoErrorThrownWhenOptionalPropertiesAreNotAutoInjected() {
    //given
-    container.register(.Shared) { ServerImp() as Server }
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ServerImp() as Server }
+    container.register { ClientImp() as Client }

    AssertNoThrow(expression: try container.resolve() as Client, "Container should not throw error if failed to resolve optional auto-injected properties.")
  }
  
  func testThatItResolvesTaggedAutoInjectedProperties() {
    //given
-    container.register(.Shared) { ServerImp() as Server }
-    container.register(tag: "tagged", .Shared) { ServerImp() as Server }
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ServerImp() as Server }
+    container.register(tag: "tagged") { ServerImp() as Server }
+    container.register { ClientImp() as Client }
    
    //when
    let client = try! container.resolve() as Client
@@ -302,9 +318,9 @@ class AutoInjectionTests: XCTestCase {
  
  func testThatItPassesTagToAutoInjectedProperty() {
    //given
-    container.register(.Shared) { ServerImp() as Server }
-    container.register(tag: "tagged", .Shared) { ServerImp() as Server }
-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ServerImp() as Server }
+    container.register(tag: "tagged") { ServerImp() as Server }
+    container.register { ClientImp() as Client }
    
    //when
    let client = try! container.resolve(tag: "tagged") as Client
@@ -319,10 +335,10 @@ class AutoInjectionTests: XCTestCase {
  
  func testThatItDoesNotPassTagToAutoInjectedPropertyWithExplicitTag() {
    //given
-    container.register(.Shared) { ServerImp() as Server }
-    container.register(tag: "tagged", .Shared) { ServerImp() as Server }
+    container.register { ServerImp() as Server }
+    container.register(tag: "tagged") { ServerImp() as Server }

-    container.register(.Shared) { ClientImp() as Client }
+    container.register { ClientImp() as Client }
      .resolvingProperties { (container, client) -> () in
        client.anotherServer = try! container.resolve() as Server
    }
@@ -346,8 +362,8 @@ class AutoInjectionTests: XCTestCase {
  
  func testThatItAutoInjectsPropertyWithCollaboratingContainer() {
    let collaborator = DependencyContainer()
-    collaborator.register(.Shared) { ServerImp() as Server }
-    container.register(.Shared) { ClientImp() as Client }
+    collaborator.register { ServerImp() as Server }
+    container.register { ClientImp() as Client }
    
    container.collaborate(with: collaborator)
    collaborator.collaborate(with: container)
@@ -50,13 +50,14 @@ class AutoWiringTests: XCTestCase {
  
  let container = DependencyContainer()

-  #if os(Linux)
-  static var allTests: [(String, AutoWiringTests -> () throws -> Void)] {
+  static var allTests = {
    return [
      ("testThatItCanResolveWithAutoWiring", testThatItCanResolveWithAutoWiring),
      ("testThatItUsesAutoWireFactoryWithMostNumberOfArguments", testThatItUsesAutoWireFactoryWithMostNumberOfArguments),
      ("testThatItThrowsAmbiguityErrorWhenUsingAutoWire", testThatItThrowsAmbiguityErrorWhenUsingAutoWire),
-      ("testThatItFirstTriesToUseTaggedFactoriesWhenUsingAutoWire", testThatItFirstTriesToUseTaggedFactoriesWhenUsingAutoWire),
+      ("testThatItUsesAutoWireFactoryWithMostNumberOfArguments", testThatItUsesAutoWireFactoryWithMostNumberOfArguments),
+      ("testThatItPrefersTaggedFactoryWithDifferentNumberOfArgumentsWhenUsingAutoWire", testThatItPrefersTaggedFactoryWithDifferentNumberOfArgumentsWhenUsingAutoWire),
+      ("testThatItPrefersTaggedFactoryWithDifferentTypesOfArgumentsWhenUsingAutoWire", testThatItPrefersTaggedFactoryWithDifferentTypesOfArgumentsWhenUsingAutoWire),
      ("testThatItFallbackToNotTaggedFactoryWhenUsingAutoWire", testThatItFallbackToNotTaggedFactoryWhenUsingAutoWire),
      ("testThatItDoesNotTryToUseAutoWiringWhenCallingResolveWithArguments", testThatItDoesNotTryToUseAutoWiringWhenCallingResolveWithArguments),
      ("testThatItDoesNotUseAutoWiringWhenFailedToResolveLowLevelDependency", testThatItDoesNotUseAutoWiringWhenFailedToResolveLowLevelDependency),
@@ -71,23 +72,18 @@ class AutoWiringTests: XCTestCase {
      ("testThatItUsesTagToResolveDependenciesWithAutoWiringWith6Arguments", testThatItUsesTagToResolveDependenciesWithAutoWiringWith6Arguments),
      ("testThatItCanAutoWireOptional", testThatItCanAutoWireOptional)
    ]
-  }
+  }()

-  func setUp() {
-    container.reset()
-  }
-  #else
  override func setUp() {
    container.reset()
  }
-  #endif

  func testThatItCanResolveWithAutoWiring() {
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
    
    //when
    let client = try! container.resolve() as AutoWiredClient
@@ -109,19 +105,19 @@ class AutoWiringTests: XCTestCase {
    //given
    
    //1 arg
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
    //1 arg
-    container.register(.Shared) { AutoWiredClientImp(service1: try self.container.resolve(), service2: $0) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: try self.container.resolve(), service2: $0) as AutoWiredClient }
    
    //2 args
    var factoryWithMostNumberOfArgumentsCalled = false
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
-      .resolvingProperties { _ in
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+      .resolvingProperties { _,_  in
        factoryWithMostNumberOfArgumentsCalled = true
    }
    
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    //when
    let _ = try! container.resolve() as AutoWiredClient
@@ -134,46 +130,46 @@ class AutoWiringTests: XCTestCase {
    //given
    
    //1 arg
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
    //1 arg
-    container.register(.Shared) { AutoWiredClientImp(service1: try self.container.resolve(), service2: $0) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: try self.container.resolve(), service2: $0) as AutoWiredClient }
    
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    //when
    AssertThrows(expression: try container.resolve() as AutoWiredClient) { error -> Bool in
      switch error {
-      case let DipError.AutoWiringFailed(_, error):
-        if case DipError.AmbiguousDefinitions = error { return true }
+      case let DipError.autoWiringFailed(_, error):
+        if case DipError.ambiguousDefinitions = error { return true }
        else { return false }
      default: return false
      }
    }
  }
  
-  func testThatItFirstTriesToUseTaggedFactoriesWhenUsingAutoWire() {
+  func testThatItPrefersTaggedFactoryWithDifferentNumberOfArgumentsWhenUsingAutoWire() {
    //given
    
    //1 arg
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
    //1 arg
-    container.register(.Shared) { AutoWiredClientImp(service1: try self.container.resolve(), service2: $0) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: try self.container.resolve(), service2: $0) as AutoWiredClient }
    
    //2 args
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
    
    //1 arg tagged
    var taggedFactoryWithMostNumberOfArgumentsCalled = false
-    container.register(tag: "tag", .Shared) { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
+    container.register(tag: "tag") { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
    
    //2 arg tagged
-    container.register(tag: "tag", .Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }.resolvingProperties { _ in
+    container.register(tag: "tag") { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }.resolvingProperties { _,_  in
      taggedFactoryWithMostNumberOfArgumentsCalled = true
    }

-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register() { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    //when
    let _ = try! container.resolve(tag: "tag") as AutoWiredClient
@@ -182,20 +178,45 @@ class AutoWiringTests: XCTestCase {
    XCTAssertTrue(taggedFactoryWithMostNumberOfArgumentsCalled)
  }
  
+  func testThatItPrefersTaggedFactoryWithDifferentTypesOfArgumentsWhenUsingAutoWire() {
+    //given
+    
+    //1 arg
+    container.register { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
+    
+    //2 args
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    
+    //1 arg tagged
+    var taggedFactoryCalled = false
+    container.register(tag: "tag") { AutoWiredClientImp(service1: try self.container.resolve(), service2: $0) as AutoWiredClient }.resolvingProperties { _,_  in
+      taggedFactoryCalled = true
+    }
+    
+    container.register() { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
+    
+    //when
+    let _ = try! container.resolve(tag: "tag") as AutoWiredClient
+    
+    //then
+    XCTAssertTrue(taggedFactoryCalled)
+  }
+  
  func testThatItFallbackToNotTaggedFactoryWhenUsingAutoWire() {
    //given
    
    //1 arg
    var notTaggedFactoryWithMostNumberOfArgumentsCalled = false
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }.resolvingProperties { _ in
+    container.register { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }.resolvingProperties { _,_  in
      notTaggedFactoryWithMostNumberOfArgumentsCalled = true
    }
    
    //1 arg tagged
-    container.register(tag: "tag", .Shared) { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
+    container.register(tag: "tag") { AutoWiredClientImp(service1: $0, service2: try self.container.resolve()) as AutoWiredClient }
    
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    //when
    let _ = try! container.resolve(tag: "other tag") as AutoWiredClient
@@ -206,9 +227,9 @@ class AutoWiringTests: XCTestCase {
  
  func testThatItDoesNotTryToUseAutoWiringWhenCallingResolveWithArguments() {
    //given
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    //when
    let service = try! container.resolve() as Service
@@ -218,24 +239,24 @@ class AutoWiringTests: XCTestCase {
  
  func testThatItDoesNotUseAutoWiringWhenFailedToResolveLowLevelDependency() {
    //given
-    container.register(.Shared) { AutoWiredClientImp() as AutoWiredClient }
+    container.register { AutoWiredClientImp() as AutoWiredClient }
      .resolvingProperties { container, resolved in
        resolved.service1 = try container.resolve() as Service
        resolved.service2 = try container.resolve() as ServiceImp2
        
        //simulate that something goes wrong on the way
-        throw DipError.DefinitionNotFound(key: DefinitionKey(type: ServiceImp1.self, typeOfArguments: Any.self))
+        throw DipError.definitionNotFound(key: DefinitionKey(type: ServiceImp1.self, typeOfArguments: Any.self))
    }
    
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
      .resolvingProperties { container, resolved in
        //auto-wiring should be performed only when definition for type to resolve is not found
        //but not for any other type along the way in the graph
        XCTFail("Auto-wiring should not be performed if instance was actually resolved.")
    }
    
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    //then
    AssertThrows(expression: try container.resolve() as AutoWiredClient,
@@ -245,12 +266,12 @@ class AutoWiringTests: XCTestCase {
  func testThatItReusesInstancesResolvedWithAutoWiringWhenUsingAutoWiringAgain() {
    
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    var anotherInstance: AutoWiredClient?
    
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
      .resolvingProperties { container, _ in
        if anotherInstance == nil {
          anotherInstance = try! container.resolve() as AutoWiredClient
@@ -268,12 +289,12 @@ class AutoWiringTests: XCTestCase {
  func testThatItReusesInstancesResolvedWithoutAutoWiringWhenUsingAutoWiringAgain() {
    
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    var anotherInstance: AutoWiredClient?
    
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
      .resolvingProperties { container, _ in
        if anotherInstance == nil {
          anotherInstance = try! container.resolve() as AutoWiredClient
@@ -293,12 +314,12 @@ class AutoWiringTests: XCTestCase {
  func testThatItReusesInstancesResolvedWithAutoWiringWhenUsingAutoWiringAgainWithTheSameTag() {
    
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    var anotherInstance: AutoWiredClient?
    
-    container.register(tag: "tag", .Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register(tag: "tag") { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
      .resolvingProperties { container, _ in
        if anotherInstance == nil {
          anotherInstance = try! container.resolve(tag: "tag") as AutoWiredClient
@@ -313,15 +334,15 @@ class AutoWiringTests: XCTestCase {
    XCTAssertTrue((resolved as! AutoWiredClientImp) === (anotherInstance as! AutoWiredClientImp))
  }
  
-  func testThatItDoesNotReuseInstancesResolvedWithAutoWiringWhenUsingAutoWiringAgainWithNoTag() {
+  func testThatItDoesNotReuseInstancesResolvedWithAutoWiringWhenUsingAutoWiringAgainWithAnotherTag() {
    
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
    
    var anotherInstance: AutoWiredClient?
    
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
      .resolvingProperties { container, _ in
        if anotherInstance == nil {
          anotherInstance = try! container.resolve() as AutoWiredClient
@@ -338,10 +359,10 @@ class AutoWiringTests: XCTestCase {
  
  func testThatItUsesTagToResolveDependenciesWithAutoWiringWith1Argument() {
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(tag: "tag", .Shared) { ServiceImp2() as Service }
+    container.register { ServiceImp1() as Service }
+    container.register(tag: "tag") { ServiceImp2() as Service }
    
-    container.register(.Shared) { (dep1: Service) -> ServiceImp3 in
+    container.register { (dep1: Service) -> ServiceImp3 in
      XCTAssertTrue(dep1 is ServiceImp2)
      return ServiceImp3()
    }
@@ -352,10 +373,10 @@ class AutoWiringTests: XCTestCase {

  func testThatItUsesTagToResolveDependenciesWithAutoWiringWith2Arguments() {
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(tag: "tag", .Shared) { ServiceImp2() as Service }
+    container.register { ServiceImp1() as Service }
+    container.register(tag: "tag") { ServiceImp2() as Service }
    
-    container.register(.Shared) { (dep1: Service, dep2: Service) -> ServiceImp3 in
+    container.register { (dep1: Service, dep2: Service) -> ServiceImp3 in
      XCTAssertTrue(dep1 is ServiceImp2)
      XCTAssertTrue(dep2 is ServiceImp2)
      return ServiceImp3()
@@ -367,10 +388,10 @@ class AutoWiringTests: XCTestCase {

  func testThatItUsesTagToResolveDependenciesWithAutoWiringWith3Arguments() {
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(tag: "tag", .Shared) { ServiceImp2() as Service }
+    container.register { ServiceImp1() as Service }
+    container.register(tag: "tag") { ServiceImp2() as Service }
    
-    container.register(.Shared) { (dep1: Service, dep2: Service, dep3: Service) -> ServiceImp3 in
+    container.register { (dep1: Service, dep2: Service, dep3: Service) -> ServiceImp3 in
      XCTAssertTrue(dep1 is ServiceImp2)
      XCTAssertTrue(dep2 is ServiceImp2)
      XCTAssertTrue(dep3 is ServiceImp2)
@@ -383,10 +404,10 @@ class AutoWiringTests: XCTestCase {

  func testThatItUsesTagToResolveDependenciesWithAutoWiringWith4Arguments() {
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(tag: "tag", .Shared) { ServiceImp2() as Service }
+    container.register { ServiceImp1() as Service }
+    container.register(tag: "tag") { ServiceImp2() as Service }
    
-    container.register(.Shared) { (dep1: Service, dep2: Service, dep3: Service, dep4: Service) -> ServiceImp3 in
+    container.register { (dep1: Service, dep2: Service, dep3: Service, dep4: Service) -> ServiceImp3 in
      XCTAssertTrue(dep1 is ServiceImp2)
      XCTAssertTrue(dep2 is ServiceImp2)
      XCTAssertTrue(dep3 is ServiceImp2)
@@ -400,10 +421,10 @@ class AutoWiringTests: XCTestCase {

  func testThatItUsesTagToResolveDependenciesWithAutoWiringWith5Arguments() {
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(tag: "tag", .Shared) { ServiceImp2() as Service }
+    container.register { ServiceImp1() as Service }
+    container.register(tag: "tag") { ServiceImp2() as Service }
    
-    container.register(.Shared) { (dep1: Service, dep2: Service, dep3: Service, dep4: Service, dep5: Service) -> ServiceImp3 in
+    container.register { (dep1: Service, dep2: Service, dep3: Service, dep4: Service, dep5: Service) -> ServiceImp3 in
      XCTAssertTrue(dep1 is ServiceImp2)
      XCTAssertTrue(dep2 is ServiceImp2)
      XCTAssertTrue(dep3 is ServiceImp2)
@@ -418,10 +439,10 @@ class AutoWiringTests: XCTestCase {

  func testThatItUsesTagToResolveDependenciesWithAutoWiringWith6Arguments() {
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(tag: "tag", .Shared) { ServiceImp2() as Service }
+    container.register { ServiceImp1() as Service }
+    container.register(tag: "tag") { ServiceImp2() as Service }
    
-    container.register(.Shared) { (dep1: Service, dep2: Service, dep3: Service, dep4: Service, dep5: Service, dep6: Service) -> ServiceImp3 in
+    container.register { (dep1: Service, dep2: Service, dep3: Service, dep4: Service, dep5: Service, dep6: Service) -> ServiceImp3 in
      XCTAssertTrue(dep1 is ServiceImp2)
      XCTAssertTrue(dep2 is ServiceImp2)
      XCTAssertTrue(dep3 is ServiceImp2)
@@ -437,9 +458,9 @@ class AutoWiringTests: XCTestCase {

  func testThatItCanAutoWireOptional() {
    //given
-    container.register(.Shared) { ServiceImp1() as Service }
-    container.register(.Shared) { ServiceImp2() }
-    container.register(.Shared) { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
+    container.register { ServiceImp1() as Service }
+    container.register { ServiceImp2() }
+    container.register { AutoWiredClientImp(service1: $0, service2: $1) as AutoWiredClient }
    
    var resolved: AutoWiredClient?
    //when
@@ -47,10 +47,9 @@ class ComponentScopeTests: XCTestCase {
  
  let container = DependencyContainer()
  
-  #if os(Linux)
-  static var allTests: [(String, ComponentScopeTests -> () throws -> Void)] {
+  static var allTests = {
    return [
-      ("testThatUniqueIsDefaultScope", testThatUniqueIsDefaultScope),
+      ("testThatSharedIsDefaultScope", testThatSharedIsDefaultScope),
      ("testThatScopeCanBeChanged", testThatScopeCanBeChanged),
      ("testThatItResolvesTypeAsNewInstanceForUniqueScope", testThatItResolvesTypeAsNewInstanceForUniqueScope),
      ("testThatItReusesInstanceForSingletonScope", testThatItReusesInstanceForSingletonScope),
@@ -63,28 +62,24 @@ class ComponentScopeTests: XCTestCase {
      ("testThatItDoesNotReuseInstanceInSharedScopeResolvedForNilTag", testThatItDoesNotReuseInstanceInSharedScopeResolvedForNilTagWhenResolvingForAnotherTag),
      ("testThatItReusesInstanceInSharedScopeResolvedForNilTag", testThatItReusesInstanceInSharedScopeResolvedForNilTag),
      ("testThatItReusesResolvedInstanceWhenResolvingOptional", testThatItReusesResolvedInstanceWhenResolvingOptional),
-      ("testThatItHoldsWeakReferenceToWeakSingletonInstance",
-          testThatItHoldsWeakReferenceToWeakSingletonInstance)
+      ("testThatItHoldsWeakReferenceToWeakSingletonInstance", testThatItHoldsWeakReferenceToWeakSingletonInstance),
+      ("testThatItResolvesWeakSingletonAgainAfterItWasReleased", testThatItResolvesWeakSingletonAgainAfterItWasReleased),
+      ("testThatCollaboratingContainersReuseSingletonsResolvedByAnotherContainer", testThatCollaboratingContainersReuseSingletonsResolvedByAnotherContainer)
    ]
-  }
+  }()
  
-  func setUp() {
-    container.reset()
-  }
-  #else
  override func setUp() {
    container.reset()
  }
-  #endif
  
-  func testThatUniqueIsDefaultScope() {
+  func testThatSharedIsDefaultScope() {
    let def = container.register { ServiceImp1() as Service }
-    XCTAssertEqual(def.scope, ComponentScope.Unique)
+    XCTAssertEqual(def.scope, ComponentScope.shared)
  }
  
  func testThatScopeCanBeChanged() {
-    let def = container.register(.Singleton) { ServiceImp1() as Service }
-    XCTAssertEqual(def.scope, ComponentScope.Singleton)
+    let def = container.register(.singleton) { ServiceImp1() as Service }
+    XCTAssertEqual(def.scope, ComponentScope.singleton)
  }
  
  func testThatItResolvesTypeAsNewInstanceForUniqueScope() {
@@ -100,7 +95,7 @@ class ComponentScopeTests: XCTestCase {
  }
  
  func testThatItReusesInstanceForSingletonScope() {
-    func test(scope: ComponentScope, line: UInt = #line) {
+    func test(_ scope: ComponentScope, line: UInt = #line) {
      //given
      container.register(scope) { ServiceImp1() as Service }
      
@@ -112,17 +107,17 @@ class ComponentScopeTests: XCTestCase {
      XCTAssertTrue(service1 === service2, line: line)
    }
    
-    test(.Singleton)
-    test(.WeakSingleton)
-    test(.EagerSingleton)
+    test(.singleton)
+    test(.weakSingleton)
+    test(.eagerSingleton)
  }
  
  func testThatSingletonIsNotReusedAcrossContainers() {
-    func test(scope: ComponentScope, line: UInt = #line) {
+    func test(_ scope: ComponentScope, line: UInt = #line) {
      //given
      let def = container.register(scope) { ServiceImp1() as Service }
      let secondContainer = DependencyContainer()
-      secondContainer.register(def, forTag: nil)
+      secondContainer.register(def, tag: nil)
      
      //when
      let service1 = try! container.resolve() as Service
@@ -132,75 +127,75 @@ class ComponentScopeTests: XCTestCase {
      XCTAssertTrue(service1 !== service2, "Singleton instances should not be reused across containers", line: line)
    }
    
-    test(.Singleton)
-    test(.WeakSingleton)
-    test(.EagerSingleton)
+    test(.singleton)
+    test(.weakSingleton)
+    test(.eagerSingleton)
  }
  
  func testThatSingletonIsReleasedWhenDefinitionIsRemoved() {
-    func test(scope: ComponentScope, line: UInt = #line) {
+    func test(_ scope: ComponentScope, line: UInt = #line) {
      //given
      let def = container.register(scope) { ServiceImp1() as Service }
      let service1 = try! container.resolve() as Service
      
      //when
-      container.remove(def, forTag: nil)
-      container.register(def, forTag: nil)
+      container.remove(def, tag: nil)
+      container.register(def, tag: nil)
      
      //then
      let service2 = try! container.resolve() as Service
      XCTAssertTrue(service1 !== service2, "Singleton instances should be released when definition is removed from the container", line: line)
    }
    
-    test(.Singleton)
-    test(.WeakSingleton)
-    test(.EagerSingleton)
+    test(.singleton)
+    test(.weakSingleton)
+    test(.eagerSingleton)
  }
  
  func testThatSingletonIsReleasedWhenDefinitionIsOverridden() {
-    func test(scope: ComponentScope, line: UInt = #line) {
+    func test(_ scope: ComponentScope, line: UInt = #line) {
      //given
      let def = container.register(scope) { ServiceImp1() as Service }
      let service1 = try! container.resolve() as Service
      
      //when
-      container.register(def, forTag: nil)
+      container.register(def, tag: nil)
      
      //then
      let service2 = try! container.resolve() as Service
      XCTAssertTrue(service1 !== service2, "Singleton instances should be released when definition is overridden", line: line)
    }
    
-    test(.Singleton)
-    test(.WeakSingleton)
-    test(.EagerSingleton)
+    test(.singleton)
+    test(.weakSingleton)
+    test(.eagerSingleton)
  }
  
  func testThatSingletonIsReleasedWhenContainerIsReset() {
-    func test(scope: ComponentScope, line: UInt = #line) {
+    func test(_ scope: ComponentScope, line: UInt = #line) {
      //given
      let def = container.register(scope) { ServiceImp1() as Service }
      let service1 = try! container.resolve() as Service
      
      //when
      container.reset()
-      container.register(def, forTag: nil)
+      container.register(def, tag: nil)
      
      //then
      let service2 = try! container.resolve() as Service
      XCTAssertTrue(service1 !== service2, "Singleton instances should be released when container is reset", line: line)
    }
    
-    test(.Singleton)
-    test(.WeakSingleton)
-    test(.EagerSingleton)
+    test(.singleton)
+    test(.weakSingleton)
+    test(.eagerSingleton)
  }
  
  func testThatItReusesInstanceInSharedScopeDuringResolve() {
    //given
-    container.register(.Shared) { Client(server: try self.container.resolve()) as Client }
+    container.register { Client(server: try self.container.resolve()) as Client }
    
-    container.register(.Shared) { Server() as Server }
+    container.register { Server() as Server }
      .resolvingProperties { container, server in
        server.client = try container.resolve() as Client
    }
@@ -215,8 +210,8 @@ class ComponentScopeTests: XCTestCase {
  
  func testThatItDoesNotReuseInstanceInSharedScopeInNextResolve() {
    //given
-    container.register(.Shared) { Client(server: try self.container.resolve()) as Client }
-    container.register(.Shared) { Server() as Server }
+    container.register { Client(server: try self.container.resolve()) as Client }
+    container.register { Server() as Server }
      .resolvingProperties { container, server in
        server.client = try container.resolve() as Client
    }
@@ -236,7 +231,7 @@ class ComponentScopeTests: XCTestCase {
  func testThatItDoesNotReuseInstanceInSharedScopeResolvedForNilTagWhenResolvingForAnotherTag() {
    //given
    var service2: Service?
-    container.register(.Shared) { ServiceImp1() as Service }
+    container.register { ServiceImp1() as Service }
      .resolvingProperties { (c, _) in
        //when service1 is resolved using this definition due to fallback to nil tag
        service2 = try c.resolve(tag: "service") as Service
@@ -244,7 +239,7 @@ class ComponentScopeTests: XCTestCase {
        //then we don't want every next resolve of service for other tags to reuse it
        XCTAssertTrue(service2 is ServiceImp2)
    }
-    container.register(tag: "service", .Shared) { ServiceImp2() as Service}
+    container.register(tag: "service") { ServiceImp2() as Service}
    
    //when
    let service1 = try! container.resolve(tag: "tag") as Service
@@ -256,7 +251,7 @@ class ComponentScopeTests: XCTestCase {
  func testThatItReusesInstanceInSharedScopeResolvedForNilTag() {
    //given
    var service2: Service?
-    container.register(.Shared) { ServiceImp1() as Service }
+    container.register { ServiceImp1() as Service }
      .resolvingProperties { (c, service1) in
        guard service2 == nil else { return }
        
@@ -279,16 +274,16 @@ class ComponentScopeTests: XCTestCase {
    //given
    var eagerSingletonResolved = false
    
-    container.register(tag: "eager", .EagerSingleton) { ServiceImp1() as Service }
+    container.register(.eagerSingleton, tag: "eager") { ServiceImp1() as Service }
      .resolvingProperties { container, service in eagerSingletonResolved = true }
    
-    container.register(tag: "singleton", .Singleton) { ServiceImp1() as Service }
+    container.register(.singleton, tag: "singleton") { ServiceImp1() as Service }
      .resolvingProperties { container, service in XCTFail() }

-    container.register(tag: "prototype", .Unique) { ServiceImp1() as Service }
+    container.register(.unique, tag: "prototype") { ServiceImp1() as Service }
      .resolvingProperties { container, service in XCTFail() }

-    container.register(tag: "graph", .Shared) { ServiceImp1() as Service }
+    container.register(.shared, tag: "graph") { ServiceImp1() as Service }
      .resolvingProperties { container, service in XCTFail() }
    
    //when
@@ -310,7 +305,7 @@ class ComponentScopeTests: XCTestCase {
    var anyOtherService: Any!
    var anyImpOtherService: Any!
    
-    container.register(.Shared) { ServiceImp1() as Service }
+    container.register { ServiceImp1() as Service }
      .resolvingProperties { container, service in
        otherService = try! container.resolve() as Service?
        impOtherService = try! container.resolve() as Service!
@@ -327,7 +322,7 @@ class ComponentScopeTests: XCTestCase {
  
  func testThatItHoldsWeakReferenceToWeakSingletonInstance() {
    //given
-    container.register(.WeakSingleton) { ServiceImp1() as Service }
+    container.register(.weakSingleton) { ServiceImp1() as Service }
    var strongSingleton: Service? = try! container.resolve() as Service
    weak var weakSingleton = try! container.resolve() as Service
    
@@ -341,8 +336,22 @@ class ComponentScopeTests: XCTestCase {
    XCTAssertNil(weakSingleton)
  }
  
+  func testThatItResolvesWeakSingletonAgainAfterItWasReleased() {
+    Dip.logLevel = .Verbose
+    //given
+    let service = container.register(.weakSingleton) { ServiceImp1() }
+    container.register(service, type: Service.self)
+    
+    //when
+    //resolve and realease reight away
+    _ = try? container.resolve() as ServiceImp1
+    
+    //then
+    AssertNoThrow(expression: try container.resolve() as Service, "Weak singleton should be resolved again.")
+  }
+  
  func testThatCollaboratingContainersReuseSingletonsResolvedByAnotherContainer() {
-    func test(scope: ComponentScope, line: UInt = #line) {
+    func test(_ scope: ComponentScope, line: UInt = #line) {
      let container1 = DependencyContainer()
      container1.register(scope) { ServiceImp1() as Service }
      
@@ -356,12 +365,12 @@ class ComponentScopeTests: XCTestCase {
      let service1 = try! container1.resolve() as Service
      let service2 = try! container2.resolve() as Service
      
-      XCTAssertTrue(service1 === service2, line: line, "\(scope) should be reused when first resolved from another container")
+      XCTAssertTrue(service1 === service2, "\(scope) should be reused when first resolved from another container", line: line)
    }
    
-    test(.Singleton)
-    test(.WeakSingleton)
-    test(.EagerSingleton)
+    test(.singleton)
+    test(.weakSingleton)
+    test(.eagerSingleton)
  }
  
 }
@@ -39,8 +39,7 @@ class ContextTests: XCTestCase {

  let container = DependencyContainer()
  
-  #if os(Linux)
-  static var allTests: [(String, ContextTests -> () throws -> Void)] {
+  static var allTests = {
    return [
      ("testThatContextStoresCurrentlyResolvedType", testThatContextStoresCurrentlyResolvedType),
      ("testThatContextStoresInjectedInType", testThatContextStoresInjectedInType),
@@ -48,26 +47,23 @@ class ContextTests: XCTestCase {
      ("testThatContextStoresTheTagPassedToResolveWhenAutoInjecting", testThatContextStoresTheTagPassedToResolveWhenAutoInjecting),
      ("testThatContextStoresTheTagPassedToResolveWhenAutoWiring", testThatContextStoresTheTagPassedToResolveWhenAutoWiring),
      ("testThatContextDoesNotOverrideNilTagPassedToResolve", testThatContextDoesNotOverrideNilTagPassedToResolve),
-      ("testThatContextStoresNameOfAutoInjectedProperty", testThatContextStoresNameOfAutoInjectedProperty)
+      ("testThatContextStoresNameOfAutoInjectedProperty", testThatContextStoresNameOfAutoInjectedProperty),
+      ("testThatItDoesNotSetInjectedInTypeWhenResolvingWithCollaboration", testThatItDoesNotSetInjectedInTypeWhenResolvingWithCollaboration),
+      ("testThatContextIsPreservedWhenResolvingWithCollaboration", testThatContextIsPreservedWhenResolvingWithCollaboration)
    ]
-  }
+  }()
  
-  func setUp() {
-    container.reset()
-  }
-  #else
  override func setUp() {
    container.reset()
    container.register { ServiceImp2() }
  }
-  #endif

  func testThatContextStoresCurrentlyResolvedType() {
    container.register { () -> Service in
      XCTAssertTrue(self.container.context.resolvingType == Service.self)
      let _ = try self.container.resolve() as ServiceImp1
      return ServiceImp1() as Service
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertTrue(self.container.context.resolvingType == Service.self)
        let _ = try self.container.resolve() as ServiceImp1
    }
@@ -75,7 +71,7 @@ class ContextTests: XCTestCase {
    container.register { () -> ServiceImp1 in
      XCTAssertTrue(self.container.context.resolvingType == ServiceImp1.self)
      return ServiceImp1()
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertTrue(self.container.context.resolvingType == ServiceImp1.self)
    }
    
@@ -87,7 +83,7 @@ class ContextTests: XCTestCase {
      XCTAssertNil(self.container.context.injectedInType)
      let _ = try self.container.resolve() as ServiceImp1
      return ServiceImp1() as Service
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertNil(self.container.context.injectedInType)
        let _ = try self.container.resolve() as ServiceImp1
    }
@@ -95,7 +91,7 @@ class ContextTests: XCTestCase {
    container.register { () -> ServiceImp1 in
      XCTAssertTrue(self.container.context.injectedInType == Service.self)
      return ServiceImp1()
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertTrue(self.container.context.injectedInType == Service.self)
    }
    
@@ -108,7 +104,7 @@ class ContextTests: XCTestCase {
      XCTAssertTrue(DependencyContainer.Tag.String("tag") ~= self.container.context.tag!)
      let _ = try self.container.resolve(tag: "otherTag") as ServiceImp1
      return ServiceImp1() as Service
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertNotNil(self.container.context.tag)
        XCTAssertTrue(DependencyContainer.Tag.String("tag") ~= self.container.context.tag!)
        let _ = try self.container.resolve(tag: "otherTag") as ServiceImp1
@@ -118,7 +114,7 @@ class ContextTests: XCTestCase {
      XCTAssertNotNil(self.container.context.tag)
      XCTAssertTrue(DependencyContainer.Tag.String("otherTag") ~= self.container.context.tag!)
      return ServiceImp1()
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertNotNil(self.container.context.tag)
        XCTAssertTrue(DependencyContainer.Tag.String("otherTag") ~= self.container.context.tag!)
    }
@@ -130,7 +126,7 @@ class ContextTests: XCTestCase {
    container.register { ServiceImp1() as Service }
    container.register { ServiceImp1() }
    
-    container.register() { () -> ServiceImp2 in
+    container.register { () -> ServiceImp2 in
      if self.container.context.injectedInProperty == "injectedNilTag" {
        XCTAssertNil(self.container.context.tag)
      }
@@ -139,7 +135,7 @@ class ContextTests: XCTestCase {
        XCTAssertTrue(DependencyContainer.Tag.String("injectedTag") ~= self.container.context.tag!)
      }
      return ServiceImp2()
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        if self.container.context.injectedInProperty == "injectedNilTag" {
          XCTAssertNil(self.container.context.tag)
        }
@@ -153,7 +149,7 @@ class ContextTests: XCTestCase {
      XCTAssertNotNil(self.container.context.tag)
      XCTAssertTrue(DependencyContainer.Tag.String("tag") ~= self.container.context.tag!)
      return ServiceImp2()
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertNotNil(self.container.context.tag)
        XCTAssertTrue(DependencyContainer.Tag.String("tag") ~= self.container.context.tag!)
    }
@@ -164,14 +160,14 @@ class ContextTests: XCTestCase {
  func testThatContextStoresTheTagPassedToResolveWhenAutoWiring() {
    container.register { (_: ServiceImp1) -> Service in
      return ServiceImp1() as Service
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
    }
    
    container.register { () -> ServiceImp1 in
      XCTAssertNotNil(self.container.context.tag)
      XCTAssertTrue(DependencyContainer.Tag.String("tag") ~= self.container.context.tag!)
      return ServiceImp1()
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertNotNil(self.container.context.tag)
        XCTAssertTrue(DependencyContainer.Tag.String("tag") ~= self.container.context.tag!)
    }
@@ -185,7 +181,7 @@ class ContextTests: XCTestCase {
      XCTAssertTrue(DependencyContainer.Tag.String("tag") ~= self.container.context.tag!)
      let _ = try self.container.resolve() as ServiceImp1
      return ServiceImp1() as Service
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertNotNil(self.container.context.tag)
        XCTAssertTrue(DependencyContainer.Tag.String("tag") ~= self.container.context.tag!)
        let _ = try self.container.resolve() as ServiceImp1
@@ -194,7 +190,7 @@ class ContextTests: XCTestCase {
    container.register { () -> ServiceImp1 in
      XCTAssertNil(self.container.context.tag)
      return ServiceImp1()
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertNil(self.container.context.tag)
    }
    
@@ -207,11 +203,11 @@ class ContextTests: XCTestCase {
    
    let names = ["injected", "injectedWeak", "taggedInjected", "taggedInjectedWeak", "injectedNilTag"]
    
-    container.register() { () -> ServiceImp2 in
+    container.register { () -> ServiceImp2 in
      XCTAssertNotNil(self.container.context.injectedInProperty)
      XCTAssertTrue(names.contains(self.container.context.injectedInProperty!))
      return ServiceImp2()
-      }.resolvingProperties { _ in
+      }.resolvingProperties { _,_  in
        XCTAssertNotNil(self.container.context.injectedInProperty)
        XCTAssertTrue(names.contains(self.container.context.injectedInProperty!))
    }
@@ -219,4 +215,47 @@ class ContextTests: XCTestCase {
    let _ = try! container.resolve() as Service
  }
  
+  func testThatItDoesNotSetInjectedInTypeWhenResolvingWithCollaboration() {
+    let collaborator = DependencyContainer()
+    
+    collaborator.register { () -> ServiceImp1 in
+      unowned let collaborator = collaborator
+      XCTAssertNil(collaborator.context.injectedInType)
+      return ServiceImp1()
+      }.resolvingProperties { collaborator, _ in
+        XCTAssertNil(collaborator.context.injectedInType)
+    }
+    
+    container.collaborate(with: collaborator)
+    collaborator.collaborate(with: container)
+    
+    let _ = try! container.resolve() as ServiceImp1
+  }
+  
+  func testThatContextIsPreservedWhenResolvingWithCollaboration() {
+    let collaborator = DependencyContainer()
+    
+    container.register { () -> Service in
+      XCTAssertTrue(self.container.context.resolvingType == Service.self)
+      let _ = try self.container.resolve() as ServiceImp1
+      return ServiceImp1() as Service
+      }.resolvingProperties { _,_  in
+        XCTAssertTrue(self.container.context.resolvingType == Service.self)
+        let _ = try self.container.resolve() as ServiceImp1
+    }
+    
+    collaborator.register { () -> ServiceImp1 in
+      XCTAssertTrue(collaborator.context.resolvingType == ServiceImp1.self)
+      return ServiceImp1()
+      }.resolvingProperties { _,_  in
+        XCTAssertTrue(collaborator.context.resolvingType == ServiceImp1.self)
+    }
+    
+    container.collaborate(with: collaborator)
+    collaborator.collaborate(with: container)
+    let _ = try! container.resolve() as Service
+
+    collaborator.reset()
+  }
+  
 }
@@ -36,8 +36,7 @@ class DefinitionTests: XCTestCase {
  let tag1 = DependencyContainer.Tag.String("tag1")
  let tag2 = DependencyContainer.Tag.String("tag2")
  
-  #if os(Linux)
-  static var allTests: [(String, DefinitionTests -> () throws -> Void)] {
+  static var allTests = {
    return [
      ("testThatDefinitionKeyIsEqualBy_Type_Factory_Tag", testThatDefinitionKeyIsEqualBy_Type_Factory_Tag),
      ("testThatDefinitionKeysWithDifferentTypesAreNotEqual", testThatDefinitionKeysWithDifferentTypesAreNotEqual),
@@ -47,8 +46,7 @@ class DefinitionTests: XCTestCase {
      ("testThatResolveDependenciesBlockIsNotCalledWhenPassedWrongInstance", testThatResolveDependenciesBlockIsNotCalledWhenPassedWrongInstance),
      ("testThatItRegisteresOptionalTypesAsForwardedTypes", testThatItRegisteresOptionalTypesAsForwardedTypes)
    ]
-  }
-  #endif
+  }()

  func testThatDefinitionKeyIsEqualBy_Type_Factory_Tag() {
    let equalKey1 = DefinitionKey(type: Service.self, typeOfArguments: F1.self, tag: tag1)
@@ -86,13 +84,13 @@ class DefinitionTests: XCTestCase {
    var blockCalled = false
    
    //given
-    let def = DefinitionOf<Service, () -> Service>(scope: .Unique) { ServiceImp() as Service }
+    let def = Definition<Service, ()>(scope: .unique) { ServiceImp() as Service }
      .resolvingProperties { container, service in
        blockCalled = true
    }
    
    //when
-    try! def.resolveProperties(instance: ServiceImp(), container: DependencyContainer())
+    try! def.resolveProperties(of: ServiceImp(), container: DependencyContainer())
    
    //then
    XCTAssertTrue(blockCalled)
@@ -102,23 +100,23 @@ class DefinitionTests: XCTestCase {
    var blockCalled = false
    
    //given
-    let def = DefinitionOf<Service, () -> Service>(scope: .Unique) { ServiceImp() as Service }
+    let def = Definition<Service, ()>(scope: .unique) { ServiceImp() as Service }
      .resolvingProperties { container, service in
        blockCalled = true
    }
    
    //when
-    try! def.resolveProperties(instance: String(), container: DependencyContainer())
+    try! def.resolveProperties(of: String(), container: DependencyContainer())
    
    //then
    XCTAssertFalse(blockCalled)
  }
  
  func testThatItRegisteresOptionalTypesAsForwardedTypes() {
-    let def = DefinitionOf<Service, () -> Service>(scope: .Unique) { ServiceImp() as Service }
+    let def = Definition<Service, ()>(scope: .unique) { ServiceImp() as Service }
    
-    XCTAssertTrue(def.implementingTypes.contains({ $0 == Service?.self }))
-    XCTAssertTrue(def.implementingTypes.contains({ $0 == Service!.self }))
+    XCTAssertTrue(def.implementingTypes.contains(where: { $0 == Service?.self }))
+    XCTAssertTrue(def.implementingTypes.contains(where: { $0 == Service!.self }))
  }
  
 }
@@ -30,10 +30,10 @@ private class ServiceImp1: Service { }
 private class ServiceImp2: Service { }

 private protocol Server: class {
-  weak var client: Client? { get }
+  weak var client: Client! { get }
 }
 private protocol Client: class {
-  var server: Server? { get }
+  var server: Server! { get }
 }

 class ResolvableService: Service, Resolvable {
@@ -49,8 +49,7 @@ class DipTests: XCTestCase {

  let container = DependencyContainer()

-  #if os(Linux)
-  static var allTests: [(String, DipTests -> () throws -> Void)] {
+  static var allTests = {
    return [
      ("testThatCreatingContainerWithConfigBlockDoesNotCreateRetainCycle", testThatCreatingContainerWithConfigBlockDoesNotCreateRetainCycle),
      ("testThatItResolvesInstanceRegisteredWithoutTag", testThatItResolvesInstanceRegisteredWithoutTag),
@@ -65,19 +64,19 @@ class DipTests: XCTestCase {
      ("testThatItThrowsErrorIfFailsToResolveDependency", testThatItThrowsErrorIfFailsToResolveDependency),
      ("testThatItCallsDidResolveDependenciesOnResolvableIntance", testThatItCallsDidResolveDependenciesOnResolvableIntance),
      ("testThatItCallsDidResolveDependenciesInReverseOrder", testThatItCallsDidResolveDependenciesInReverseOrder),
+      ("testItCallsResolveDependenciesOnResolableInstance", testItCallsResolveDependenciesOnResolableInstance),
      ("testThatItResolvesCircularDependencies", testThatItResolvesCircularDependencies),
-      ("testContainerCollaborators", testContainerCollaborators)
+      ("testThatItCanResolveUsingContainersCollaboration", testThatItCanResolveUsingContainersCollaboration),
+      ("testThatCollaboratingWithSelfIsIgnored", testThatCollaboratingWithSelfIsIgnored),
+      ("testThatCollaboratingContainersAreWeakReferences", testThatCollaboratingContainersAreWeakReferences),
+      ("testThatCollaboratingContainersReuseInstancesResolvedByAnotherContainer", testThatCollaboratingContainersReuseInstancesResolvedByAnotherContainer),
+      ("testThatItCanHandleSeparateContainersAndTheirCollaboration", testThatItCanHandleSeparateContainersAndTheirCollaboration)
    ]
-  }
+  }()

-  func setUp() {
-    container.reset()
-  }
-  #else
  override func setUp() {
    container.reset()
  }
-  #endif
  
  func testThatCreatingContainerWithConfigBlockDoesNotCreateRetainCycle() {
    var container: DependencyContainer! = DependencyContainer() { container in
@@ -222,14 +221,14 @@ class DipTests: XCTestCase {
    }
    
    //when
-    try! container.resolve() as Service
+    let _ = try! container.resolve() as Service
    
    //then
    XCTAssertTrue(resolveDependenciesCalled)
    resolveDependenciesCalled = false
    
    //and when
-    try! container.resolve(Service.self)
+    let _ = try! container.resolve(Service.self)
    
    //then
    XCTAssertTrue(resolveDependenciesCalled)
@@ -237,7 +236,7 @@ class DipTests: XCTestCase {
    resolveDependenciesCalled = false
    
    //and when
-    try! container.resolve((Service?).self)
+    let _ = try! container.resolve((Service?).self)
    
    //then
    XCTAssertTrue(resolveDependenciesCalled)
@@ -245,7 +244,7 @@ class DipTests: XCTestCase {
    resolveDependenciesCalled = false
    
    //and when
-    try! container.resolve((Service!).self)
+    let _ = try! container.resolve((Service!).self)
    
    //then
    XCTAssertTrue(resolveDependenciesCalled)
@@ -257,7 +256,7 @@ class DipTests: XCTestCase {
    
    //when
    AssertThrows(expression: try container.resolve() as Service) { error in
-      guard case let DipError.DefinitionNotFound(key) = error else { return false }
+      guard case let DipError.definitionNotFound(key) = error else { return false }
      
      //then
      let expectedKey = DefinitionKey(type: Service.self, typeOfArguments: Void.self, tag: nil)
@@ -268,7 +267,7 @@ class DipTests: XCTestCase {

    //and when
    AssertThrows(expression: try container.resolve(Service.self)) { error in
-      guard case let DipError.DefinitionNotFound(key) = error else { return false }
+      guard case let DipError.definitionNotFound(key) = error else { return false }
      
      //then
      let expectedKey = DefinitionKey(type: Service.self, typeOfArguments: Void.self, tag: nil)
@@ -284,7 +283,7 @@ class DipTests: XCTestCase {
    
    //when
    AssertThrows(expression: try container.resolve(tag: "other tag") as Service) { error in
-      guard case let DipError.DefinitionNotFound(key) = error else { return false }
+      guard case let DipError.definitionNotFound(key) = error else { return false }
      
      //then
      let expectedKey = DefinitionKey(type: Service.self, typeOfArguments: Void.self, tag: "other tag")
@@ -295,7 +294,7 @@ class DipTests: XCTestCase {

    //and when
    AssertThrows(expression: try container.resolve(Service.self, tag: "other tag")) { error in
-      guard case let DipError.DefinitionNotFound(key) = error else { return false }
+      guard case let DipError.definitionNotFound(key) = error else { return false }
      
      //then
      let expectedKey = DefinitionKey(type: Service.self, typeOfArguments: Void.self, tag: "other tag")
@@ -311,7 +310,7 @@ class DipTests: XCTestCase {
    
    //when
    AssertThrows(expression: try container.resolve(arguments: "some string") as Service) { error in
-      guard case let DipError.DefinitionNotFound(key) = error else { return false }
+      guard case let DipError.definitionNotFound(key) = error else { return false }
      
      //then
      let expectedKey = DefinitionKey(type: Service.self, typeOfArguments: String.self, tag: nil)
@@ -322,7 +321,7 @@ class DipTests: XCTestCase {

    //and when
    AssertThrows(expression: try container.resolve(Service.self, arguments: "some string")) { error in
-      guard case let DipError.DefinitionNotFound(key) = error else { return false }
+      guard case let DipError.definitionNotFound(key) = error else { return false }
      
      //then
      let expectedKey = DefinitionKey(type: Service.self, typeOfArguments: String.self, tag: nil)
@@ -335,13 +334,13 @@ class DipTests: XCTestCase {
  func testThatItThrowsErrorIfConstructorThrows() {
    //given
    let failedKey = DefinitionKey(type: Any.self, typeOfArguments: Any.self)
-    let expectedError = DipError.DefinitionNotFound(key: failedKey)
+    let expectedError = DipError.definitionNotFound(key: failedKey)
    container.register { () throws -> Service in throw expectedError }
    
    //when
    AssertThrows(expression: try container.resolve() as Service) { error in
      switch error {
-      case let DipError.DefinitionNotFound(key) where key == failedKey: return true
+      case let DipError.definitionNotFound(key) where key == failedKey: return true
      default: return false
      }
    }
@@ -349,7 +348,7 @@ class DipTests: XCTestCase {
    //and when
    AssertThrows(expression: try container.resolve(Service.self)) { error in
      switch error {
-      case let DipError.DefinitionNotFound(key) where key == failedKey: return true
+      case let DipError.definitionNotFound(key) where key == failedKey: return true
      default: return false
      }
    }
@@ -358,7 +357,7 @@ class DipTests: XCTestCase {
  func testThatItThrowsErrorIfFailsToResolveDependency() {
    //given
    let failedKey = DefinitionKey(type: Any.self, typeOfArguments: Any.self)
-    let expectedError = DipError.DefinitionNotFound(key: failedKey)
+    let expectedError = DipError.definitionNotFound(key: failedKey)
    container.register { ServiceImp1() as Service }
      .resolvingProperties { container, service in
        //simulate throwing error when resolving dependency
@@ -368,7 +367,7 @@ class DipTests: XCTestCase {
    //when
    AssertThrows(expression: try container.resolve() as Service) { error in
      switch error {
-      case let DipError.DefinitionNotFound(key) where key == failedKey: return true
+      case let DipError.definitionNotFound(key) where key == failedKey: return true
      default: return false
      }
    }
@@ -376,7 +375,7 @@ class DipTests: XCTestCase {
    //and when
    AssertThrows(expression: try container.resolve(Service.self)) { error in
      switch error {
-      case let DipError.DefinitionNotFound(key) where key == failedKey: return true
+      case let DipError.definitionNotFound(key) where key == failedKey: return true
      default: return false
      }
    }
@@ -390,13 +389,13 @@ class DipTests: XCTestCase {
        return
    }

-    container.register(tag: "graph", .Shared) { ResolvableService() as Service }
+    container.register(tag: "graph") { ResolvableService() as Service }
      .resolvingProperties { _, service in
        XCTAssertFalse((service as! ResolvableService).didResolveDependenciesCalled, "didResolveDependencies should not be called yet")
        return
    }

-    container.register(tag: "singleton", .Singleton) { ResolvableService() as Service }
+    container.register(.singleton, tag: "singleton") { ResolvableService() as Service }
      .resolvingProperties { _, service in
        XCTAssertFalse((service as! ResolvableService).didResolveDependenciesCalled, "didResolveDependencies should not be called yet")
        return
@@ -452,11 +451,41 @@ class DipTests: XCTestCase {
    XCTAssertTrue(ResolvableService.resolved.last === service1)
  }
  
+  func testItCallsResolveDependenciesOnResolableInstance() {
+    
+    class Class: Resolvable {
+      var resolveDependenciesCalled = false
+      
+      func resolveDependencies(_ container: DependencyContainer) {
+        resolveDependenciesCalled = true
+      }
+    }
+    
+    class SubClass: Class {
+      override func resolveDependencies(_ container: DependencyContainer) {
+        super.resolveDependencies(container)
+      }
+    }
+    
+    container.register { Class() }
+      .resolvingProperties { _, instance in
+        XCTAssertTrue(instance.resolveDependenciesCalled)
+    }
+    
+    container.register { SubClass() }
+      .resolvingProperties { _, instance in
+        XCTAssertTrue(instance.resolveDependenciesCalled)
+    }
+    
+    let _ = try! container.resolve() as Class
+    let _ = try! container.resolve() as SubClass
+  }
+  
  func testThatItResolvesCircularDependencies() {
    
    class ResolvableServer: Server, Resolvable {
-      weak var client: Client?
-      weak var secondClient: Client?
+      weak var client: Client!
+      weak var secondClient: Client!
      
      init(client: Client) {
        self.client = client
@@ -478,10 +507,8 @@ class DipTests: XCTestCase {
    }
    
    class ResolvableClient: Client, Resolvable {
-      var server: Server?
-      var secondServer: Server?
-      
-      init() {}
+      var server: Server!
+      var secondServer: Server!
      
      var didResolveDependenciesCalled = false
      
@@ -498,13 +525,13 @@ class DipTests: XCTestCase {
    }

    //given
-    container.register(.Shared) { try ResolvableServer(client: self.container.resolve()) as Server }
+    container.register { try ResolvableServer(client: self.container.resolve()) as Server }
      .resolvingProperties { (container: DependencyContainer, server: Server) in
        let server = server as! ResolvableServer
        server.secondClient = try container.resolve() as Client
    }
    
-    container.register(.Shared) { ResolvableClient() as Client }
+    container.register { ResolvableClient() as Client }
      .resolvingProperties { (container: DependencyContainer, client: Client) in
        let client = client as! ResolvableClient
        client.server = try container.resolve() as Server
@@ -536,7 +563,7 @@ class DipTests: XCTestCase {
    var createdService3 = false
    var createdService = false
    
-    let service = container.register { ServiceImp1() }
+    container.register { ServiceImp1() }
      .resolvingProperties { container, _ in
        if container.context.resolvingType == ServiceImp1.self {
          createdService1 = true
@@ -544,16 +571,15 @@ class DipTests: XCTestCase {
        if container.context.resolvingType == Service.self {
          createdService = true
        }
-    }
-    container.register(service, type: Service.self)
+      }.implements(Service.self)
    
    container.register(tag: "tag") { ServiceImp2() as Service }
-      .resolvingProperties { _ in
+      .resolvingProperties { _,_  in
        createdService2 = true
    }
    
-    container.register() { (arg: String) in ServiceImp1() }
-      .resolvingProperties { _ in
+    container.register { (arg: String) in ServiceImp1() }
+      .resolvingProperties { _,_  in
        createdService3 = true
    }
    
@@ -603,8 +629,10 @@ class DipTests: XCTestCase {
  
  func testThatItFailsValidationOnlyForDipErrors() {
    //given
+    enum SomeError: Error { case error }
+    
    container.register { () -> Service in
-      throw NSError(domain: "", code: 0, userInfo: nil)
+      throw SomeError.error
    }
    
    //then
@@ -613,12 +641,12 @@ class DipTests: XCTestCase {
    //given
    let key = DefinitionKey(type: Service.self, typeOfArguments: Void.self, tag: nil)
    container.register { () -> Service in
-      throw DipError.DefinitionNotFound(key: key)
+      throw DipError.definitionNotFound(key: key)
    }
    
    //then
    AssertThrows(expression: try container.validate()) { error in
-      if case let DipError.DefinitionNotFound(_key) = error where _key == key { return true }
+      if case let DipError.definitionNotFound(_key) = error, _key == key { return true }
      else { return false }
    }
  }
@@ -631,6 +659,7 @@ extension DipTests {
    //given
    let collaborator = DependencyContainer()
    collaborator.register { ResolvableService() as Service }
+    container.register { "something" }

    //when
    container.collaborate(with: collaborator)
@@ -638,13 +667,14 @@ extension DipTests {
    //then
    AssertNoThrow(expression: try container.resolve() as Service)
    AssertNoThrow(expression: try container.resolve(Service.self))
+    AssertNoThrow(expression: try collaborator.resolve() as String)
+    AssertNoThrow(expression: try collaborator.resolve(String.self))
  }
  
  func testThatCollaboratingWithSelfIsIgnored() {
    let collaborator = DependencyContainer()
    collaborator.collaborate(with: collaborator)
    XCTAssertTrue(collaborator._collaborators.isEmpty, "Container should not collaborate with itself")
-    
  }
  
  func testThatCollaboratingContainersAreWeakReferences() {
@@ -663,20 +693,20 @@ extension DipTests {
  func testThatCollaboratingContainersReuseInstancesResolvedByAnotherContainer() {
    //given
    class ServerImp: Server {
-      weak var client: Client?
+      weak var client: Client!
      init(client: Client) { self.client = client }
    }
+    
    class ClientImp: Client {
-      var server: Server?
-      var anotherServer: Server?
-      init() {}
+      var server: Server!
+      var anotherServer: Server!
    }
    
    let serverContainer = DependencyContainer()
-    serverContainer.register(.Shared) { ServerImp(client: $0) as Server }
+    serverContainer.register { ServerImp(client: $0) as Server }

    let clientContainer = DependencyContainer()
-    clientContainer.register(.Shared) { ClientImp() as Client }
+    clientContainer.register { ClientImp() as Client }
      .resolvingProperties { container, client in
        let client = client as! ClientImp
        client.server = try container.resolve() as Server
@@ -703,4 +733,152 @@ extension DipTests {
    XCTAssertTrue(client?.server === (client as? ClientImp)?.anotherServer)
  }
  
+  func testThatCollaborationReferencesAreRecursivelyUpdate() {
+    let container = DependencyContainer()
+    container.register(.singleton){ ResolvableService() as Service }
+    
+    //when
+    let collaborator1 = DependencyContainer()
+    let collaborator2 = DependencyContainer()
+    let collaborator3 = DependencyContainer()
+    let collaborator4 = DependencyContainer()
+    
+    collaborator1.collaborate(with: container)
+    XCTAssertTrue(collaborator1.resolvedInstances.sharedSingletonsBox === container.resolvedInstances.sharedSingletonsBox)
+
+    collaborator2.collaborate(with: container)
+    XCTAssertTrue(collaborator2.resolvedInstances.sharedSingletonsBox === container.resolvedInstances.sharedSingletonsBox)
+
+    collaborator3.collaborate(with: collaborator1)
+    XCTAssertTrue(collaborator3.resolvedInstances.sharedSingletonsBox === container.resolvedInstances.sharedSingletonsBox)
+
+    collaborator4.collaborate(with: collaborator2)
+    XCTAssertTrue(collaborator4.resolvedInstances.sharedSingletonsBox === container.resolvedInstances.sharedSingletonsBox)
+    
+    let service1 = try! collaborator1.resolve() as Service
+    let service2 = try! collaborator2.resolve() as Service
+    let service3 = try! collaborator3.resolve() as Service
+    let service4 = try! collaborator4.resolve() as Service
+    let serviceRoot = try! container.resolve() as Service
+    
+    XCTAssertTrue(service1 === service2)
+    XCTAssertTrue(service1 === service3)
+    XCTAssertTrue(service1 === service4)
+    
+    XCTAssertTrue(service1 === serviceRoot)
+    XCTAssertTrue(service2 === serviceRoot)
+    XCTAssertTrue(service3 === serviceRoot)
+    XCTAssertTrue(service4 === serviceRoot)
+  }
+
+  class RootService {}
+  class ServiceClient {
+    let name: String
+    let service: RootService
+    init(name: String, service: RootService) {
+      self.name = name
+      self.service = service
+    }
+  }
+
+  func testThatContainersShareTheirSingletonsOnlyWithCollaborators() {
+    let container = DependencyContainer()
+    container.register(.singleton) { RootService() }
+    
+    let collaborator1 = DependencyContainer()
+    collaborator1.register(.singleton) {
+      ServiceClient(name: "1", service: $0)
+    }
+    
+    let collaborator2 = DependencyContainer()
+    collaborator2.register(.singleton) {
+      ServiceClient(name: "2", service: $0)
+    }
+    
+    collaborator1.collaborate(with: container)
+    collaborator2.collaborate(with: container)
+    
+    let client2 = try! collaborator2.resolve() as ServiceClient
+    let client1 = try! collaborator1.resolve() as ServiceClient
+    
+    XCTAssertEqual(client1.name, "1")
+    XCTAssertEqual(client2.name, "2")
+    XCTAssertTrue(client1.service === client2.service)
+  }
+
+  func testThatContainerAutowireBeforeCollaboration() {
+    let container = DependencyContainer()
+    container.register(.singleton) { RootService() }
+    
+    let collaborator1 = DependencyContainer()
+    collaborator1.register(.singleton) {
+      ServiceClient(name: "1", service: $0)
+    }
+    
+    let collaborator2 = DependencyContainer()
+    collaborator2.register(.singleton) {
+      ServiceClient(name: "2", service: $0)
+    }
+    
+    collaborator1.collaborate(with: container, collaborator2)
+    collaborator2.collaborate(with: container, collaborator1)
+    
+    let client2 = try! collaborator2.resolve() as ServiceClient
+    let client1 = try! collaborator1.resolve() as ServiceClient
+    
+    XCTAssertEqual(client1.name, "1")
+    XCTAssertEqual(client2.name, "2")
+    XCTAssertTrue(client1.service === client2.service)
+  }
+}
+
+class Manager {}
+class AnotherManager {}
+
+class Object {
+  let manager: Manager?
+  
+  init(with container: DependencyContainer) {
+    self.manager = try? container.resolve()
+  }
+}
+
+class Owner {
+  var manager: Manager?
+}
+
+extension DipTests {
+  func testThatItCanHandleSeparateContainersAndTheirCollaboration() {
+    let container = self.container
+    
+    let anotherContainer = DependencyContainer()
+    anotherContainer.register { Object(with: anotherContainer) }
+    
+    container.collaborate(with: anotherContainer)
+    
+    container
+      .register { Owner() }
+      .resolvingProperties { $1.manager = try $0.resolve() }
+    
+    container.register(.singleton) { AnotherManager() }
+    container.register(.singleton) { Manager() }
+    
+    let manager: Manager? = try? container.resolve()
+    let another: AnotherManager? = try? container.resolve()
+    var owner: Owner? = try? container.resolve(arguments: 1, "")
+    
+    let object: Object? = try? container.resolve()
+    owner = try? container.resolve()
+    
+    let nonNilValues: [Any?] = [another, manager, owner, object, object?.manager]
+    nonNilValues.forEach { XCTAssertNotNil($0) }
+    
+    XCTAssertTrue(
+      owner?.manager
+        .flatMap { value in
+          manager.flatMap { $0 === value }
+        }
+        ?? false
+    )
+  }
 }
@@ -51,8 +51,7 @@ class RuntimeArgumentsTests: XCTestCase {
  
  let container = DependencyContainer()
 
-  #if os(Linux)
-  static var allTests: [(String, RuntimeArgumentsTests -> () throws -> Void)] {
+  static var allTests = {
    return [
      ("testThatItResolvesInstanceWithOneArgument", testThatItResolvesInstanceWithOneArgument),
      ("testThatItResolvesInstanceWithTwoArguments", testThatItResolvesInstanceWithTwoArguments),
@@ -66,16 +65,11 @@ class RuntimeArgumentsTests: XCTestCase {
      ("testThatNewRegistrationWithSameArgumentsOverridesPreviousRegistration", testThatNewRegistrationWithSameArgumentsOverridesPreviousRegistration),
      ("testThatDifferentFactoriesRegisteredIfArgumentIsOptional", testThatDifferentFactoriesRegisteredIfArgumentIsOptional)
    ]
-  }
+  }()

-  func setUp() {
-    container.reset()
-  }
-  #else
  override func setUp() {
    container.reset()
  }
-  #endif
  
  func testThatItResolvesInstanceWithOneArgument() {
    //given
@@ -276,20 +270,28 @@ class RuntimeArgumentsTests: XCTestCase {
  
  func testThatDifferentFactoriesRegisteredIfArgumentIsOptional() {
    //given
-    let name1 = "1", name2 = "2", name3 = "3"
+    let name1 = "1", name2 = "2"
    container.register { (port: Int, url: String) in ServiceImp(name: name1, baseURL: url, port: port) as Service }
    container.register { (port: Int, url: String?) in ServiceImp(name: name2, baseURL: url!, port: port) as Service }
-    container.register { (port: Int, url: String!) in ServiceImp(name: name3, baseURL: url, port: port) as Service }
    
    //when
    let service1 = try! container.resolve(arguments: 80, "http://example.com") as Service
    let service2 = try! container.resolve(arguments: 80, "http://example.com" as String?) as Service
-    let service3 = try! container.resolve(arguments: 80, "http://example.com" as String!) as Service
    
    //then
    XCTAssertEqual(service1.name, name1)
    XCTAssertEqual(service2.name, name2)
-    XCTAssertEqual(service3.name, name3)
+    
+    //Due to incomplete implementation of SE-0054 (bug: https://bugs.swift.org/browse/SR-2143)
+    //registering definition with T? and T! arguments types will produce two different definitions
+    //but when argement of T! will be passed to `resolve` method it will be transformed to T?
+    //and wrong definition will be used
+    //When fixed using T? and T! should not register two different definitions
+
+//    let name3 = "3"
+//    container.register { (port: Int, url: String!) in ServiceImp(name: name3, baseURL: url, port: port) as Service }
+//    let service3 = try! container.resolve(arguments: 80, "http://example.com" as String!) as Service
+//    XCTAssertEqual(service3.name, name3)
  }
  
 }
@@ -26,7 +26,7 @@ import XCTest
@testable import Dip

 private protocol Server: class {
-  var client: Client? { get set }
+  var client: Client! { get set }
 }

 private protocol Client: class {
@@ -45,11 +45,11 @@ private func ==<T: ClientImp>(lhs: T, rhs: T) -> Bool {
 }

 private class ServerImp: Server, Hashable {
-  weak var client: Client?
+  weak var client: Client!
  init() {}
  
  var hashValue: Int {
-    return unsafeAddressOf(self).hashValue
+    return Unmanaged.passUnretained(self).toOpaque().hashValue
  }
 }

@@ -64,24 +64,26 @@ private var container: DependencyContainer!

 #if os(Linux)
 import Glibc
+  
+private var runningThreads: Int = 0
 private var lock: pthread_spinlock_t = 0

 private let resolveClientSync: () -> Client? = {
-  var clientPointer: UnsafeMutablePointer<Void> = nil
-  clientPointer = dispatch_sync { _ in
+  let pointer = dispatch_sync { _ in
    let resolved = try! container.resolve() as Client
-    return UnsafeMutablePointer(Unmanaged.passUnretained(resolved as! ClientImp).toOpaque())
+    return UnsafeMutableRawPointer(Unmanaged.passRetained(resolved as! ClientImp).toOpaque())
  }
-  return Unmanaged<ClientImp>.fromOpaque(COpaquePointer(clientPointer)).takeUnretainedValue()
+  guard let clientPointer = pointer else { return nil }
+  return Unmanaged<ClientImp>.fromOpaque(clientPointer).takeRetainedValue()
 }
  
 #else
-let queue = NSOperationQueue()
-let lock = NSRecursiveLock()
+let queue = OperationQueue()
+let lock = RecursiveLock()
  
 private let resolveClientSync: () -> Client? = {
  var client: Client?
-  dispatch_sync(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
+  DispatchQueue.global(qos: .default).sync() {
    client = try! container.resolve() as Client
  }
  return client
@@ -90,9 +92,14 @@ private let resolveClientSync: () -> Client? = {
 #endif

 let resolveServerAsync = {
-  let service = try! container.resolve() as Server
+  let server = try! container.resolve() as Server
  lock.lock()
-  resolvedServers.insert(service as! ServerImp)
+  resolvedServers.insert(server as! ServerImp)
+
+  #if os(Linux)
+    runningThreads -= 1
+  #endif
+
  lock.unlock()
 }

@@ -100,34 +107,33 @@ let resolveClientAsync = {
  let client = try! container.resolve() as Client
  lock.lock()
  resolvedClients.append(client as! ClientImp)
+
+  #if os(Linux)
+    runningThreads -= 1
+  #endif
+
  lock.unlock()
 }

 class ThreadSafetyTests: XCTestCase {
  
  #if os(Linux)
-  required init(name: String, testClosure: XCTestCase throws -> Void) {
+  required init(name: String, testClosure: @escaping (XCTestCase) throws -> Void) {
    pthread_spin_init(&lock, 0)
+    super.init(name: name, testClosure: testClosure)
  }
+  #endif
  
-  static var allTests: [(String, ThreadSafetyTests -> () throws -> Void)] {
+  static var allTests = {
    return [
      ("testSingletonThreadSafety", testSingletonThreadSafety),
      ("testFactoryThreadSafety", testFactoryThreadSafety),
      ("testCircularReferenceThreadSafety", testCircularReferenceThreadSafety)
    ]
-  }
+  }()
  
-  func setUp() {
-    container = DependencyContainer()
-  }
-  
-  func tearDown() {
-    resolvedServers.removeAll()
-    resolvedClients.removeAll()
-  }
-  #else
  override func setUp() {
+    Dip.logLevel = .Verbose
    container = DependencyContainer()
  }
  
@@ -135,24 +141,27 @@ class ThreadSafetyTests: XCTestCase {
    resolvedServers.removeAll()
    resolvedClients.removeAll()
  }
-  #endif
  
  func testSingletonThreadSafety() {
-    container.register(.Singleton) { ServerImp() as Server }
+    container.register(.singleton) { ServerImp() as Server }
    
    for _ in 0..<100 {
      #if os(Linux)
-      dispatch_async({ _ in
+      lock.lock()
+      runningThreads += 1
+      lock.unlock()
+        
+      dispatch_async { _ in
        resolveServerAsync()
        return nil
-      })
+      }
      #else
-      queue.addOperationWithBlock(resolveServerAsync)
+      queue.addOperation(resolveServerAsync)
      #endif
    }
    
    #if os(Linux)
-    sleep(1)
+    while runningThreads > 0 { sleep(1) }
    #else
    queue.waitUntilAllOperationsAreFinished()
    #endif
@@ -166,17 +175,21 @@ class ThreadSafetyTests: XCTestCase {
    
    for _ in 0..<100 {
      #if os(Linux)
-      dispatch_async({ _ in
+      lock.lock()
+      runningThreads += 1
+      lock.unlock()
+
+      dispatch_async { _ in
        resolveServerAsync()
        return nil
-      })
+      }
      #else
-      queue.addOperationWithBlock(resolveServerAsync)
+      queue.addOperation(resolveServerAsync)
      #endif
    }
    
    #if os(Linux)
-    sleep(1)
+    while runningThreads > 0 { sleep(1) }
    #else
    queue.waitUntilAllOperationsAreFinished()
    #endif
@@ -186,28 +199,32 @@ class ThreadSafetyTests: XCTestCase {
  
  
  func testCircularReferenceThreadSafety() {
-    container.register(.Shared) {
+    container.register {
      ClientImp(server: try container.resolve()) as Client
    }
    
-    container.register(.Shared) { ServerImp() as Server }
+    container.register { ServerImp() as Server }
      .resolvingProperties { container, server in
        server.client = resolveClientSync()
    }
    
    for _ in 0..<100 {
      #if os(Linux)
-      dispatch_async({ _ in
+      lock.lock()
+      runningThreads += 1
+      lock.unlock()
+
+      dispatch_async { _ in
        resolveClientAsync()
        return nil
-      })
+      }
      #else
-      queue.addOperationWithBlock(resolveClientAsync)
+      queue.addOperation(resolveClientAsync)
      #endif
    }
    
    #if os(Linux)
-    sleep(1)
+    while runningThreads > 0 { sleep(1) }
    #else
    queue.waitUntilAllOperationsAreFinished()
    #endif
@@ -34,34 +34,32 @@ class TypeForwardingTests: XCTestCase {
  
  let container = DependencyContainer()

-  #if os(Linux)
-  static var allTests: [(String, TypeForwardingTests -> () throws -> Void)] {
+  static var allTests = {
    return [
      ("testThatItResolvesInstanceByTypeForwarding", testThatItResolvesInstanceByTypeForwarding),
      ("testThatItReusesInstanceResolvedByTypeForwarding", testThatItReusesInstanceResolvedByTypeForwarding),
      ("testThatItDoesNotResolveByTypeForwardingIfRegisteredForAnotherTag", testThatItDoesNotResolveByTypeForwardingIfRegisteredForAnotherTag),
      ("testThatItDoesNotReuseInstanceResolvedByTypeForwardingRegisteredForAnotherTag",  testThatItDoesNotReuseInstanceResolvedByTypeForwardingRegisteredForAnotherTag),
      ("testThatItCallsResolvedDependenciesBlockWhenResolvingByTypeForwarding", testThatItCallsResolvedDependenciesBlockWhenResolvingByTypeForwarding),
+      ("testThatItCallsResolvedDependenciesBlockProvidedAfterRegistrationWhenResolvingByTypeForwarding",testThatItCallsResolvedDependenciesBlockProvidedAfterRegistrationWhenResolvingByTypeForwarding),
      ("testThatItFallbackToDefinitionWithNoTagWhenResolvingInstanceByTypeForwarding", testThatItFallbackToDefinitionWithNoTagWhenResolvingInstanceByTypeForwarding),
+      ("testThatItCanResolveOptional", testThatItCanResolveOptional),
+      ("testThatItFirstUsesTaggedDefinitionWhenResolvingOptional", testThatItFirstUsesTaggedDefinitionWhenResolvingOptional),
      ("testThatItThrowsErrorWhenResolvingNotImplementedTypeWithTypeForwarding", testThatItThrowsErrorWhenResolvingNotImplementedTypeWithTypeForwarding),
-      ("testThatItOverridesIfSeveralDefinitionsWithTheSameTagForwardTheSameType", testThatItOverridesIfSeveralDefinitionsWithTheSameTagForwardTheSameType)
+      ("testThatItOverridesIfSeveralDefinitionsWithTheSameTagForwardTheSameType", testThatItOverridesIfSeveralDefinitionsWithTheSameTagForwardTheSameType),
+      ("testThatItDoesNotOverrideIfDefinitionForwardsTheSameTypeWithDifferentTag", testThatItDoesNotOverrideIfDefinitionForwardsTheSameTypeWithDifferentTag)
    ]
-  }
+  }()
  
-  func setUp() {
-    container.reset()
-  }
-  #else
  override func setUp() {
    container.reset()
  }
-  #endif
-
+  
  func testThatItResolvesInstanceByTypeForwarding() {
    //given
-    let def = container.register { ServiceImp1() as Service }
-    container.register(def, type: ForwardedType.self)
-    container.register(def, type: NSObject.self)
+    container.register { ServiceImp1() as Service }
+      .implements(ForwardedType.self)
+      .implements(NSObject.self)
    
    //when
    let anotherService = try! container.resolve() as ForwardedType
@@ -78,9 +76,10 @@ class TypeForwardingTests: XCTestCase {
  
  func testThatItReusesInstanceResolvedByTypeForwarding() {
    //given
-    let def = container.register(.Shared) { ServiceImp1() as Service }
+    container.register() { ServiceImp1() as Service }
      .resolvingProperties { container, resolved in
        //when
+        //resolving forwarded type
        let forwardType = try container.resolve() as ForwardedType
        let anyForwardType = try container.resolve(ForwardedType.self) as! ForwardedType
        let object = try container.resolve() as NSObject
@@ -95,26 +94,26 @@ class TypeForwardingTests: XCTestCase {
        XCTAssertTrue(anyObject === resolved as! NSObject)
        XCTAssertTrue(service === resolved)
        XCTAssertTrue(anyService === resolved)
-    }
-    container.register(def, type: ForwardedType.self)
-    container.register(def, type: NSObject.self)
+      }
+      .implements(ForwardedType.self)
+      .implements(NSObject.self)
    
    let _ = try! container.resolve() as Service
    let _ = try! container.resolve() as ForwardedType
-    let _ = try! container.resolve() as NSObject
+//    let _ = try! container.resolve() as NSObject
  }
  
  func testThatItDoesNotResolveByTypeForwardingIfRegisteredForAnotherTag() {
    //given
    let def = container.register(tag: "tag") { ServiceImp1() as Service }
-    container.register(def, type: ForwardedType.self, tag: "otherTag")
+    def.implements(ForwardedType.self, tag: "otherTag")
    
    //then
    AssertThrows(expression: try container.resolve(tag: "tag") as ForwardedType)
    AssertThrows(expression: try container.resolve(ForwardedType.self, tag: "tag"))
    
    //and given
-    container.register(def, type: ForwardedType.self, tag: "tag")
+    def.implements(ForwardedType.self, tag: "tag")
    
    //then
    AssertNoThrow(expression: try container.resolve(tag: "tag") as ForwardedType)
@@ -124,11 +123,13 @@ class TypeForwardingTests: XCTestCase {
  func testThatItDoesNotReuseInstanceResolvedByTypeForwardingRegisteredForAnotherTag() {
    var resolveDependenciesCalled = false
    //given
-    let def = container.register(.Shared) { ServiceImp1() as Service }
+    container.register() { ServiceImp1() as Service }
      .resolvingProperties { container, service in
        guard resolveDependenciesCalled == false else { return }
        resolveDependenciesCalled = true

+        //when
+        //resolving via type-forawrding for tag different then tag for original definition
        let forwardType = try container.resolve(tag: "tag") as ForwardedType
        let anyForwardType = try container.resolve(ForwardedType.self, tag: "tag") as! ForwardedType

@@ -140,9 +141,9 @@ class TypeForwardingTests: XCTestCase {
        XCTAssertFalse(anyForwardType === service as! ForwardedType)
        XCTAssertTrue(object === service as! NSObject)
        XCTAssertTrue(anyObject === service as! NSObject)
-    }
-    container.register(def, type: ForwardedType.self, tag: "tag")
-    container.register(def, type: NSObject.self)
+      }
+      .implements(ForwardedType.self, tag: "tag")
+      .implements(NSObject.self)
    
    //when
    let _ = try! container.resolve() as Service
@@ -150,49 +151,108 @@ class TypeForwardingTests: XCTestCase {
  
  func testThatItCallsResolvedDependenciesBlockWhenResolvingByTypeForwarding() {
    //given
-    var originalResolveDependenciesCalled = false
-    var resolveDependenciesCalled = false
-    let def = container.register { ServiceImp1() }
-      .resolvingProperties { container, service in
-        originalResolveDependenciesCalled = true
+    var originalResolvingPropertiesCalled = false
+    var resolvingPropertiesCalled = false
+    container.register { ServiceImp1() }
+      .resolvingProperties { _,_  in
+        originalResolvingPropertiesCalled = true
+      }.implements(Service.self) { _,_ in
+        resolvingPropertiesCalled = true
+      }
+    
+    //when
+    let _ = try! container.resolve() as Service
+    
+    //then
+    XCTAssertTrue(resolvingPropertiesCalled)
+    XCTAssertTrue(originalResolvingPropertiesCalled)
+
+    //and when
+    resolvingPropertiesCalled = false
+    originalResolvingPropertiesCalled = false
+    let _ = try! container.resolve(Service.self)
+    
+    //then
+    XCTAssertTrue(resolvingPropertiesCalled)
+    XCTAssertTrue(originalResolvingPropertiesCalled)
+  }
+  
+  func testThatItCallsResolvedDependenciesBlockProvidedAfterRegistrationWhenResolvingByTypeForwarding() {
+    //given
+    //resolvingProperties provided after registering definition
+    var originalResolvingPropertiesCalled = false
+    var resolvingPropertiesCalled = false
+    container.reset()
+    let definition = container.register { ServiceImp1() }
+      .implements(Service.self) { _,_ in
+        resolvingPropertiesCalled = true
    }
    
-    container.register(def, type: Service.self)
-      .resolvingProperties { container, object in
-        resolveDependenciesCalled = true
+    definition.resolvingProperties { _,_  in
+      originalResolvingPropertiesCalled = true
    }
    
    //when
    let _ = try! container.resolve() as Service
    
    //then
-    XCTAssertTrue(resolveDependenciesCalled)
-    XCTAssertTrue(originalResolveDependenciesCalled)
+    XCTAssertTrue(resolvingPropertiesCalled)
+    XCTAssertTrue(originalResolvingPropertiesCalled)

    //and when
-    resolveDependenciesCalled = false
-    originalResolveDependenciesCalled = false
+    resolvingPropertiesCalled = false
+    originalResolvingPropertiesCalled = false
    let _ = try! container.resolve(Service.self)
    
    //then
-    XCTAssertTrue(resolveDependenciesCalled)
-    XCTAssertTrue(originalResolveDependenciesCalled)
+    XCTAssertTrue(resolvingPropertiesCalled)
+    XCTAssertTrue(originalResolvingPropertiesCalled)
  }
  
  func testThatItFallbackToDefinitionWithNoTagWhenResolvingInstanceByTypeForwarding() {
-    let def = container.register { ServiceImp1() as Service }
-    container.register { ServiceImp2() as Service }
-    container.register(def, type: NSObject.self)
+    //given
+    container.register { ServiceImp1() as Service }
+      .implements(ForwardedType.self)
    
    //when
-    let service = try! container.resolve(tag: "tag") as NSObject
-    let anyService = try! container.resolve(NSObject.self, tag: "tag")
+    let service = try! container.resolve(tag: "tag") as ForwardedType
+    let anyService = try! container.resolve(ForwardedType.self, tag: "tag")
    
    //then
    XCTAssertTrue(service is ServiceImp1)
    XCTAssertTrue(anyService is ServiceImp1)
  }
  
+  func testThatItCanResolveOptional() {
+    container.register { ServiceImp1() as Service }
+      .implements(ForwardedType.self)
+      .implements(NSObject.self)
+    
+    //when
+    let service = try! container.resolve() as Service?
+    let anyService = try! container.resolve((Service?).self)
+    
+    //then
+    XCTAssertTrue(service is ServiceImp1)
+    XCTAssertTrue(anyService is ServiceImp1)
+
+    //when
+    let forwardedType = try! container.resolve() as ForwardedType?
+    let anyForwardedType = try! container.resolve((ForwardedType?).self)
+    
+    //then
+    XCTAssertTrue(forwardedType is ServiceImp1)
+    XCTAssertTrue(anyForwardedType is ServiceImp1)
+  
+    //when
+    let object = try! container.resolve() as NSObject?
+    let anyObject = try! container.resolve((NSObject?).self)
+    
+    //then
+    XCTAssertTrue(object is ServiceImp1)
+    XCTAssertTrue(anyObject is ServiceImp1)
+  }
+  
  func testThatItFirstUsesTaggedDefinitionWhenResolvingOptional() {
    let expectedTag: DependencyContainer.Tag = .String("tag")
    container.register(tag: expectedTag) { ServiceImp1() as Service }
@@ -212,41 +272,74 @@ class TypeForwardingTests: XCTestCase {
  
  func testThatItThrowsErrorWhenResolvingNotImplementedTypeWithTypeForwarding() {
    //given
-    let def = container.register { ServiceImp1() as Service }
-    container.register(def, type: NSCoder.self)
+    container.register { ServiceImp1() as Service }
+      .implements(ServiceImp2.self)
    
    //then
-    AssertThrows(expression: try container.resolve() as NSCoder)
-    AssertThrows(expression: try container.resolve(NSCoder.self))
+    AssertThrows(expression: try container.resolve() as ServiceImp2) { error in
+      guard case let DipError.invalidType(_, key) = error else { return false }
+      
+      let expectedKey = DefinitionKey(type: ServiceImp2.self, typeOfArguments: Void.self, tag: nil)
+      XCTAssertEqual(key, expectedKey)
+      return true
+    }
+    AssertThrows(expression: try container.resolve(ServiceImp2.self)) { error in
+      guard case let DipError.invalidType(_, key) = error else { return false }
+      
+      let expectedKey = DefinitionKey(type: ServiceImp2.self, typeOfArguments: Void.self, tag: nil)
+      XCTAssertEqual(key, expectedKey)
+      return true
+    }
  }
  
  func testThatItOverridesIfSeveralDefinitionsWithTheSameTagForwardTheSameType() {
-    let def1 = container.register { ServiceImp1() as Service }
-    let def2 = container.register { ServiceImp2() as Service }
-    container.register(def1, type: NSObject.self)
+    let def1 = container.register { ServiceImp1() }
+    let def2 = container.register { ServiceImp2() }
+    
+    //when
+    def1.implements(ForwardedType.self)

-    XCTAssertTrue(try! container.resolve() as NSObject is ServiceImp1)
-    XCTAssertTrue(try! container.resolve(NSObject.self) is ServiceImp1)
+    //then
+    XCTAssertTrue(try! container.resolve() as ForwardedType is ServiceImp1)
+    XCTAssertTrue(try! container.resolve(ForwardedType.self) is ServiceImp1)

    //when
-    container.register(def2, type: NSObject.self)
+    //another definition implements the same type
+    def2.implements(ForwardedType.self)
    
    //then
-    XCTAssertTrue(try! container.resolve() as NSObject is ServiceImp2)
-    XCTAssertTrue(try! container.resolve(NSObject.self) is ServiceImp2)
+    XCTAssertTrue(try! container.resolve() as ForwardedType is ServiceImp2)
+    XCTAssertTrue(try! container.resolve(ForwardedType.self) is ServiceImp2)
    
-    //and given
-    container.register(def2, type: NSObject.self, tag: "tag")
+    //when
+    def1.implements(ForwardedType.self, tag: "tag")

-    XCTAssertTrue(try! container.resolve(tag: "tag") as NSObject is ServiceImp2)
-    XCTAssertTrue(try! container.resolve(NSObject.self, tag: "tag") is ServiceImp2)
+    //then
+    XCTAssertTrue(try! container.resolve(tag: "tag") as ForwardedType is ServiceImp1)
+    XCTAssertTrue(try! container.resolve(ForwardedType.self, tag: "tag") is ServiceImp1)

    //when
-    container.register(def1, type: NSObject.self, tag: "tag")
+    //another definition implements the same type for the same tag
+    def2.implements(ForwardedType.self, tag: "tag")
    
    //then
-    XCTAssertTrue(try! container.resolve(tag: "tag") as NSObject is ServiceImp1)
-    XCTAssertTrue(try! container.resolve(NSObject.self, tag: "tag") is ServiceImp1)
+    XCTAssertTrue(try! container.resolve(tag: "tag") as ForwardedType is ServiceImp2)
+    XCTAssertTrue(try! container.resolve(ForwardedType.self, tag: "tag") is ServiceImp2)
+    
+  }
+  
+  func testThatItDoesNotOverrideIfDefinitionForwardsTheSameTypeWithDifferentTag() {
+    let def1 = container.register { ServiceImp1() }
+    let def2 = container.register { ServiceImp2() }
+
+    //when
+    def1.implements(ForwardedType.self, tag: "tag")
+    //another definition implements the same type for a different tag
+    def2.implements(ForwardedType.self, tag: "anotherTag")
+    
+    //then
+    XCTAssertTrue(try! container.resolve(tag: "tag") as ForwardedType is ServiceImp1)
+    XCTAssertTrue(try! container.resolve(ForwardedType.self, tag: "tag") is ServiceImp1)
  }
  
 }
@@ -24,22 +24,25 @@

 import XCTest

+#if os(Linux)
+  typealias NSObject = AnyObject
+#endif

-func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T) {
+func AssertThrows<T>(_ file: StaticString = #file, line: UInt = #line, expression: @autoclosure () throws -> T) {
  AssertThrows(file, line: line, expression: expression, "")
 }

-func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T, _ message: String) {
+func AssertThrows<T>(_ file: StaticString = #file, line: UInt = #line, expression: @autoclosure () throws -> T, _ message: String) {
  AssertThrows(expression: expression, checkError: { _ in true }, message)
 }

-func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T, checkError: ErrorType -> Bool) {
+func AssertThrows<T>(_ file: StaticString = #file, line: UInt = #line, expression: @autoclosure () throws -> T, checkError: (Error) -> Bool) {
  AssertThrows(file, line: line, expression: expression, checkError: checkError, "")
 }

-func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T, checkError: ErrorType -> Bool, _ message: String) {
+func AssertThrows<T>(_ file: StaticString = #file, line: UInt = #line, expression: @autoclosure () throws -> T, checkError: (Error) -> Bool, _ message: String) {
  do {
-    try expression()
+    let _ = try expression()
    XCTFail(message, file: file, line: line)
  }
  catch {
@@ -47,13 +50,13 @@ func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosur
  }
 }

-func AssertNoThrow<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T) {
+func AssertNoThrow<T>(_ file: StaticString = #file, line: UInt = #line, expression: @autoclosure () throws -> T) {
  AssertNoThrow(file, line: line, expression: expression, "")
 }

-func AssertNoThrow<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T, _ message: String) {
+func AssertNoThrow<T>(_ file: StaticString = #file, line: UInt = #line, expression: @autoclosure () throws -> T, _ message: String) {
  do {
-    try expression()
+    let _ = try expression()
  }
  catch {
    XCTFail(message, file: file, line: line)
@@ -62,17 +65,21 @@ func AssertNoThrow<T>(file: StaticString = #file, line: UInt = #line, @autoclosu

 #if os(Linux)
 import Glibc
-typealias TMain = @convention(c) (UnsafeMutablePointer<Void>) -> UnsafeMutablePointer<Void>
+typealias TMain = @convention(c) (UnsafeMutableRawPointer?) -> UnsafeMutableRawPointer?

-func dispatch_async(block: TMain) {
+private func startThread(_ block: @escaping TMain) -> pthread_t  {
  var pid: pthread_t = 0
  pthread_create(&pid, nil, block, nil)
+  return pid
 }

-func dispatch_sync(block: TMain) -> UnsafeMutablePointer<Void> {
-  var pid: pthread_t = 0
-  var result: UnsafeMutablePointer<Void> = nil
-  pthread_create(&pid, nil, block, nil)
+func dispatch_async(block: @escaping TMain) -> pthread_t {
+  return startThread(block)
+}
+
+func dispatch_sync(block: @escaping TMain) -> UnsafeMutableRawPointer? {
+  var result: UnsafeMutableRawPointer? = UnsafeMutableRawPointer.allocate(bytes: 1, alignedTo: 0)
+  let pid = startThread(block)
  pthread_join(pid, &result)
  return result
 }
@@ -1,13 +1,14 @@
 import XCTest
-@testable import DipTestSuite
+@testable import DipTests

 XCTMain([
-    testCase(DipTests.allTests),
-    testCase(DefinitionTests.allTests),
-    testCase(RuntimeArgumentsTests.allTests),
-    testCase(ComponentScopeTests.allTests),
-    testCase(AutoInjectionTests.allTests),
-    testCase(ThreadSafetyTests.allTests),
-    testCase(AutoWiringTests.allTests),
-    testCase(ContextTests.allTests)
+  testCase(DipTests.allTests),
+  testCase(DefinitionTests.allTests),
+  testCase(RuntimeArgumentsTests.allTests),
+  testCase(ComponentScopeTests.allTests),
+  testCase(AutoInjectionTests.allTests),
+//  testCase(ThreadSafetyTests.allTests),
+  testCase(AutoWiringTests.allTests),
+  testCase(ContextTests.allTests),
+  testCase(TypeForwardingTests.allTests)
 ])
Author	SHA1	Message	Date
Ilya Puchka	142a348b20	removed unneded builds from travis	2018-04-28 20:05:53 +01:00
Ilya Puchka	88f101639d	updated travis config	2018-04-28 19:48:03 +01:00
Ilya Puchka	5e70633ece	bumped swift version to 4.1	2018-04-28 19:43:49 +01:00
Ilya Puchka	af57aa26ed	bumped version to 6.1	2018-04-28 19:41:45 +01:00
Ilya Puchka	6d6d77d603	fixed swift 4.1 warnings	2018-04-28 19:39:46 +01:00
Ilya Puchka	8d2f6ab8fb	Revert #171 (#189 ) * Revert "fix merge conflict" This reverts commit `aff01c541b`. * Revert "Merge branch 'develop' into develop" This reverts commit `a8dd47cee5`, reversing changes made to `9e7bd51bcd`.	2018-04-28 19:21:05 +01:00
Ilya Puchka	2cc5310d4b	Merge pull request #182 from tapsandswipes/develop Fix crash with colaborator containers and weak singletons	2018-02-26 13:25:17 +00:00
Antonio Cabezuelo Vivo	5cb03a11bb	Fix crash with colaborator containers and weak singletons Signed-off-by: Antonio Cabezuelo Vivo <antonio@tapsandswipes.com>	2018-02-12 14:17:31 +01:00
Ilya Puchka	aff01c541b	fix merge conflict	2017-12-12 16:56:23 +01:00
Ilya Puchka	a8dd47cee5	Merge branch 'develop' into develop	2017-12-12 16:51:32 +01:00
Ilya Puchka	12738a665f	Merge pull request #171 from creditkarma/parent_child_containers Parent child container support for Dip	2017-12-12 16:33:32 +01:00
Oleksa 'trimm' Korin	9e7bd51bcd	Restructured tests, fixed crash	2017-10-30 23:49:44 +02:00
Oleksa 'trimm' Korin	ce394e7d2b	Added reproduction test	2017-10-30 23:26:36 +02:00
Oleksa 'trimm' Korin	cd2c66f4a8	Initial try for collaboration reproduction crash	2017-10-30 20:45:51 +02:00
Ilya Puchka	5464f00bad	Merge pull request #177 from AliSoftware/release/6.0 Release 6.0	2017-10-09 18:12:39 +02:00
Ilya Puchka	5b9cc50190	Merge branch 'master' into release/6.0	2017-09-27 00:35:49 +02:00
Ilya Puchka	a7c8616300	updated changelog	2017-09-27 00:34:57 +02:00
Ilya Puchka	8349fbd8d8	bump version to 6.0	2017-09-26 23:51:08 +02:00
Ilya Puchka	4b1ecbcb8e	removed previously deprecated method	2017-09-26 23:50:56 +02:00
Ilya Puchka	2f0e1fdb10	Merge pull request #176 from AliSoftware/swift4 Swift 4 migration	2017-09-26 23:45:25 +02:00
Ilya Puchka	4a8a1daeca	swift version settings update	2017-09-21 22:26:19 +02:00
Ilya Puchka	56554147cb	travis update	2017-09-16 19:36:07 +02:00
Ilya Puchka	a554454afe	fixed failing tests	2017-09-16 19:24:15 +02:00
Ilya Puchka	dde2e98953	project settings updated and warnings fixed	2017-09-16 18:52:58 +02:00
Ilya Puchka	a2c04ed61e	migrate tests	2017-09-16 18:39:12 +02:00
Ilya Puchka	c64cf720b8	swift 4 migration	2017-09-16 18:04:36 +02:00
John Twigg	3429c6ae0b	Parent child container support for Dip	2017-08-02 10:41:03 -07:00
Ilya Puchka	451fb03bc8	updated changelog	2017-07-30 12:31:06 +02:00
Ilya Puchka	b1ad2a65b2	Merge pull request #169 from AliSoftware/fix-collaboration-sharing-singletons Fix: containers with common collaborator share resolved instances for their own definitions	2017-07-30 12:19:34 +02:00
Ilya Puchka	3f8b83b87c	addet test for peforming autowiring before collaboration	2017-07-29 18:16:54 +02:00
Ilya Puchka	b7bf4904e9	fixed sharing singletons during collaboration	2017-07-29 18:04:28 +02:00
Ilya Puchka	199b1aec8f	Merge pull request #156 from kandelvijaya/improvement/equatableIntoItsExtension Added Equatable conformance on the site of declaration	2017-04-14 23:06:30 +02:00
Ilya Puchka	22d19697f1	Merge pull request #155 from kandelvijaya/patch-1 Playgrounds typo fixes	2017-04-14 23:05:22 +02:00
vkandel	d809177273	moved equatable conformance into Hashable declaration site for DefinationKey	2017-04-09 21:41:10 +02:00
vkandel	420c866726	Added Equatable conformance on the site of declaration	2017-04-09 21:32:31 +02:00
Vijaya Prakash Kandel	6e6cc0b1df	Merge pull request #1 from kandelvijaya/patch-2 Update Contents.swift	2017-04-09 21:04:19 +02:00
Vijaya Prakash Kandel	b71f50cef5	Update Contents.swift	2017-04-09 21:03:56 +02:00
Vijaya Prakash Kandel	462d528474	Update Contents.swift	2017-04-09 21:02:00 +02:00
Ilya Puchka	01c318bd5c	Merge branch 'release/5.1' into develop	2017-04-09 13:20:40 +02:00
Ilya Puchka	a0c890c931	Merge pull request #152 from AliSoftware/release/5.1 Release 5.1	2017-04-09 13:18:56 +02:00
Ilya Puchka	9b2a7918d8	Merge pull request #154 from AliSoftware/auto-wiring-tag-fix Fixed auto-wiring with tagged definitions	2017-04-09 13:08:04 +02:00
Ilya Puchka	218b5a4e9a	disable running tests on watchos on Travis https://github.com/travis-ci/travis-ci/issues/7580	2017-04-09 12:56:22 +02:00
Ilya Puchka	0b221f3368	fixed auto-wiring with tagged definitions	2017-04-09 12:08:48 +02:00
Ilya Puchka	3b943c10ef	Merge branch 'master' into release/5.1	2017-04-06 22:51:21 +02:00
Ilya Puchka	a1da60bd14	updated CHANGELOG, bumped version to 5.1	2017-04-06 22:49:05 +02:00
Ilya Puchka	1825cd7d4c	Merge pull request #151 from AliSoftware/recursive-collaboration Fixed collaboration shared references	2017-04-06 22:40:08 +02:00
Ilya Puchka	e7d8fb41e1	fixed collaboration references, now collaboration is bidirectional	2017-04-06 21:46:08 +02:00
Ilya Puchka	1c398defeb	Merge pull request #150 from AliSoftware/drop-swift2.3 Drop Swift 2.3	2017-04-06 10:49:51 +02:00
Ilya Puchka	ab561546f0	allow spec warnings	2017-04-06 00:43:48 +02:00
Ilya Puchka	c0fb925ab8	updated travis config to build for 3.0 and 3.1 on Linux	2017-04-06 00:00:22 +02:00
Ilya Puchka	80ee4865ce	drop swift 2.3 support	2017-04-01 00:44:10 +02:00
Ilya Puchka	d95df1343e	minor changes for loging function	2017-03-30 19:43:11 +02:00
Ilya Puchka	a83d866cbd	Merge pull request #146 from Pr0Ger/develop Enable use of custom or no logging function	2017-03-30 19:42:25 +02:00
Ilya Puchka	cc1dcba4b9	Merge pull request #145 from DenHeadless/patch-1 Fix swift 3.1 warning	2017-03-30 19:15:19 +02:00
Sergey Petrov	0ceb6a3503	Enable use of custom or no logging function	2017-03-30 17:02:11 +03:00
Denys Telezhkin	4e641a6465	fix swift 3.1 warning	2017-03-30 15:14:27 +03:00
Ilya Puchka	35b6da8556	fixed method name inconsistency	2017-03-10 00:01:37 +01:00
Ilya Puchka	47bc1913e3	Merge pull request #141 from AliSoftware/swift-3.0.2 Swift 3.0.2	2017-01-23 23:24:02 +01:00
Ilya Puchka	24d341503e	swift 3.0.2	2017-01-21 23:04:50 +01:00
Ilya Puchka	3c1331089b	Merge branch 'hotfix/swift2.3-api-diff' into develop	2016-11-01 17:24:21 +03:00
Ilya Puchka	7af8957a01	Merge pull request #135 from AliSoftware/hotfix/swift2.3-api-diff Hotfix - swift2.3 api diff	2016-11-01 18:23:04 +04:00
Ilya Puchka	6b68bea55d	bumped version to 5.0.4	2016-11-01 14:52:37 +03:00
Ilya Puchka	5b2168ecef	fixed broken swift 2.3 api	2016-11-01 14:47:33 +03:00
Ilya Puchka	5eb0eece56	Merge branch 'release/5.0.3' into develop	2016-10-23 23:54:58 +03:00
Ilya Puchka	bdf4477774	Merge pull request #131 from AliSoftware/release/5.0.3 Release 5.0.3	2016-10-24 00:53:32 +04:00
Ilya Puchka	84573d967b	fixed typo	2016-10-23 22:19:19 +03:00
Ilya Puchka	83511d601b	Merge branch 'master' into release/5.0.3	2016-10-21 22:01:23 +04:00
Ilya Puchka	b24734e1c9	fixed access levels	2016-10-13 00:04:31 +02:00
Ilya Puchka	ab9abbe7ab	bumped version to 5.0.3	2016-10-12 23:54:30 +02:00
Ilya Puchka	298cf83be3	updated README and CHANGELOG	2016-10-12 23:54:30 +02:00
Ilya Puchka	455456e817	Merge pull request #127 from AliSoftware/feature/swift-compatibility Swift 2.3 compatibility	2016-10-12 22:59:02 +02:00
Ilya Puchka	905cbdadb0	swift 2.3 compatibility	2016-10-12 20:47:33 +02:00
Ilya Puchka	945caa451a	sligtly improved logging	2016-10-11 13:40:10 +02:00
Ilya Puchka	bfacca6fd0	Merge pull request #129 from AliSoftware/features/fixed-reusing-released-weak-singletons Fixed reusing instances for weak singletons	2016-10-10 15:08:03 +02:00
Ilya Puchka	21673d1f4d	added some tests	2016-10-10 15:07:22 +02:00
Ilya Puchka	65175fa372	fixed reusing instances for weak singletons when underlying instance was already released	2016-10-10 14:02:11 +02:00
Ilya Puchka	99fb4ea081	Merge branch 'release/5.0.2' into develop	2016-10-09 11:34:29 +02:00
Ilya Puchka	a1ece4b0ab	Merge pull request #126 from AliSoftware/release/5.0.2 Release 5.0.2	2016-10-09 11:33:26 +02:00
Ilya Puchka	0b00e13e00	added hasPrefix method for Linux	2016-10-09 00:34:11 +02:00
Ilya Puchka	4aec626a1f	bumped version to 5.0.2	2016-10-08 00:28:05 +02:00
Ilya Puchka	d477392deb	building against 3.0-RELEASE on Travis on Linux	2016-10-08 00:27:51 +02:00
Ilya Puchka	3b23dc1a6f	updated README and CHANGELOG	2016-10-08 00:27:08 +02:00
Ilya Puchka	1d7d0052bf	fixed logging	2016-10-07 22:47:07 +02:00
Ilya Puchka	b1fee5c1db	Merge pull request #125 from AliSoftware/features/swift-3-fixes Fixed Swift 3 issues	2016-10-07 22:13:41 +02:00
Ilya Puchka	e19b65d9c2	fixed issues with reflection of objectes with IUO properties	2016-10-07 19:19:05 +02:00
Ilya Puchka	86bb28da14	Merge branch 'hotfix/pod-fix' into develop	2016-09-16 12:13:30 +02:00
Ilya Puchka	e4545e3ed3	Merge pull request #124 from AliSoftware/hotfix/pod-fix Pod hotfix	2016-09-16 12:13:03 +02:00
Ilya Puchka	52455e663c	bumped version to 5.0.1	2016-09-15 01:37:25 +02:00
Ilya Puchka	7a10d1e46e	fixed linting podspec	2016-09-15 01:00:34 +02:00
Ilya Puchka	e95df85503	Update README.md	2016-09-11 21:18:03 +02:00
Ilya Puchka	a028c05271	Merge branch 'release/5.0.0' into develop	2016-09-11 20:48:56 +02:00
Ilya Puchka	e18a4b131f	Merge pull request #123 from AliSoftware/release/5.0.0 Release 5.0.0	2016-09-11 20:46:31 +02:00
Ilya Puchka	e2799279ab	Updated README	2016-09-11 20:23:40 +02:00
Ilya Puchka	ffb61be63c	Merge branch 'master' into release/5.0.0	2016-09-11 19:29:20 +02:00
Ilya Puchka	0070522341	bumped version to 5.0.0	2016-09-11 19:12:14 +02:00
Ilya Puchka	6842a016bf	updated CHANGELOG	2016-09-11 19:12:14 +02:00
Ilya Puchka	6a6c4a358e	lowercased DipError enum cases	2016-09-11 11:29:44 +02:00
Ilya Puchka	734e67f124	playground fix	2016-09-11 11:15:28 +02:00
Ilya Puchka	aa46ef79b9	removed deprecated APIs	2016-09-11 11:12:14 +02:00
Ilya Puchka	2d177b7aea	lowercased ComponentScope enum cases	2016-09-11 11:07:01 +02:00
Ilya Puchka	3ada18d756	Swift 3 (#120 ) Swift 3 migration	2016-09-11 11:01:02 +02:00
Ilya Puchka	2441f096d6	Merge branch 'feature/single_target' into develop	2016-09-11 02:28:52 +02:00
Ilya Puchka	f9f2777474	single target	2016-09-11 02:25:27 +02:00
Ilya Puchka	1dca889730	Merge pull request #121 from AliSoftware/feature/public-methods-renamed Some public methods renamed	2016-09-11 02:05:15 +02:00
Ilya Puchka	86b23d7260	some public methods renamed	2016-09-11 01:48:57 +02:00
Ilya Puchka	85897e562d	minor playground docs fixes	2016-09-11 00:38:15 +02:00
Ilya Puchka	cdb5f1b901	Merge pull request #118 from AliSoftware/feature/invalid-type-error Added error when resolved instance has mismatched type	2016-09-10 00:10:26 +02:00
Ilya Puchka	03903931f2	Merge pull request #117 from AliSoftware/feature/simplified-auto-wiring Simplified auto-wiring	2016-09-06 23:23:23 +02:00
Ilya Puchka	5016ce860c	added error for resolving instance with mismatched type	2016-09-06 01:25:16 +02:00
Ilya Puchka	8da6be8cad	simplified auto-wiring	2016-09-06 00:40:59 +02:00
Ilya Puchka	873347aed0	fixed constructing context when resolving with containers collaboration	2016-08-29 23:25:02 +02:00
Ilya Puchka	637ff1f916	made Resolvable extension public	2016-08-29 00:41:14 +02:00
Ilya Puchka	c8ddfad188	removed unneeded print	2016-08-27 22:35:19 +02:00
Ilya Puchka	22d73210d0	Merge pull request #116 from AliSoftware/feature/inheritance Properly handling inheritance	2016-08-27 22:31:16 +02:00
Ilya Puchka	feeb7b424a	added resolveDependencies(_:DependencyContainer) method in Resolvable	2016-08-27 22:05:21 +02:00
Ilya Puchka	a6d2a1b1ab	fixed resolving inherited auto-injected dependencies	2016-08-27 21:47:10 +02:00
Ilya Puchka	fa400b9a50	added missing precondition in implements method	2016-08-27 19:36:27 +02:00
Ilya Puchka	771c993d78	Merge pull request #114 from AliSoftware/feature/type-forwarding-improvements Improved type forwarding	2016-08-27 00:25:59 +02:00
Ilya Puchka	10d2560b57	Merge pull request #115 from AliSoftware/feature/registering-explicit-type Optional type parameter in register methods	2016-08-26 22:53:17 +02:00
Ilya Puchka	2887b78944	added optional type parameter to register methods	2016-08-26 21:40:33 +02:00
Ilya Puchka	ed6d45e372	Update README.md	2016-08-26 01:39:25 +02:00
Ilya Puchka	7654737a34	Update README.md	2016-08-26 01:35:47 +02:00
Ilya Puchka	f1d35a6a96	improved type forwarding - removed deprecation annotation for register(_:type:tag:) - added removing previously registered definition when overriding (for proper cleanup) - fixed calling resolvingProperties set after registering type-forwarding - improved tests and code comments	2016-08-26 00:38:01 +02:00
Ilya Puchka	0b355e0fbe	some internal methods renaming	2016-08-26 00:34:09 +02:00
Ilya Puchka	9a8e189ce7	fixed playground	2016-08-21 17:44:44 +02:00
Ilya Puchka	53ff00f00d	Merge pull request #113 from AliSoftware/feature/definition-refactoring Definition refactoring	2016-08-21 00:47:05 +02:00
Ilya Puchka	1c18eab371	type forwarding with `implements` method	2016-08-21 00:11:10 +02:00
Ilya Puchka	cd47d888aa	renamed DefinitionOf to Definition and changed generic parameter type	2016-08-21 00:11:10 +02:00
Ilya Puchka	499b0c1e38	Merge pull request #112 from ilyapuchka/feature/shared-scope-as-default Made shared scope a default argument value for register methods	2016-08-21 00:09:28 +02:00
Ilya Puchka	6536a2182d	Made shared scope a default argument value for register methods	2016-08-20 23:41:13 +02:00
Ilya Puchka	e2ae164d3e	fixed crashing in DipUI (SR-680)	2016-08-20 02:12:31 +02:00
Ilya Puchka	092afd8a8b	Update README.md	2016-08-20 00:58:06 +02:00
Ilya Puchka	a7985f949a	Merge branch 'release/4.6.1' into develop	2016-08-14 22:32:17 +02:00