chore: support RxSwift 6

.gitignore

@@ -2,6 +2,7 @@
 #
 build/
 Build/
+.build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3

.swift-version

@@ -1 +1 @@
-5.0
+5.1

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 6.1.0
+- Updated RxSwift version to 6.x.x
+- Migrated Carthage to SPM
+- Increased deployment target for iOS 13.0, macOS 10.14, watchOS 6.0, tvOS 13.0
+
 # 6.0.1
 - iOS 17 support (#1, #2)
 

Package.swift

@@ -1,18 +1,18 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "RxBluetoothKit",
     platforms: [
-        .macOS(.v10_13), .iOS(.v9), .tvOS(.v11), .watchOS(.v4)
+        .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)
     ],
     products: [
         .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.6.0"))
     ],
     targets: [
         .target(

RxBluetoothKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxBluetoothKit"
-  s.version          = "6.0.1"
+  s.version          = "6.1.0"
   s.summary          = "Bluetooth library for RxSwift"
 
   s.description      = <<-DESC
@@ -13,16 +13,16 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/polidea/RxBluetoothKit.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/polidea'
 
-  s.ios.deployment_target = '9.0'
-  s.osx.deployment_target = '10.13'
-  s.watchos.deployment_target = '4.0'
-  s.tvos.deployment_target = '11.0'
-  s.swift_version = '5.0'
+  s.ios.deployment_target = '13.0'
+  s.osx.deployment_target = '10.15'
+  s.watchos.deployment_target = '6.0'
+  s.tvos.deployment_target = '13.0'
+  s.swift_version = '5.1'
 
   s.requires_arc = true
 
   s.source_files = 'Source/*.swift'
   s.osx.exclude_files = 'Source/RestoredState.swift', 'Source/CentralManager+RestoredState.swift', 'Source/CentralManagerRestoredState.swift'
   s.frameworks   = 'CoreBluetooth'
-  s.dependency 'RxSwift', '~> 5.1'
+  s.dependency 'RxSwift', '~> 6.6'
 end

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 {

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)
     }
 }

Tests/Autogenerated/Mock.generated.swift

@@ -9,7 +9,7 @@ import RxSwift
 
 class CBManagerMock: NSObject {
     var state: CBManagerState!
-    @available(iOS 13.0, macOS 10.15, watchOS 6.0, tvOS 13.0, *) lazy var authorization: CBManagerAuthorization! = nil
+    lazy var authorization: CBManagerAuthorization! = nil
 
     override init() {
     }

Tests/PeripheralTest+CharacteristicOperation.swift

@@ -62,7 +62,7 @@ class PeripheralCharacteristicOperationsTest: BasePeripheralTest {
     }
 
     func testWriteValueWithResponse() throws {
-        let characteristic = XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral)
+        let characteristic = try XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
         let data = Data([0, 1, 2, 3])
 
         let obs: ScheduledObservable<_Characteristic> = testScheduler.scheduleObservable {
@@ -88,7 +88,7 @@ class PeripheralCharacteristicOperationsTest: BasePeripheralTest {
     }
 
     func testWriteValueWithoutResponse() throws {
-        let characteristic = XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
+        let characteristic  = try XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
         let data = Data([0, 1, 2, 3])
         peripheral.peripheral.canSendWriteWithoutResponse = true
 
@@ -107,7 +107,7 @@ class PeripheralCharacteristicOperationsTest: BasePeripheralTest {
     }
 
     func testWriteValueWithoutResponseWithCanSendWriteWithoutResponseCheckDisabled() throws {
-        let characteristic = XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
+        let characteristic  = try XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
         let data = Data([0, 1, 2, 3])
         peripheral.peripheral.canSendWriteWithoutResponse = false
 
@@ -126,7 +126,7 @@ class PeripheralCharacteristicOperationsTest: BasePeripheralTest {
     }
 
     func testWriteValueWithoutResponseWaitingOnReadiness() throws{
-        let characteristic = XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
+        let characteristic  = try XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
         let data = Data([0, 1, 2, 3])
         peripheral.peripheral.canSendWriteWithoutResponse = false
 
@@ -200,7 +200,7 @@ class PeripheralCharacteristicOperationsTest: BasePeripheralTest {
 
      func testObserveCharacteristicIsNotifyingValue() throws {
         let mockCharacteristic = createCharacteristic(uuid: "0x0001", service: service)
-        let characteristic = XCTUnwrap(_Characteristic(characteristic: mockCharacteristic, peripheral: peripheral))
+        let characteristic  = try XCTUnwrap(_Characteristic(characteristic: mockCharacteristic, peripheral: peripheral))
 
         let obs: ScheduledObservable<_Characteristic> = testScheduler.scheduleObservable {
             self.peripheral.observeNotifyValue(for: characteristic)
@@ -221,7 +221,7 @@ class PeripheralCharacteristicOperationsTest: BasePeripheralTest {
 
     func testCharacteristicIsNotifyingValueChange() throws {
         let mockCharacteristic = createCharacteristic(uuid: "0x0001", service: service)
-        let characteristic = XCTUnwrap(_Characteristic(characteristic: mockCharacteristic, peripheral: peripheral))
+        let characteristic  = try XCTUnwrap(_Characteristic(characteristic: mockCharacteristic, peripheral: peripheral))
 
         let obs: ScheduledObservable<_Characteristic> = testScheduler.scheduleObservable {
             characteristic.observeNotifyValue()
@@ -241,7 +241,7 @@ class PeripheralCharacteristicOperationsTest: BasePeripheralTest {
     }
 
     func testReadValue() throws {
-        let characteristic = XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
+        let characteristic  = try XCTUnwrap(_Characteristic(characteristic: createCharacteristic(uuid: "0x0001", service: service), peripheral: peripheral))
 
         let obs: ScheduledObservable<_Characteristic> = testScheduler.scheduleObservable {
             self.peripheral.readValue(for: characteristic).asObservable()

Tests/PeripheralTest+DescriptorsOperation.swift

@@ -64,7 +64,7 @@ class PeripheralDescriptorOperationsTest: BasePeripheralTest {
     }
 
     func testWriteValue() throws {
-        let descriptor = XCTUnwrap(_Descriptor(descriptor: createDescriptor(uuid: "0x0002", characteristic: characteristic), peripheral: peripheral))
+        let descriptor = try XCTUnwrap(_Descriptor(descriptor: createDescriptor(uuid: "0x0002", characteristic: characteristic), peripheral: peripheral))
         let data = Data([0, 1, 2, 3])
 
         let obs: ScheduledObservable<_Descriptor> = testScheduler.scheduleObservable {
@@ -136,7 +136,7 @@ class PeripheralDescriptorOperationsTest: BasePeripheralTest {
     }
 
     func testReadValue() throws {
-        let descriptor = XCTUnwrap(_Descriptor(descriptor: createDescriptor(uuid: "0x0001", characteristic: characteristic), peripheral: peripheral))
+        let descriptor = try XCTUnwrap(_Descriptor(descriptor: createDescriptor(uuid: "0x0001", characteristic: characteristic), peripheral: peripheral))
 
         let obs: ScheduledObservable<_Descriptor> = testScheduler.scheduleObservable {
             self.peripheral.readValue(for: descriptor).asObservable()