-
Notifications
You must be signed in to change notification settings - Fork 244
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated RxSwift dependency to 4.0, OHTTPStubs to 6.0, fixed blocked u…
…nit test
- Loading branch information
Showing
61 changed files
with
3,050 additions
and
3,043 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
github "ReactiveX/RxSwift" ~> 4.0.0-rc.0 | ||
github "Alamofire/Alamofire" ~> 4.5.1 | ||
github "ReactiveX/RxSwift" ~> 4.0 | ||
github "Alamofire/Alamofire" ~> 4.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
github "Alamofire/Alamofire" "4.5.1" | ||
github "ReactiveX/RxSwift" "4.0.0-beta.0" | ||
github "ReactiveX/RxSwift" "4.0.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,63 +1,41 @@ | ||
PODS: | ||
- Alamofire (4.5.1) | ||
- OHHTTPStubs (5.2.2): | ||
- OHHTTPStubs/Default (= 5.2.2) | ||
- OHHTTPStubs/Core (5.2.2) | ||
- OHHTTPStubs/Default (5.2.2): | ||
- OHHTTPStubs (6.0.0): | ||
- OHHTTPStubs/Default (= 6.0.0) | ||
- OHHTTPStubs/Core (6.0.0) | ||
- OHHTTPStubs/Default (6.0.0): | ||
- OHHTTPStubs/Core | ||
- OHHTTPStubs/JSON | ||
- OHHTTPStubs/NSURLSession | ||
- OHHTTPStubs/OHPathHelpers | ||
- OHHTTPStubs/JSON (5.2.2): | ||
- OHHTTPStubs/JSON (6.0.0): | ||
- OHHTTPStubs/Core | ||
- OHHTTPStubs/NSURLSession (5.2.2): | ||
- OHHTTPStubs/NSURLSession (6.0.0): | ||
- OHHTTPStubs/Core | ||
- OHHTTPStubs/OHPathHelpers (5.2.2) | ||
- OHHTTPStubs/Swift (5.2.2): | ||
- OHHTTPStubs/Core | ||
- RxBlocking (4.0.0-beta.0): | ||
- RxSwift (~> 4.0.0-beta.0) | ||
- RxCocoa (4.0.0-alpha.1): | ||
- RxSwift (~> 4.0.0-alpha.1) | ||
- RxSwift (4.0.0-beta.0) | ||
- OHHTTPStubs/OHPathHelpers (6.0.0) | ||
- OHHTTPStubs/Swift (6.0.0): | ||
- OHHTTPStubs/Default | ||
- RxBlocking (4.0.0): | ||
- RxSwift (~> 4.0) | ||
- RxCocoa (4.0.0): | ||
- RxSwift (~> 4.0) | ||
- RxSwift (4.0.0) | ||
|
||
DEPENDENCIES: | ||
- Alamofire (~> 4.5.1) | ||
- OHHTTPStubs (~> 5.0) | ||
- OHHTTPStubs/Swift (~> 5.0) | ||
- RxBlocking (from `https://github.com/ReactiveX/RxSwift.git`, tag `4.0.0-beta.0`) | ||
- RxCocoa (from `https://github.com/ReactiveX/RxSwift.git`, tag `4.0.0-alpha.1`) | ||
- RxSwift (from `https://github.com/ReactiveX/RxSwift.git`, tag `4.0.0-beta.0`) | ||
|
||
EXTERNAL SOURCES: | ||
RxBlocking: | ||
:git: https://github.com/ReactiveX/RxSwift.git | ||
:tag: 4.0.0-beta.0 | ||
RxCocoa: | ||
:git: https://github.com/ReactiveX/RxSwift.git | ||
:tag: 4.0.0-alpha.1 | ||
RxSwift: | ||
:git: https://github.com/ReactiveX/RxSwift.git | ||
:tag: 4.0.0-beta.0 | ||
|
||
CHECKOUT OPTIONS: | ||
RxBlocking: | ||
:git: https://github.com/ReactiveX/RxSwift.git | ||
:tag: 4.0.0-beta.0 | ||
RxCocoa: | ||
:git: https://github.com/ReactiveX/RxSwift.git | ||
:tag: 4.0.0-alpha.1 | ||
RxSwift: | ||
:git: https://github.com/ReactiveX/RxSwift.git | ||
:tag: 4.0.0-beta.0 | ||
- Alamofire (~> 4.5) | ||
- OHHTTPStubs (~> 6.0) | ||
- OHHTTPStubs/Swift (~> 6.0) | ||
- RxBlocking (~> 4.0) | ||
- RxCocoa (~> 4.0) | ||
- RxSwift (~> 4.0) | ||
|
||
SPEC CHECKSUMS: | ||
Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a | ||
OHHTTPStubs: 34d9d0994e64fcf8552dbfade5ce82ada913ee31 | ||
RxBlocking: 85f1761ea288ccfbd935012c9db5d88e2aeea1ed | ||
RxCocoa: 2eb5f5d79668c61de6c32b636c2a1101a0ba3ca9 | ||
RxSwift: cafebeafadc860ca27a2f3fb3760a8bb8663f6ef | ||
OHHTTPStubs: 752f9b11fd810a15162d50f11c06ff94f8e012eb | ||
RxBlocking: 923c2c8106d80d7c2d6b276afd66ce3b10824836 | ||
RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e | ||
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334 | ||
|
||
PODFILE CHECKSUM: 3ab506c74133643ff1a9a531a1ea2e83e316a64a | ||
PODFILE CHECKSUM: d7b35205168ea946965b5211ad360026b5c2c71f | ||
|
||
COCOAPODS: 1.3.1 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 0 additions & 2 deletions
2
RxAlamofire/Pods/OHHTTPStubs/OHHTTPStubs/Sources/NSURLSession/NSURLRequest+HTTPBodyTesting.m
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
87 changes: 44 additions & 43 deletions
87
RxAlamofire/Pods/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
RxAlamofire/Pods/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.