Merge pull request #33 from yoichitgy/support-swinject-2-beta3

Updated Swinject to 2.0.0-beta.3
Swinject · Dec 12, 2016 · 4ab19b7 · 4ab19b7
2 parents 22af572 + 03f8ba4
commit 4ab19b7
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "Swinject/Swinject" "c088d36d3b6082cd07176c19f3e1e9518b240c8c"
+github "Swinject/Swinject" "2.0.0-beta.3"
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
-github "Quick/Quick" "81d2a7bd95ef91e2604ee0431bba6fe59ad662dc"
-github "Quick/Nimble" "220152be528dcc0537764c179c95b8174028c80c"
+github "Quick/Quick" ~> 1.0
+github "Quick/Nimble" ~> 5.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "220152be528dcc0537764c179c95b8174028c80c"
-github "Quick/Quick" "81d2a7bd95ef91e2604ee0431bba6fe59ad662dc"
-github "Swinject/Swinject" "c088d36d3b6082cd07176c19f3e1e9518b240c8c"
+github "Quick/Nimble" "v5.1.1"
+github "Quick/Quick" "v1.0.0"
+github "Swinject/Swinject" "2.0.0-beta.3"
 github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/Swinject b/Carthage/Checkouts/Swinject
diff --git a/Sources/SwinjectStoryboardOption.swift b/Sources/SwinjectStoryboardOption.swift
@@ -9,14 +9,14 @@
 import Swinject
 
 #if os(iOS) || os(OSX) || os(tvOS)
-internal struct SwinjectStoryboardOption: ServiceKeyOptionType {
+internal struct SwinjectStoryboardOption: ServiceKeyOption {
     internal let controllerType: String
 
     internal init(controllerType: Container.Controller.Type) {
         self.controllerType = String(reflecting: controllerType)
     }
 
-    internal func isEqualTo(_ another: ServiceKeyOptionType) -> Bool {
+    internal func isEqualTo(_ another: ServiceKeyOption) -> Bool {
         guard let another = another as? SwinjectStoryboardOption else {
             return false
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "Swinject/Swinject" "c088d36d3b6082cd07176c19f3e1e9518b240c8c"
		github "Swinject/Swinject" "2.0.0-beta.3"
+3 −1		.gitignore
+0 −1		.ruby-version
+1 −1		.swift-version
+3 −3		.travis.yml
+8 −0		CONTRIBUTING.md
+1 −1		Gemfile
+28 −26		Gemfile.lock
+29 −4		Nimble.podspec
+126 −20		Nimble.xcodeproj/project.pbxproj
+2 −2		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+2 −1		Package.swift
+112 −9		README.md
+3 −0		Sources/Lib/CwlPreconditionTesting/CwlCatchException/.gitignore
+30 −0		Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.h
+35 −0		Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.m
+32 −0		Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/CwlCatchException.swift
+28 −0		Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/Info.plist
+76 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift
+61 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.h
+50 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m
+194 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift
+100 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift
+63 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift
+28 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Info.plist
+537 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.c
+298 −0		Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h
+80 −0		Sources/Lib/CwlPreconditionTesting/README.md
+2 −2		Sources/Nimble/Adapters/NimbleEnvironment.swift
+7 −2		Sources/Nimble/DSL+Wait.swift
+1 −2		Sources/Nimble/DSL.swift
+0 −19		Sources/Nimble/LinuxSupport.swift
+2 −4		Sources/Nimble/Matchers/AsyncMatcherWrapper.swift
+1 −1		Sources/Nimble/Matchers/BeLessThan.swift
+4 −4		Sources/Nimble/Matchers/BeLogical.swift
+10 −2		Sources/Nimble/Matchers/BeginWith.swift
+12 −4		Sources/Nimble/Matchers/EndWith.swift
+2 −2		Sources/Nimble/Matchers/Match.swift
+18 −18		Sources/Nimble/Matchers/MatcherProtocols.swift
+55 −0		Sources/Nimble/Matchers/ThrowAssertion.swift
+7 −0		Sources/Nimble/Nimble.h
+23 −12		Sources/Nimble/Utils/Async.swift
+12 −5		Sources/Nimble/Utils/Errors.swift
+263 −31		Sources/NimbleObjectiveC/DSL.h
+14 −8		Sources/NimbleObjectiveC/DSL.m
+2 −2		Tests/LinuxMain.swift
+3 −7		Tests/NimbleTests/AsynchronousTest.swift
+9 −3		Tests/NimbleTests/Helpers/utils.swift
+0 −12		Tests/NimbleTests/LinuxSupport.swift
+12 −14		Tests/NimbleTests/Matchers/BeCloseToTest.swift
+2 −0		Tests/NimbleTests/Matchers/BeginWithTest.swift
+5 −0		Tests/NimbleTests/Matchers/EndWithTest.swift
+5 −0		Tests/NimbleTests/Matchers/MatchErrorTest.swift
+0 −3		Tests/NimbleTests/Matchers/MatchTest.swift
+62 −0		Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+0 −1		Tests/NimbleTests/Matchers/ThrowErrorTest.swift
+3 −3		Tests/NimbleTests/SynchronousTests.swift
+0 −6		Tests/NimbleTests/UserDescriptionTest.swift
+11 −0		Tests/NimbleTests/objc/ObjCBeCloseToTest.m
+22 −0		Tests/NimbleTests/objc/ObjCBeFalseTest.m
+32 −2		Tests/NimbleTests/objc/ObjCBeFalsyTest.m
+9 −0		Tests/NimbleTests/objc/ObjCBeGreaterThanOrEqualToTest.m
+8 −0		Tests/NimbleTests/objc/ObjCBeGreaterThanTest.m
+6 −0		Tests/NimbleTests/objc/ObjCBeIdenticalToTest.m
+10 −0		Tests/NimbleTests/objc/ObjCBeLessThanOrEqualToTest.m
+9 −0		Tests/NimbleTests/objc/ObjCBeLessThanTest.m
+22 −0		Tests/NimbleTests/objc/ObjCBeTrueTest.m
+27 −0		Tests/NimbleTests/objc/ObjCBeTruthyTest.m
+59 −0		Tests/NimbleTests/objc/ObjCEqualTest.m
+70 −1		Tests/NimbleTests/objc/ObjCHaveCount.m
+0 −16		circle.yml
+1 −1		script/release
+19 −0		.Package.test.swift
+36 −0		.github/ISSUE_TEMPLATE
+14 −0		.github/PULL_REQUEST_TEMPLATE
+2 −0		.hound.yml
+0 −1		.ruby-version
+1 −1		.swift-version
+12 −0		.swiftlint.yml
+8 −10		.travis.yml
+1 −0		Documentation/README.md
+2 −19		Documentation/en-us/InstallingQuick.md
+6 −3		Documentation/en-us/SettingUpYourXcodeProject.md
+1 −1		Documentation/en-us/SharedExamples.md
+34 −34		Documentation/en-us/TestUsingTestDoubles.md
+78 −0		Documentation/pt-br/BehavioralTesting.md
+39 −0		Documentation/pt-br/README.md
+23 −0		Documentation/zh-cn/MoreResources.md
+100 −0		Documentation/zh-cn/NimbleAssertions.md
+4 −1		Documentation/zh-cn/README.md
+113 −0		Documentation/zh-cn/SharedExamples.md
+131 −0		Documentation/zh-cn/TestUsingTestDoubles.md
+10 −0		Documentation/zh-cn/Troubleshooting.md
+1 −1		Externals/Nimble
+1 −1		Gemfile
+1 −6		Package.swift
+1 −1		Quick.podspec
+453 −61		Quick.xcodeproj/project.pbxproj
+11 −1		Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+19 −9		Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+11 −1		Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+18 −0		README.md
+6 −4		Rakefile
+1 −1		Sources/Quick/Callsite.swift
+2 −2		Sources/Quick/Configuration/Configuration.swift
+2 −2		Sources/Quick/Example.swift
+1 −1		Sources/Quick/ExampleGroup.swift
+1 −1		Sources/Quick/Hooks/ExampleHooks.swift
+2 −1		Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+1 −1		Sources/Quick/QuickSpec.swift
+0 −12		Sources/Quick/String+FileName.swift
+12 −0		Sources/Quick/URL+FileName.swift
+4 −4		Sources/Quick/World.swift
+1 −3		Tests/LinuxMain.swift
+32 −0		Tests/QuickTests/QuickAfterSuiteTests/AfterSuiteTests+ObjC.m
+26 −0		Tests/QuickTests/QuickAfterSuiteTests/AfterSuiteTests.swift
+24 −0		Tests/QuickTests/QuickAfterSuiteTests/Info.plist
+0 −1		Tests/QuickTests/QuickFocusedTests/FocusedTests.swift
+0 −1		Tests/QuickTests/QuickTestHelpers/TestRun.swift
+1 −1		Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+1 −1		Tests/QuickTests/QuickTests/Fixtures/FunctionalTests_SharedExamplesTests_SharedExamples.swift
+5 −5		Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+0 −45		Tests/QuickTests/QuickTests/FunctionalTests/AfterSuiteTests.swift
+5 −5		Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+9 −11		Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+0 −42		Tests/QuickTests/QuickTests/FunctionalTests/ObjC/AfterSuiteTests+ObjC.m
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+1 −1		Tests/QuickTests/QuickTests/Helpers/QuickTestsBridgingHeader.h
+0 −16		circle.yml
+0 −0		script/travis-install-macos
+0 −0		script/travis-script-macos