Skip to content

Commit

Permalink
Bump ReactiveSwift to 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
larryonoff committed Mar 18, 2019
1 parent 4480dba commit 65ab233
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Cartfile
@@ -1,4 +1,4 @@
github "Alamofire/Alamofire" ~> 4.1
github "ReactiveCocoa/ReactiveSwift" ~> 4.0
github "ReactiveCocoa/ReactiveSwift" ~> 5.0
github "ReactiveX/RxSwift" ~> 4.0
github "antitypical/Result" ~> 4.0
github "antitypical/Result" ~> 4.1
12 changes: 6 additions & 6 deletions Cartfile.resolved
@@ -1,7 +1,7 @@
github "Alamofire/Alamofire" "4.7.3"
github "Alamofire/Alamofire" "4.8.1"
github "AliSoftware/OHHTTPStubs" "f90c2bb0fb882e43761ab963ca8869d349d2c6e3"
github "Quick/Nimble" "v7.1.3"
github "Quick/Quick" "v1.3.1"
github "ReactiveCocoa/ReactiveSwift" "4.0.0"
github "ReactiveX/RxSwift" "4.3.1"
github "antitypical/Result" "4.0.0"
github "Quick/Nimble" "v7.3.4"
github "Quick/Quick" "v1.3.4"
github "ReactiveCocoa/ReactiveSwift" "5.0.0"
github "ReactiveX/RxSwift" "4.4.2"
github "antitypical/Result" "4.1.0"
4 changes: 2 additions & 2 deletions Moya.podspec
Expand Up @@ -25,14 +25,14 @@ Pod::Spec.new do |s|
s.subspec "Core" do |ss|
ss.source_files = "Sources/Moya/", "Sources/Moya/Plugins/"
ss.dependency "Alamofire", "~> 4.1"
ss.dependency "Result", "~> 4.0"
ss.dependency "Result", "~> 4.1"
ss.framework = "Foundation"
end

s.subspec "ReactiveSwift" do |ss|
ss.source_files = "Sources/ReactiveMoya/"
ss.dependency "Moya/Core"
ss.dependency "ReactiveSwift", "~> 4.0"
ss.dependency "ReactiveSwift", "~> 5.0"
end

s.subspec "RxSwift" do |ss|
Expand Down
24 changes: 12 additions & 12 deletions Package.resolved
Expand Up @@ -6,53 +6,53 @@
"repositoryURL": "https://github.com/Alamofire/Alamofire.git",
"state": {
"branch": null,
"revision": "61a780f3b58ee0d2bb76fdb7b89dbc9751d521d7",
"version": "4.7.3"
"revision": "d82c7943d80785834da4693b92133012626c060b",
"version": "4.8.1"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "9c1379fdcd58c4f2278aea5e029394ba9a2b8f07",
"version": "7.1.3"
"revision": "43304bf2b1579fd555f2fdd51742771c1e4f2b98",
"version": "8.0.1"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "b060679e70d13c3c7dcd124201b5b1b34ce6f340",
"version": "1.3.1"
"revision": "0b4ed6c706dd0cce923b5019a605a9bcc6b1b600",
"version": "2.0.0"
}
},
{
"package": "ReactiveSwift",
"repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
"state": {
"branch": null,
"revision": "4f6a12ae6762e825b0e19a4f7076eafa43847e6e",
"version": "4.0.0"
"revision": "e285cea17cca8e23928d1e85a235638184e39ac9",
"version": "5.0.0"
}
},
{
"package": "Result",
"repositoryURL": "https://github.com/antitypical/Result.git",
"state": {
"branch": null,
"revision": "8fc088dcf72802801efeecba76ea8fb041fb773d",
"version": "4.0.0"
"revision": "2ca499ba456795616fbc471561ff1d963e6ae160",
"version": "4.1.0"
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "faeb158ce76d355f3f9242fdd0258a9face62f37",
"version": "4.2.0"
"revision": "fc6030ea9fe9b8af0351fe195b4095a9f2339757",
"version": "4.4.2"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Expand Up @@ -10,8 +10,8 @@ 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: "4.0.0")),
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: ("4.0.0"))),
.package(url: "https://github.com/antitypical/Result.git", .upToNextMajor(from: "4.1.0")),
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", .upToNextMajor(from: ("5.0.0"))),
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0"))
],
targets: [
Expand Down

0 comments on commit 65ab233

Please sign in to comment.