Merge branch 'use-swinject-2.0.0-beta.1'

Swinject · Jul 1, 2016 · 5f0af26 · 5f0af26
2 parents cc26bc5 + 6d233a1
commit 5f0af26
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "Swinject/Swinject" "a6059de476d16cc5195e7119f0837d3c4f181cf8"
+github "Swinject/Swinject" "2.0.0-beta.1"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v4.0.1"
+github "Quick/Nimble" "v4.1.0"
 github "Quick/Quick" "v0.9.2"
-github "Swinject/Swinject" "a6059de476d16cc5195e7119f0837d3c4f181cf8"
+github "Swinject/Swinject" "2.0.0-beta.1"
 github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Swinject b/Carthage/Checkouts/Swinject
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "Swinject/Swinject" "a6059de476d16cc5195e7119f0837d3c4f181cf8"
		github "Swinject/Swinject" "2.0.0-beta.1"
+1 −0		.ruby-version
+15 −0		.travis.yml
+2 −3		CONTRIBUTING.md
+4 −0		Gemfile
+63 −0		Gemfile.lock
+1 −1		Nimble.podspec
+77 −73		Nimble.xcodeproj/project.pbxproj
+4 −1		README.md
+1 −1		Sources/Nimble/Adapters/ObjectiveC/NMBExceptionCapture.m
+2 −1		Sources/Nimble/Expectation.swift
+4 −4		Sources/Nimble/Matchers/BeCloseTo.swift
+4 −4		Sources/Nimble/Matchers/Contain.swift
+1 −1		Sources/Nimble/Nimble.h
+51 −0		Tests/Nimble/Matchers/BeCloseToTest.swift
+18 −0		Tests/Nimble/Matchers/ContainTest.swift
+4 −18		script/release
+28 −3		test
+1 −1		.swiftlint.yml
+4 −0		Documentation/README.md
+12 −2		README.md
+1 −1		Sample-iOS.playground/Contents.swift
+2 −25		Sources/Assembler.swift
+0 −64		Sources/Container+Properties.swift
+7 −6		Sources/Container.Arguments.erb
+80 −80		Sources/Container.Arguments.swift
+1 −1		Sources/Info.plist
+0 −80		Sources/JsonPropertyLoader.swift
+0 −44		Sources/PlistPropertyLoader.swift
+0 −40		Sources/PropertyLoaderError.swift
+0 −56		Sources/PropertyLoaderType.swift
+4 −4		Sources/ResolverType.erb
+64 −64		Sources/ResolverType.swift
+3 −3		Sources/SpinLock.swift
+6 −5		Sources/SynchronizedResolver.Arguments.erb
+32 −32		Sources/SynchronizedResolver.Arguments.swift
+1 −1		Swinject.podspec
+0 −122		Swinject.xcodeproj/project.pbxproj
+0 −33		Tests/AssemblerSpec.swift
+0 −8		Tests/BasicAssembly.swift
+8 −8		Tests/ContainerSpec.Arguments.swift
+1 −190		Tests/ContainerSpec.swift
+1 −1		Tests/Info.plist
+0 −29		Tests/JsonPropertyLoaderSpec.swift
+0 −24		Tests/PlistPropertyLoaderSpec.swift
+0 −32		Tests/Properties.swift
+0 −22		Tests/Resources/first.json
+0 −26		Tests/Resources/first.plist
+0 −14		Tests/Resources/invalid.json
+0 −3		Tests/Resources/second.json
+0 −8		Tests/Resources/second.plist