Bluetooth Publisher is not public animore

NordicSemiconductor · Oct 6, 2023 · ad66f34 · ad66f34
1 parent 86235e5
commit ad66f34
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Sources/iOS-BLE-Library-Mock/Peripheral/Peripheral.swift b/Sources/iOS-BLE-Library-Mock/Peripheral/Peripheral.swift
@@ -295,12 +295,12 @@ extension Peripheral {
     ///   - characteristic: The characteristic for which to set the notification state.
     /// - Returns: A publisher indicating success or an error.
 	public func setNotifyValue(_ isEnabled: Bool, for characteristic: CBCharacteristic)
-		-> Publishers.BluetoothPublisher<Bool, Error>
+		-> AnyPublisher<Bool, Error>
 	{
 		if characteristic.isNotifying == isEnabled {
 			return Just(isEnabled)
 				.setFailureType(to: Error.self)
-				.bluetooth {}
+                .eraseToAnyPublisher()
 		}
 
 		return peripheralDelegate.notificationStateSubject
@@ -314,5 +314,7 @@ extension Peripheral {
 			.bluetooth {
 				self.peripheral.setNotifyValue(isEnabled, for: characteristic)
 			}
+            .autoconnect()
+            .eraseToAnyPublisher()
 	}
 }
diff --git a/Sources/iOS-BLE-Library-Mock/Utilities/Publishers/Publishers+Bluetooth.swift b/Sources/iOS-BLE-Library-Mock/Utilities/Publishers/Publishers+Bluetooth.swift
@@ -37,7 +37,7 @@ extension Publishers {
          .store(in: &cancellables)
      ```
     */
-	public class BluetoothPublisher<Output, Failure: Error>: ConnectablePublisher {
+	class BluetoothPublisher<Output, Failure: Error>: ConnectablePublisher {
 
 		private let inner: BaseConnectable<Output, Failure>
 

diff --git a/Sources/iOS-BLE-Library/Peripheral/Peripheral.swift b/Sources/iOS-BLE-Library/Peripheral/Peripheral.swift
@@ -314,12 +314,12 @@ extension Peripheral {
     ///   - characteristic: The characteristic for which to set the notification state.
     /// - Returns: A publisher indicating success or an error.
 	public func setNotifyValue(_ isEnabled: Bool, for characteristic: CBCharacteristic)
-		-> Publishers.BluetoothPublisher<Bool, Error>
+		-> AnyPublisher<Bool, Error>
 	{
 		if characteristic.isNotifying == isEnabled {
 			return Just(isEnabled)
 				.setFailureType(to: Error.self)
-				.bluetooth {}
+                .eraseToAnyPublisher()
 		}
 
 		return peripheralDelegate.notificationStateSubject
@@ -333,5 +333,7 @@ extension Peripheral {
 			.bluetooth {
 				self.peripheral.setNotifyValue(isEnabled, for: characteristic)
 			}
+            .autoconnect()
+            .eraseToAnyPublisher()
 	}
 }
diff --git a/Sources/iOS-BLE-Library/Utilities/Publishers/Publishers+Bluetooth.swift b/Sources/iOS-BLE-Library/Utilities/Publishers/Publishers+Bluetooth.swift
@@ -37,7 +37,7 @@ extension Publishers {
          .store(in: &cancellables)
      ```
     */
-	public class BluetoothPublisher<Output, Failure: Error>: ConnectablePublisher {
+	class BluetoothPublisher<Output, Failure: Error>: ConnectablePublisher {
 
 		private let inner: BaseConnectable<Output, Failure>