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

Update carthage dependencies
trivago · Jul 18, 2017 · 65adaa2 · 65adaa2
2 parents b504d80 + c655fe8
commit 65adaa2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,6 +1,6 @@
 # Core
-github "antitypical/Result" ~> 3.1
+github "antitypical/Result" ~> 3.2.2
 
 # ReactiveCocoa
-github "ReactiveCocoa/ReactiveSwift" ~> 1.0.0
-github "ReactiveCocoa/ReactiveObjCBridge" ~> 1.0
+github "ReactiveCocoa/ReactiveSwift" ~> 1.1.5
+github "ReactiveCocoa/ReactiveObjCBridge" ~> 1.0.2
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,8 +1,8 @@
-github "Quick/Nimble" "v5.1.1"
 github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
+github "Quick/Nimble" "v5.1.1"
 github "Quick/Quick" "v0.10.0"
 github "ReactiveCocoa/ReactiveObjC" "2.1.2"
-github "antitypical/Result" "3.1.0"
+github "ReactiveCocoa/ReactiveObjCBridge" "1.0.2"
+github "ReactiveCocoa/ReactiveSwift" "1.1.5"
+github "antitypical/Result" "3.2.3"
 github "jspahrsummers/xcconfigs" "0.10"
-github "ReactiveCocoa/ReactiveSwift" "1.0.0"
-github "ReactiveCocoa/ReactiveObjCBridge" "1.0"
diff --git a/Carthage/Checkouts/ReactiveObjCBridge b/Carthage/Checkouts/ReactiveObjCBridge
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
+0 −1		.swift-version
+5 −8		.travis.yml
+1 −1		Cartfile
+2 −2		Cartfile.private
+4 −4		Cartfile.resolved
+1 −1		Carthage/Checkouts/Nimble
+1 −1		Carthage/Checkouts/Quick
+1 −1		Carthage/Checkouts/ReactiveSwift
+1 −1		Carthage/Checkouts/Result
+26 −0		ReactiveObjCBridge.podspec
+1 −1		ReactiveObjCBridge/Info.plist
+1 −1		ReactiveObjCBridge/ObjectiveCBridging.swift
+2 −2		ReactiveObjCBridgeTests/ObjectiveCBridgingSpec.swift
+3 −6		.Package.test.swift
+1 −1		.gitignore
+15 −11		.jazzy.yaml
+1 −1		.swift-version
+8 −15		.travis.yml
+1 −1		Cartfile
+2 −2		Cartfile.private
+3 −3		Cartfile.resolved
+1 −1		Carthage/Checkouts/Nimble
+1 −1		Carthage/Checkouts/Quick
+1 −1		Carthage/Checkouts/Result
+36 −1		Documentation/FrameworkOverview.md
+1 −4		Package.swift
+32 −15		README.md
+147 −0		ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Contents.swift
+88 −0		ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Sources/FormView.swift
+10 −0		ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Sources/StdlibExtensions.swift
+123 −0		ReactiveSwift-UIExamples.playground/Pages/ValidatingProperty.xcplaygroundpage/Sources/UIKitExtensions.swift
+10 −0		ReactiveSwift-UIExamples.playground/Sources/PlaygroundUtility.swift
+2 −0		ReactiveSwift-UIExamples.playground/contents.xcplayground
+2 −2		ReactiveSwift.playground/contents.xcplayground
+4 −2		ReactiveSwift.podspec
+26 −0		ReactiveSwift.xcodeproj/project.pbxproj
+3 −0		ReactiveSwift.xcworkspace/contents.xcworkspacedata
+12 −13		Sources/Action.swift
+45 −32		Sources/Atomic.swift
+139 −10		Sources/Deprecations+Removals.swift
+6 −3		Sources/Disposable.swift
+6 −0		Sources/EventLogger.swift
+232 −52		Sources/Flatten.swift
+51 −21		Sources/FoundationExtensions.swift
+1 −1		Sources/Info.plist
+32 −8		Sources/Lifetime.swift
+3 −2		Sources/Observer.swift
+99 −26		Sources/Property.swift
+4 −4		Sources/Reactive.swift
+75 −45		Sources/Scheduler.swift
+172 −44		Sources/Signal.swift
+159 −34		Sources/SignalProducer.swift
+32 −52		Sources/UnidirectionalBinding.swift
+327 −0		Sources/ValidatingProperty.swift
+1 −0		Tests/LinuxMain.swift
+55 −2		Tests/ReactiveSwiftTests/ActionSpec.swift
+35 −0		Tests/ReactiveSwiftTests/DeprecationSpec.swift
+14 −4		Tests/ReactiveSwiftTests/FlattenSpec.swift
+10 −4		Tests/ReactiveSwiftTests/FoundationExtensionsSpec.swift
+1 −1		Tests/ReactiveSwiftTests/Info.plist
+47 −0		Tests/ReactiveSwiftTests/LifetimeSpec.swift
+96 −27		Tests/ReactiveSwiftTests/PropertySpec.swift
+261 −1		Tests/ReactiveSwiftTests/SignalProducerLiftingSpec.swift
+123 −1		Tests/ReactiveSwiftTests/SignalProducerSpec.swift
+254 −2		Tests/ReactiveSwiftTests/SignalSpec.swift
+7 −35		Tests/ReactiveSwiftTests/UnidirectionalBindingSpec.swift
+304 −0		Tests/ReactiveSwiftTests/ValidatingPropertySpec.swift
+13 −3		script/gen-docs
+11 −0		.travis.yml
+1 −2		Result.podspec
+13 −110		Result.xcodeproj/project.pbxproj
+1 −1		Result.xcodeproj/xcshareddata/xcschemes/Result-Mac.xcscheme
+1 −1		Result.xcodeproj/xcshareddata/xcschemes/Result-iOS.xcscheme
+1 −1		Result.xcodeproj/xcshareddata/xcschemes/Result-tvOS.xcscheme
+1 −1		Result.xcodeproj/xcshareddata/xcschemes/Result-watchOS.xcscheme
+1 −1		Result/Info.plist
+43 −6		Result/Result.swift
+27 −6		Result/ResultProtocol.swift
+1 −1		Tests/ResultTests/Info.plist
+105 −23		Tests/ResultTests/ResultTests.swift