diff --git a/Package.resolved b/Package.resolved index 6040611..4c8646f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/ReactiveX/RxSwift", "state": { "branch": null, - "revision": "cec68169a048a079f461ba203fe85636548d7a89", - "version": "5.1.3" + "revision": "b4307ba0b6425c0ba4178e138799946c3da594f8", + "version": "6.5.0" } }, { diff --git a/Package.swift b/Package.swift index 27aaba1..fd29f55 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "ReactiveAPIExt", targets: ["ReactiveAPIExt"]), ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift", from: "5.1.0"), + .package(url: "https://github.com/ReactiveX/RxSwift", from: "6.5.0"), .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.0.0"), .package(name: "Swifter", url: "https://github.com/httpswift/swifter", from: "1.5.0"), ], diff --git a/Sources/ReactiveAPI/ReactiveAPIProtocol.swift b/Sources/ReactiveAPI/ReactiveAPIProtocol.swift index 0533991..65d7b56 100755 --- a/Sources/ReactiveAPI/ReactiveAPIProtocol.swift +++ b/Sources/ReactiveAPI/ReactiveAPIProtocol.swift @@ -41,7 +41,7 @@ extension ReactiveAPIProtocol { return Observable.just(data) } .asSingle() - .catchError { error -> Single in + .catch { error -> Single in guard let authenticator = self.authenticator, case let ReactiveAPIError.httpError(request, response, data) = error, diff --git a/Sources/ReactiveAPI/ReactiveAPITokenAuthenticator.swift b/Sources/ReactiveAPI/ReactiveAPITokenAuthenticator.swift index f81e030..edc7cce 100644 --- a/Sources/ReactiveAPI/ReactiveAPITokenAuthenticator.swift +++ b/Sources/ReactiveAPI/ReactiveAPITokenAuthenticator.swift @@ -97,7 +97,7 @@ public class ReactiveAPITokenAuthenticator: ReactiveAPIAuthenticator { setNewToken(token: nil, isRenewing: true) return renewToken() - .catchError { error in + .catch { error in self.logger?.log(state: .tokenRenewError(error)) self.setNewToken(token: nil, isRenewing: false) let httpError = ReactiveAPIError.httpError(request: request, response: response, data: data ?? Data()) diff --git a/Tests/ReactiveAPITests/RedirectTests.swift b/Tests/ReactiveAPITests/RedirectTests.swift index 32460c0..8fb2929 100644 --- a/Tests/ReactiveAPITests/RedirectTests.swift +++ b/Tests/ReactiveAPITests/RedirectTests.swift @@ -48,15 +48,15 @@ class RedirectTests: SkyTestCase { // When let call00 = sut.endpoint1().do(onSubscribed: { print("\(Date().dateMillis) Parallel call on \(Thread.current.description)") - }).subscribeOn(queueScheduler00) + }).subscribe(on: queueScheduler00) let call01 = sut.endpoint1().do(onSubscribed: { print("\(Date().dateMillis) Parallel call on \(Thread.current.description)") - }).subscribeOn(queueScheduler01) + }).subscribe(on: queueScheduler01) let call02 = sut.endpoint1().do(onSubscribed: { print("\(Date().dateMillis) Parallel call on \(Thread.current.description)") - }).subscribeOn(queueScheduler02) + }).subscribe(on: queueScheduler02) let streamed = try Single.zip(call00, call01, call02).toBlocking().single() diff --git a/Tests/ReactiveAPITests/RefreshTokenTests.swift b/Tests/ReactiveAPITests/RefreshTokenTests.swift index fef1079..ab760fe 100644 --- a/Tests/ReactiveAPITests/RefreshTokenTests.swift +++ b/Tests/ReactiveAPITests/RefreshTokenTests.swift @@ -65,8 +65,8 @@ class RefreshTokenTests: SkyTestCase { // When _ = try sut.login().toBlocking().single() - let endpointCall1 = sut.endpoint1().subscribeOn(ConcurrentDispatchQueueScheduler(queue: DispatchQueue.init(label: "queue1"))) - let endpointCall2 = sut.endpoint2().subscribeOn(ConcurrentDispatchQueueScheduler(queue: DispatchQueue.init(label: "queue2"))) + let endpointCall1 = sut.endpoint1().subscribe(on: ConcurrentDispatchQueueScheduler(queue: DispatchQueue.init(label: "queue1"))) + let endpointCall2 = sut.endpoint2().subscribe(on: ConcurrentDispatchQueueScheduler(queue: DispatchQueue.init(label: "queue2"))) let events = try Single.zip(endpointCall1, endpointCall2).toBlocking().single()