New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ReactiveSwift to 3.0 #1470

Merged
merged 3 commits into from Nov 29, 2017
Jump to file or symbol
Failed to load files and symbols.
+5 −5
Diff settings

Always

Just for now

Next

Bump ReactiveSwift to 3.0

  • Loading branch information...
larryonoff committed Nov 18, 2017
commit 8cfa8982e036a77f019ee1ed4900607fd6802fc0
Copy path View file
@@ -1,4 +1,4 @@
github "Alamofire/Alamofire" ~> 4.1
github "ReactiveCocoa/ReactiveSwift" ~> 2.0
github "ReactiveCocoa/ReactiveSwift" ~> 3.0
github "ReactiveX/RxSwift" ~> 4.0
github "antitypical/Result" ~> 3.1
Copy path View file
@@ -2,6 +2,6 @@ github "Alamofire/Alamofire" "4.5.1"
github "AliSoftware/OHHTTPStubs" "f90c2bb0fb882e43761ab963ca8869d349d2c6e3"
github "Quick/Nimble" "v7.0.2"
github "Quick/Quick" "v1.2.0"
github "ReactiveCocoa/ReactiveSwift" "2.0.1"
github "ReactiveCocoa/ReactiveSwift" "3.0.0"
github "ReactiveX/RxSwift" "4.0.0"
github "antitypical/Result" "3.2.4"
Copy path View file
@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
s.subspec "ReactiveSwift" do |ss|
ss.source_files = "Sources/ReactiveMoya/"
ss.dependency "Moya/Core"
ss.dependency "ReactiveSwift", "~> 2.0"
ss.dependency "ReactiveSwift", "~> 3.0"
end
s.subspec "RxSwift" do |ss|
Copy path View file
@@ -11,7 +11,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "4.1.0")),
.package(url: "https://github.com/antitypical/Result.git", .upToNextMajor(from: "3.0.0")),
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: "2.0.0")),
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: "3.0.0")),
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0")),
],
targets: [
@@ -41,7 +41,7 @@ let package = Package(
exclude: [
"Tests",
"Sources/Supporting Files",
"Examples"])
"Examples"])
],
swiftLanguageVersions: [3, 4]
)
ProTip! Use n and p to navigate between commits in a pull request.