Merge branch 'reborn'

# Conflicts:
#	Samples/DITranquillityTest/DITranquillityTest.xcodeproj/project.pbxproj
#	Samples/DITranquillityTest/DITranquillityTest/DITranquillityTests_Performance.swift

.travis.yml

@@ -1,31 +1,32 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode8.3
 env:
-  global: 
+  global:
     - LC_CTYPE=en_US.UTF-8
     - LANG=en_US.UTF-8
     - PROJECT=DITranquillity.xcodeproj
     - FRAMEWORK_NAME=DITranquillity
-    - IOS_SDK=iphonesimulator10.0
-    - OSX_SDK=macosx10.12
-    - TVOS_SDK=appletvsimulator10.0
+    - IOS_SDK=iphonesimulator
+    - OSX_SDK=macosx
+    - TVOS_SDK=appletvsimulator
   matrix:
+    - DESTINATION="OS=8.4,name=iPhone 5" SCHEME="DITranquillity-iOS" SDK="$IOS_SDK" PLATFORM="iOS"
     - DESTINATION="OS=9.3,name=iPhone 6" SCHEME="DITranquillity-iOS" SDK="$IOS_SDK" PLATFORM="iOS"
     - DESTINATION="OS=10.0,name=iPhone 6S Plus" SCHEME="DITranquillity-iOS" SDK="$IOS_SDK" PLATFORM="iOS"
     - DESTINATION="arch=x86_64" SCHEME="DITranquillity-OSX" SDK="$OSX_SDK" PLATFORM="Mac"
     - DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="DITranquillity-tvOS" SDK="$TVOS_SDK" PLATFORM="tvOS"
     - DESTINATION="OS=10.0,name=Apple TV 1080p" SCHEME="DITranquillity-tvOS" SDK="$TVOS_SDK" PLATFORM="tvOS"
 before_install:
   - brew update
-  - brew outdated carthage || brew upgrade carthage  
+  - brew outdated carthage || brew upgrade carthage
 before_deploy:
   - carthage build --no-skip-current
   - carthage archive $FRAMEWORK_NAME
 script:
   - open -b com.apple.iphonesimulator # Workaround /~https://github.com/travis-ci/travis-ci/issues/3040
-  - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" 
+  - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION"
     -configuration Release ONLY_ACTIVE_ARCH=NO build
   - pod lib lint --quick;
 notifications:
   email:
-    on_success: never
+    on_success: never

CHANGELOG.md

@@ -1,11 +1,21 @@
-# v2.3.3
-* Fix. improve speed scanner.
+# v3.0.0
+* Added migration documentation.
+* Added code documentation.
+* Accelerated library work 30 times. Now twice as fast swinject.
+* Reduced library size by 40%, but number of parameters is increased.
+* Supported StoryboardReference. Even with many containers.
+* Removed very old manual syntax. Now the library knows entire dependency graph.
+* Improved graph validation. Removed exceptions.
+* Changed concept - container builder removed. Now only container.
+* The library itself understands what you need - nor any `try?` and `.optional`
+* Changed lifetimes on: `single`, `lazySingle`, `weakSingle`, `objectGraph`, `prototype`
+* A single syntax for creating a hierarchy. Now it is `Framework` and `Part`
+* Logging as part of the library.
+* Single cocoapods spec without subspecs.
+* fixed API. No more global syntax changes.
+* But:
+* Removed runtime args - there will be a new more powerful concept.
 
-# v2.3.2
-* Hot fix. incorrect work cache for specific case.
-
-# v2.3.1
-* Fix bug. Supported recursive resolve ViewControllers.
 
 # v2.3.0
 * Fix bug (issue98) into methods initial(useStoryboard:identifier:) and initial(nib:).

DITranquillity.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
 
   s.name         = 'DITranquillity'
-  s.version      = '2.3.3'
+  s.version      = '3.0.0'
   s.summary      = 'DITranquillity - Dependency injection for iOS/macOS/tvOS (Swift) '
 
   s.description  = <<-DESC
-  					DITranquillity - The small library for dependency injection in applications written on pure Swift for iOS/OSX/tvOS. Despite its size, it solves a large enough range of tasks, including Storyboard support. Its main advantage - modularity of support, detailed errors description and lots of opportunities.
+  					DITranquillity - The small library for dependency injection in applications written on pure Swift for iOS/OSX/tvOS. Despite its size, it solves a large enough range of tasks, including Storyboard support. Its main advantage - modularity of support, detailed logs and lots of opportunities.
             DESC
 
   s.homepage     = '/~https://github.com/ivlevAstef/DITranquillity'
@@ -21,74 +21,15 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'
 
-  s.subspec 'Core' do |cores|
-    cores.public_header_files = 'Sources/DITranquillity.h'
-    cores.source_files = 'Sources/Core/**/*.swift', 'Sources/Logger/*.swift', 'Sources/DITranquillity.h'
-  end
+  core_headers = 'Sources/DITranquillity.h'
+  core_sources = 'Sources/**/*.swift'
 
-  s.subspec 'Description' do |dess|
-    dess.source_files = 'Sources/Descriptions/**/*.swift'
-    dess.dependency 'DITranquillity/Core'
-  end
+  s.ios.public_header_files = core_headers, 'Sources/Storyboard/iOS-tvOS/*.h'
+  s.tvos.public_header_files = core_headers, 'Sources/Storyboard/iOS-tvOS/*.h'
+  s.osx.public_header_files = core_headers, 'Sources/Storyboard/OSX/*.h'
 
-  s.subspec 'Component' do |coms|
-    coms.source_files = 'Sources/Component/*.swift'
-    coms.dependency 'DITranquillity/Core'
-    coms.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D ENABLE_DI_COMPONENT' }
-  end
-
-  s.subspec 'Module' do |mods|
-    mods.source_files = 'Sources/Module/*.swift'
-    mods.dependency 'DITranquillity/Component'
-    mods.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D ENABLE_DI_MODULE' }
-  end
-
-  s.subspec 'Storyboard' do |storys|
-    storys.ios.public_header_files = 'Sources/Storyboard/iOS-tvOS/*.h'
-    storys.tvos.public_header_files = 'Sources/Storyboard/iOS-tvOS/*.h'
-    storys.osx.public_header_files = 'Sources/Storyboard/OSX/*.h'
-    storys.ios.source_files = 'Sources/Storyboard/iOS-tvOS/*.{h,m,swift}'
-    storys.tvos.source_files = 'Sources/Storyboard/iOS-tvOS/*.{h,m,swift}'
-    storys.osx.source_files = 'Sources/Storyboard/OSX/*.{h,m,swift}'
-    storys.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'ENABLE_DI_STORYBOARD' }
-    storys.dependency 'DITranquillity/Core'
-  end
-
-  s.subspec 'Logger' do |logs|
-    logs.dependency 'DITranquillity/Core'
-    logs.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D ENABLE_DI_LOGGER' }
-  end
-
-  s.subspec 'Scan' do |scans|
-    scans.source_files = 'Sources/Scan/*.swift'
-  end
-
-  s.subspec 'RuntimeArgs' do |args|
-    args.source_files = 'Sources/RuntimeArgs/*.swift'
-    args.dependency 'DITranquillity/Core'
-  end
-
-  s.subspec 'Modular' do |modls|
-    modls.dependency 'DITranquillity/Core'
-    modls.dependency 'DITranquillity/Logger'
-    modls.dependency 'DITranquillity/Description'
-    modls.dependency 'DITranquillity/Component'
-    modls.dependency 'DITranquillity/Module'
-    modls.dependency 'DITranquillity/Storyboard'
-    modls.dependency 'DITranquillity/Scan'
-  end
-
-  s.subspec 'Full' do |alls|
-    alls.dependency 'DITranquillity/Core'
-    alls.dependency 'DITranquillity/Description'
-    alls.dependency 'DITranquillity/Component'
-    alls.dependency 'DITranquillity/Module'
-    alls.dependency 'DITranquillity/Storyboard'
-    alls.dependency 'DITranquillity/Logger'
-    alls.dependency 'DITranquillity/Scan'
-    alls.dependency 'DITranquillity/RuntimeArgs'
-  end
-
-  s.default_subspecs = 'Core', 'Logger', 'Description', 'Component', 'Storyboard'
+  s.ios.source_files = core_headers, core_sources, 'Sources/Storyboard/iOS-tvOS/*.{h,m}'
+  s.tvos.source_files = core_headers, core_sources, 'Sources/Storyboard/iOS-tvOS/*.{h,m}'
+  s.osx.source_files = core_headers, core_sources, 'Sources/Storyboard/OSX/*.{h,m}'
 
 end