Merge pull request #102 from trivago/feature/update-dependencies

Update dependencies
trivago · Feb 8, 2017 · 9805014 · 9805014
2 parents 6d2c18d + a83a8fd
commit 9805014
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Cartfile b/Cartfile
@@ -2,5 +2,5 @@
 github "antitypical/Result" ~> 3.1
 
 # ReactiveCocoa
-github "ReactiveCocoa/ReactiveSwift" "1.0.0"
-github "ReactiveCocoa/ReactiveObjCBridge" "973aad9bfa730a947a33b182e1e67a6cdbef1ca1"
+github "ReactiveCocoa/ReactiveSwift" ~> 1.0.0
+github "ReactiveCocoa/ReactiveObjCBridge" ~> 1.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,4 +1,4 @@
 github "jspahrsummers/xcconfigs" ~> 0.10
 github "Quick/Quick" ~> 0.10.0
 github "Quick/Nimble" ~> 5.1.1
-github "AliSoftware/OHHTTPStubs" "5.2.2-swift3"
+github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,8 +1,8 @@
 github "Quick/Nimble" "v5.1.1"
-github "AliSoftware/OHHTTPStubs" "5.2.2-swift3"
+github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
 github "Quick/Quick" "v0.10.0"
 github "ReactiveCocoa/ReactiveObjC" "2.1.2"
 github "antitypical/Result" "3.1.0"
 github "jspahrsummers/xcconfigs" "0.10"
 github "ReactiveCocoa/ReactiveSwift" "1.0.0"
-github "ReactiveCocoa/ReactiveObjCBridge" "973aad9bfa730a947a33b182e1e67a6cdbef1ca1"
+github "ReactiveCocoa/ReactiveObjCBridge" "1.0"
diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs
+7 −15		.travis.yml
+13 −0		CHANGELOG.md
+8 −8		Examples/ObjC/Podfile.lock
+2 −2		Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+8 −8		Examples/ObjC/Pods/Manifest.lock
+9 −9		Examples/Swift/Podfile.lock
+2 −2		Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+9 −9		Examples/Swift/Pods/Manifest.lock
+1 −1		Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist
+1 −1		OHHTTPStubs.podspec
+28 −28		OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+2 −1		OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata
+0 −2		OHHTTPStubs/Sources/NSURLSession/NSURLRequest+HTTPBodyTesting.m
+44 −43		OHHTTPStubs/Sources/OHHTTPStubs.m
+1 −1		OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h
+0 −7		OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
+0 −0		OHHTTPStubs/UnitTests/Fixtures/MocktailFolder/cards.tail
+0 −0		OHHTTPStubs/UnitTests/Fixtures/MocktailFolder/login.tail
+0 −0		OHHTTPStubs/UnitTests/Fixtures/MocktailFolder/logos_ebay.tail
+0 −0		OHHTTPStubs/UnitTests/Fixtures/login.tail
+0 −0		OHHTTPStubs/UnitTests/Fixtures/login_content_type.tail
+0 −0		OHHTTPStubs/UnitTests/Fixtures/login_content_type_and_headers.tail
+0 −0		OHHTTPStubs/UnitTests/Fixtures/login_headers.tail
+5 −5		OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m
+10 −10		OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m
+7 −7		OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m
+18 −7		OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m
+8 −8		OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m
+0 −0		OHHTTPStubs/UnitTests/Test Suites/OHPathHelpersTests.m
+0 −11		OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift
+9 −6		OHHTTPStubs/UnitTests/Test Suites/TimingTests.m
+5 −5		OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m
+2 −2		README.md
+16 −13		Rakefile