Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support macOS #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support macOS #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ DerivedData

Pods
Carthage
.swiftpm
5 changes: 3 additions & 2 deletions Framework/Source Files/Advertisement/AdvertisementService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ internal final class AdvertisementService: NSObject {
internal var writeCallback: ((Characteristic, Data?) -> ())?

/// Callback called upon upcoming errors.
private var errorHandler: ((AdvertisementError) -> ())?
private var errorHandler: ((AdvertisementError?) -> ())?

/// Starts advertising peripheral with given configuration of services and characteristics.
internal func startAdvertising(_ peripheral: Peripheral<Advertisable>, errorHandler: ((AdvertisementError) -> ())?) {
internal func startAdvertising(_ peripheral: Peripheral<Advertisable>, errorHandler: ((AdvertisementError?) -> ())?) {
self.peripheral = peripheral
self.errorHandler = errorHandler
peripheralManager.startAdvertising(peripheral.advertisementData?.combined())
Expand Down Expand Up @@ -81,6 +81,7 @@ extension AdvertisementService: CBPeripheralManagerDelegate {
return
}
self.peripheral?.configuration.services.map({ $0.assignAdvertisementService() }).forEach(peripheralManager.add(_:))
errorHandler?(nil)
}

/// - SeeAlso: `CBPeripheralManagerDelegate`
Expand Down
2 changes: 1 addition & 1 deletion Framework/Source Files/Advertisement/BluetoothAdvertisement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public final class BluetoothAdvertisement {
/// - errorHandler: an error handler. Will be called only after unsuccessfull advertisement setup.
/// - SeeAlso: `AdvertisementError`
/// - SeeAlso: `Peripheral`
public func advertise(peripheral: Peripheral<Advertisable>, errorHandler: ((AdvertisementError) -> ())?) {
public func advertise(peripheral: Peripheral<Advertisable>, errorHandler: ((AdvertisementError?) -> ())?) {
advertisementService.startAdvertising(peripheral, errorHandler: errorHandler)
}

Expand Down
15 changes: 3 additions & 12 deletions Framework/Source Files/Connection/ConnectionService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,9 @@ extension ConnectionService {

/// Starts connection with passed device. Connection result is passed in handler closure.
internal func connect(_ peripheral: Peripheral<Connectable>, handler: @escaping (Peripheral<Connectable>, ConnectionError?) -> ()) {
if connectionHandler == nil {
connectionHandler = handler
}
do {
try centralManager.validateState()
peripherals.append(peripheral)
reloadScanning()
} catch let error {
if let error = error as? BluetoothError {
handler(peripheral, .bluetoothError(error))
}
}
connectionHandler = handler
peripherals.append(peripheral)
reloadScanning()
}

/// Disconnects given device.
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

let package = Package(
name: "BlueSwift",
platforms: [ .iOS(.v10) ],
platforms: [ .iOS(.v10), .macOS(.v11) ],
products: [
.library(
name: "BlueSwift",
Expand Down