Skip to content

Commit

Permalink
Bump ReactiveSwift to 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
larryonoff committed Nov 29, 2017
1 parent e729b3a commit 8cfa898
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion Moya.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down Expand Up @@ -41,7 +41,7 @@ let package = Package(
exclude: [
"Tests",
"Sources/Supporting Files",
"Examples"])
"Examples"])
],
swiftLanguageVersions: [3, 4]
)

0 comments on commit 8cfa898

Please sign in to comment.