diff --git a/Apexy.podspec b/Apexy.podspec index c89fe9d..3aee01e 100644 --- a/Apexy.podspec +++ b/Apexy.podspec @@ -32,7 +32,7 @@ Pod::Spec.new do |s| s.subspec 'RxSwift' do |sp| sp.source_files = "Sources/ApexyRxSwift/*.swift" sp.dependency "Apexy/Core" - sp.dependency "RxSwift" + sp.dependency "RxSwift", '~>6.0' end s.subspec 'Loader' do |sp| diff --git a/Documentation/reactive.md b/Documentation/reactive.md index 01ce6cc..2fde53e 100644 --- a/Documentation/reactive.md +++ b/Documentation/reactive.md @@ -27,7 +27,7 @@ bookService.fetchBooks() .subscribe(onSuccess: { [weak self] books in self?.activityView.isHidden = true self?.show(books: books) - }, onError: { [weak self] error in + }, onFailure: { [weak self] error in self?.activityView.isHidden = true self?.resultLabel.text = error.localizedDescription }).disposed(by: bag) diff --git a/Documentation/reactive.ru.md b/Documentation/reactive.ru.md index 0ddcc50..cff340f 100644 --- a/Documentation/reactive.ru.md +++ b/Documentation/reactive.ru.md @@ -27,7 +27,7 @@ bookService.fetchBooks() .subscribe(onSuccess: { [weak self] books in self?.activityView.isHidden = true self?.show(books: books) - }, onError: { [weak self] error in + }, onFailure: { [weak self] error in self?.activityView.isHidden = true self?.resultLabel.text = error.localizedDescription }).disposed(by: bag) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 28ed314..1fc56ee 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - Alamofire (5.2.2) - - Apexy (1.2.1): - - Apexy/Alamofire (= 1.2.1) - - Apexy/Alamofire (1.2.1): + - Alamofire (5.4.1) + - Apexy (1.3.0): + - Apexy/Alamofire (= 1.3.0) + - Apexy/Alamofire (1.3.0): - Alamofire (~> 5.0) - Apexy/Core - - Apexy/Core (1.2.1) + - Apexy/Core (1.3.0) DEPENDENCIES: - Apexy (from `../`) @@ -19,8 +19,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Alamofire: 814429acc853c6c54ff123fc3d2ef66803823ce0 - Apexy: 5ec1b45cefe40652354575bad31a73195af59d9f + Alamofire: 2291f7d21ca607c491dd17642e5d40fdcda0e65c + Apexy: f6d81271bf1228dd10ddd86c24fb4f1a0fdc85fd PODFILE CHECKSUM: f86a90e7590ccb3aa7caeceaf315abe256650c66 diff --git a/Package.resolved b/Package.resolved index 18d2052..6143a4d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", "state": { "branch": null, - "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa", - "version": "5.1.1" + "revision": "7e01c05f25c025143073eaa3be3532f9375c614b", + "version": "6.1.0" } } ] diff --git a/Package.swift b/Package.swift index 32024f1..f2aa7e0 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.2.0")), - .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0") + .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.0.0") ], targets: [ .target(name: "ApexyLoader", dependencies: ["Apexy"]), diff --git a/Sources/ApexyRxSwift/Client+RxSwift.swift b/Sources/ApexyRxSwift/Client+RxSwift.swift index 0f30aa2..27bd2a1 100644 --- a/Sources/ApexyRxSwift/Client+RxSwift.swift +++ b/Sources/ApexyRxSwift/Client+RxSwift.swift @@ -5,14 +5,7 @@ public extension Client { func request(_ endpoint: T) -> Single where T: Endpoint { Single.create { single in - let progress = self.request(endpoint) { (result: Result) in - switch result { - case .success(let content): - single(.success(content)) - case .failure(let error): - single(.error(error)) - } - } + let progress = self.request(endpoint) { single($0) } return Disposables.create(with: progress.cancel) } }