Skip to content

Commit

Permalink
Update RxSwift dependency to 4.5.0 (#142)
Browse files Browse the repository at this point in the history
Signed-off-by: Ryne Cheow <ryne_cheow@ntucenterprise.sg>
  • Loading branch information
rynecheow authored and freak4pc committed Apr 3, 2019
1 parent 631ce93 commit 8332895
Show file tree
Hide file tree
Showing 96 changed files with 3,029 additions and 3,947 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ All notable changes to this project will be documented in this file.

#### Fixed

## 4.4.1

#### Updated
* RxSwift updated to 4.5.0 to officially support Xcode 10.2.

## 4.4.0

#### Updated
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveX/RxSwift" ~> 4.4
github "ReactiveX/RxSwift" ~> 4.5
github "Alamofire/Alamofire" ~> 4.8
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Alamofire/Alamofire" "4.8.1"
github "ReactiveX/RxSwift" "4.4.2"
github "Alamofire/Alamofire" "4.8.2"
github "ReactiveX/RxSwift" "4.5.0"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/RxSwiftCommunity/RxAlamofire.git",
from: "4.4.0"),
from: "4.4.1"),
],
targets: [
Expand All @@ -207,4 +207,4 @@ To manual install this extension you should get the `RxAlamofire/Source/RxAlamof

## Requirements

RxAlamofire requires Swift 5.0 and dedicated versions of Alamofire (4.8.1) and RxSwift (4.4.2).
RxAlamofire requires Swift 5.0 and dedicated versions of Alamofire (4.8.2) and RxSwift (4.5.0).
6 changes: 3 additions & 3 deletions RxAlamofire.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "RxAlamofire"

s.version = "4.4.0"
s.version = "4.4.1"
s.license = "MIT"
s.summary = "RxSwift wrapper around the elegant HTTP networking in Swift Alamofire"
s.homepage = "https://github.com/RxSwiftCommunity/RxAlamofire"
Expand All @@ -20,14 +20,14 @@ Pod::Spec.new do |s|

s.subspec "Core" do |ss|
ss.source_files = "Sources/*.swift"
ss.dependency "RxSwift", "~> 4.4"
ss.dependency "RxSwift", "~> 4.5"
ss.dependency "Alamofire", "~> 4.8"
ss.framework = "Foundation"
end

s.subspec "RxCocoa" do |ss|
ss.source_files = "Sources/Cocoa/*.swift"
ss.dependency "RxCocoa", "~> 4.4"
ss.dependency "RxCocoa", "~> 4.5"
ss.dependency "RxAlamofire/Core"
end
end
6 changes: 3 additions & 3 deletions RxAlamofire/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use_frameworks!

def common
pod "Alamofire", "~> 4.8"
pod "RxSwift", "~> 4.4"
pod "RxCocoa", "~> 4.4"
pod "RxSwift", "~> 4.5"
pod "RxCocoa", "~> 4.5"
end

target "RxAlamofire-iOS-Example" do
Expand All @@ -28,7 +28,7 @@ target "RxAlamofireTests" do
common
pod "OHHTTPStubs", "~> 7.0"
pod "OHHTTPStubs/Swift", "~> 7.0"
pod "RxBlocking", "~> 4.4"
pod "RxBlocking", "~> 4.5"
end

target "RxAlamofire-tvOS" do
Expand Down
25 changes: 10 additions & 15 deletions RxAlamofire/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,35 @@ PODS:
- OHHTTPStubs/OHPathHelpers (7.0.0)
- OHHTTPStubs/Swift (7.0.0):
- OHHTTPStubs/Default
- RxAtomic (4.4.2)
- RxBlocking (4.4.2):
- RxAtomic (>= 4.4.2, ~> 4.4)
- RxBlocking (4.5.0):
- RxSwift (>= 4.4.2, ~> 4.4)
- RxCocoa (4.4.2):
- RxCocoa (4.5.0):
- RxSwift (>= 4.4.2, ~> 4.4)
- RxSwift (4.4.2):
- RxAtomic (>= 4.4.2, ~> 4.4)
- RxSwift (4.5.0)

DEPENDENCIES:
- Alamofire (~> 4.8)
- OHHTTPStubs (~> 7.0)
- OHHTTPStubs/Swift (~> 7.0)
- RxBlocking (~> 4.4)
- RxCocoa (~> 4.4)
- RxSwift (~> 4.4)
- RxBlocking (~> 4.5)
- RxCocoa (~> 4.5)
- RxSwift (~> 4.5)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Alamofire
- OHHTTPStubs
- RxAtomic
- RxBlocking
- RxCocoa
- RxSwift

SPEC CHECKSUMS:
Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
OHHTTPStubs: ef33a2c353110d306bb98f695435ec56ff5a26c3
RxAtomic: d00e97c10db88c6f08540e0bf2752fc5a2404167
RxBlocking: e96fdda1473d81332a6ed2cface935dc2167a122
RxCocoa: 477990dc3b4c3ff55fb0ac77e1cc06244e0aaec8
RxSwift: 74c29b693c8e42b0f64400e8b06564575742d649
RxBlocking: 79413e4d916f44bb3e113c5b2cc059e36fe58910
RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575

PODFILE CHECKSUM: e01a88856a1eacbfea4ff30ed9cba8f35282731c
PODFILE CHECKSUM: cc3ce8b94377bef0497f6cb01e1e70079c3bad97

COCOAPODS: 1.6.1
25 changes: 10 additions & 15 deletions RxAlamofire/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8332895

Please sign in to comment.