Merge pull request #3 from fraune/rxswift-update

Update to RxSwift 6
fraune · Feb 8, 2024 · 59d4a06 · 59d4a06
2 parents 57220b8 + a193a3c
commit 59d4a06
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Package.swift b/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
         .library(name: "RxBluetoothKit", targets: ["RxBluetoothKit"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.1"))
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0"))
     ],
     targets: [
         .target(

diff --git a/Source/CentralManager.swift b/Source/CentralManager.swift
@@ -298,7 +298,7 @@ public class CentralManager: ManagerType {
                 return (peripheral, error)
             }
         return ensure(.poweredOn, observable: observable)
-                .catchError { error in
+                .catch { error in
                     if error is BluetoothError, let peripheral = peripheral {
                         return .concat(.just((peripheral, error)), .error(error))
                     } else {

diff --git a/Source/Logging.swift b/Source/Logging.swift
@@ -243,8 +243,8 @@ extension Reactive where Base == RxBluetoothKitLog {
      */
     public var log: Observable<String> {
         return RxBluetoothKitLog.subject.asObserver()
-            .observeOn(MainScheduler.instance)
-            .catchErrorJustReturn("")
+            .observe(on: MainScheduler.instance)
+            .catchAndReturn("")
             .share(scope: .whileConnected)
     }
 }