Merge pull request #85 from mdiep/update-reactiveswift

Update ReactiveSwift to 1.1.5 for Xcode 9 support
mdiep · Jul 15, 2017 · 578adae · 578adae
2 parents fd02877 + c88ae1b
commit 578adae
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
-github "ReactiveCocoa/ReactiveSwift" ~> 1.1
+github "ReactiveCocoa/ReactiveSwift" ~> 1.1.5
 github "thoughtbot/Argo" ~> 4.1.2
 github "thoughtbot/Curry" ~> 3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "ReactiveCocoa/ReactiveSwift" "1.1.0"
-github "antitypical/Result" "3.2.1"
+github "ReactiveCocoa/ReactiveSwift" "1.1.5"
+github "antitypical/Result" "3.2.3"
 github "thoughtbot/Argo" "v4.1.2"
 github "thoughtbot/Curry" "v3.0.0"
 github "thoughtbot/Runes" "v4.0.1"
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
diff --git a/Package.swift b/Package.swift
@@ -5,6 +5,6 @@ let package = Package(
     dependencies: [
         .Package(url: "https://github.com/thoughtbot/Argo.git", versions: Version(4, 1, 2)..<Version(4, .max, .max)),
         .Package(url: "https://github.com/thoughtbot/Curry.git", majorVersion: 3),
-        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
+        .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 5)..<Version(1, .max, .max)),
     ]
 )
+2 −2		.Package.test.swift
+0 −1		.gitignore
+15 −11		.jazzy.yaml
+1 −1		.swift-version
+1 −9		.travis.yml
+1 −1		Cartfile
+1 −1		Cartfile.private
+2 −2		Cartfile.resolved
+1 −1		Carthage/Checkouts/Nimble
+1 −1		Carthage/Checkouts/Result
+1 −1		Package.swift
+1 −0		README.md
+2 −2		ReactiveSwift.podspec
+2 −2		Sources/Action.swift
+2 −0		Sources/Atomic.swift
+21 −0		Sources/Deprecations+Removals.swift
+4 −1		Sources/Disposable.swift
+224 −42		Sources/Flatten.swift
+50 −20		Sources/FoundationExtensions.swift
+1 −1		Sources/Info.plist
+5 −3		Sources/Lifetime.swift
+30 −12		Sources/Property.swift
+4 −4		Sources/Reactive.swift
+5 −0		Sources/Scheduler.swift
+13 −4		Sources/Signal.swift
+8 −6		Sources/SignalProducer.swift
+2 −0		Sources/UnidirectionalBinding.swift
+10 −4		Tests/ReactiveSwiftTests/FoundationExtensionsSpec.swift
+1 −1		Tests/ReactiveSwiftTests/Info.plist
+67 −33		Tests/ReactiveSwiftTests/PropertySpec.swift
+1 −1		Tests/ReactiveSwiftTests/SignalProducerSpec.swift
+1 −1		Tests/ReactiveSwiftTests/SignalSpec.swift
+2 −2		script/gen-docs
+1 −1		Result.podspec
+13 −1		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
+7 −4		Result/Result.swift
+8 −5		Result/ResultProtocol.swift
+1 −1		Tests/ResultTests/Info.plist
+21 −0		Tests/ResultTests/ResultTests.swift