CentralManager is Sendable

Author: klundberg

Sources/CombineCoreBluetooth/CentralManager/Interface+CentralManager.swift

@@ -1,29 +1,28 @@
-import Combine
-import CoreBluetooth
+@preconcurrency import Combine
 import Foundation
 
-public struct CentralManager {
+public struct CentralManager: Sendable {
 #if os(macOS) && !targetEnvironment(macCatalyst)
   public typealias Feature = Never
 #else
   public typealias Feature = CBCentralManager.Feature
 #endif
   let delegate: Delegate?
 
-  let _state: () -> CBManagerState
-  let _authorization: () -> CBManagerAuthorization
-  let _isScanning: () -> Bool
+  let _state: @Sendable () -> CBManagerState
+  let _authorization: @Sendable () -> CBManagerAuthorization
+  let _isScanning: @Sendable () -> Bool
 
-  let _supportsFeatures: (_ feature: Feature) -> Bool
+  let _supportsFeatures: @Sendable (_ feature: Feature) -> Bool
 
-  let _retrievePeripheralsWithIdentifiers: ([UUID]) -> [Peripheral]
-  let _retrieveConnectedPeripheralsWithServices: ([CBUUID]) -> [Peripheral]
-  let _scanForPeripheralsWithServices: (_  serviceUUIDs: [CBUUID]?, _ options: ScanOptions?) -> Void
-  let _stopScan: () -> Void
+  let _retrievePeripheralsWithIdentifiers: @Sendable ([UUID]) -> [Peripheral]
+  let _retrieveConnectedPeripheralsWithServices: @Sendable ([CBUUID]) -> [Peripheral]
+  let _scanForPeripheralsWithServices: @Sendable (_  serviceUUIDs: [CBUUID]?, _ options: ScanOptions?) -> Void
+  let _stopScan: @Sendable () -> Void
 
-  let _connectToPeripheral: (Peripheral, _ options: PeripheralConnectionOptions?) -> Void
-  let _cancelPeripheralConnection: (_ peripheral: Peripheral) -> Void
-  let _registerForConnectionEvents: (_ options: [CBConnectionEventMatchingOption : Any]?) -> Void
+  let _connectToPeripheral: @Sendable (Peripheral, _ options: PeripheralConnectionOptions?) -> Void
+  let _cancelPeripheralConnection: @Sendable (_ peripheral: Peripheral) -> Void
+  let _registerForConnectionEvents: @Sendable (_ options: [CBConnectionEventMatchingOption : Any]?) -> Void
 
   public let didUpdateState: AnyPublisher<CBManagerState, Never>
   public let willRestoreState: AnyPublisher<[String: Any], Never>
@@ -173,7 +172,7 @@ public struct CentralManager {
   }
 
   @objc(CCBCentralManagerDelegate)
-  class Delegate: NSObject {
+  final class Delegate: NSObject, Sendable {
     let didUpdateState: PassthroughSubject<CBManagerState, Never> = .init()
     let willRestoreState: PassthroughSubject<[String: Any], Never> = .init()
     let didConnectPeripheral: PassthroughSubject<Peripheral, Never> = .init()

Sources/CombineCoreBluetooth/CentralManager/Live+CentralManager.swift

@@ -1,5 +1,5 @@
 import Combine
-import CoreBluetooth
+@preconcurrency import CoreBluetooth
 import Foundation
 
 extension CentralManager {
@@ -12,9 +12,9 @@ extension CentralManager {
     )
 
 #if os(macOS) && !targetEnvironment(macCatalyst)
-    func supportsFeatures<A>(_ feature: Never) -> A {}
+    @Sendable func supportsFeatures<A>(_ feature: Never) -> A {}
 #else
-    let supportsFeatures = CBCentralManager.supports
+    let supportsFeatures: @Sendable (_ features: CBCentralManager.Feature) -> Bool = { CBCentralManager.supports($0) }
 #endif
 
     return Self.init(
@@ -38,7 +38,7 @@ extension CentralManager {
       _scanForPeripheralsWithServices: { services, options in
         centralManager.scanForPeripherals(withServices: services, options: options?.dictionary)
       },
-      _stopScan: centralManager.stopScan,
+      _stopScan: { centralManager.stopScan() },
       _connectToPeripheral: { (peripheral, options) in
         centralManager.connect(peripheral.rawValue!, options: options?.dictionary)
       },

Sources/CombineCoreBluetooth/CentralManager/Mock+CentralManager.swift

@@ -4,17 +4,17 @@ import CoreBluetooth
 
 extension CentralManager {
   public static func unimplemented(
-    state: @escaping () -> CBManagerState = _Internal._unimplemented("state"),
-    authorization: @escaping () -> CBManagerAuthorization = _Internal._unimplemented("authorization"),
-    isScanning: @escaping () -> Bool = _Internal._unimplemented("isScanning"),
-    supportsFeatures: @escaping (Feature) -> Bool = _Internal._unimplemented("supportsFeatures"),
-    retrievePeripheralsWithIdentifiers: @escaping ([UUID]) -> [Peripheral] = _Internal._unimplemented("retrievePeripheralsWithIdentifiers"),
-    retrieveConnectedPeripheralsWithServices: @escaping ([CBUUID]) -> [Peripheral] = _Internal._unimplemented("retrieveConnectedPeripheralsWithServices"),
-    scanForPeripheralsWithServices: @escaping ([CBUUID]?, ScanOptions?) -> Void = _Internal._unimplemented("scanForPeripheralsWithServices"),
-    stopScanForPeripherals: @escaping () -> Void = _Internal._unimplemented("stopScanForPeripherals"),
-    connectToPeripheral: @escaping (Peripheral, PeripheralConnectionOptions?) -> Void = _Internal._unimplemented("connectToPeripheral"),
-    cancelPeripheralConnection: @escaping (Peripheral) -> Void = _Internal._unimplemented("cancelPeripheralConnection"),
-    registerForConnectionEvents: @escaping ([CBConnectionEventMatchingOption : Any]?) -> Void = _Internal._unimplemented("registerForConnectionEvents"),
+    state: @escaping @Sendable () -> CBManagerState = _Internal._unimplemented("state"),
+    authorization: @escaping @Sendable () -> CBManagerAuthorization = _Internal._unimplemented("authorization"),
+    isScanning: @escaping @Sendable () -> Bool = _Internal._unimplemented("isScanning"),
+    supportsFeatures: @escaping @Sendable (Feature) -> Bool = _Internal._unimplemented("supportsFeatures"),
+    retrievePeripheralsWithIdentifiers: @escaping @Sendable ([UUID]) -> [Peripheral] = _Internal._unimplemented("retrievePeripheralsWithIdentifiers"),
+    retrieveConnectedPeripheralsWithServices: @escaping @Sendable ([CBUUID]) -> [Peripheral] = _Internal._unimplemented("retrieveConnectedPeripheralsWithServices"),
+    scanForPeripheralsWithServices: @escaping @Sendable ([CBUUID]?, ScanOptions?) -> Void = _Internal._unimplemented("scanForPeripheralsWithServices"),
+    stopScanForPeripherals: @escaping @Sendable () -> Void = _Internal._unimplemented("stopScanForPeripherals"),
+    connectToPeripheral: @escaping @Sendable (Peripheral, PeripheralConnectionOptions?) -> Void = _Internal._unimplemented("connectToPeripheral"),
+    cancelPeripheralConnection: @escaping @Sendable (Peripheral) -> Void = _Internal._unimplemented("cancelPeripheralConnection"),
+    registerForConnectionEvents: @escaping @Sendable ([CBConnectionEventMatchingOption : Any]?) -> Void = _Internal._unimplemented("registerForConnectionEvents"),
 
     didUpdateState: AnyPublisher<CBManagerState, Never> = _Internal._unimplemented("didUpdateState"),
     willRestoreState: AnyPublisher<[String: Any], Never> = _Internal._unimplemented("willRestoreState"),