Skip to content

fix(X1Kit.swift): Xcode 13 support #3

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

Open
astromonkee wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(X1Kit.swift): Xcode 13 support #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb33aed
Add `guard` check for descriptor.characteristic for Swift 5.5+
astromonkee Sep 24, 2021
6e842ae
Fix deprecation warning with using `class` keyword
astromonkee Sep 24, 2021
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
13 changes: 9 additions & 4 deletions Sources/X1Kit/X1Kit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import CoreBluetooth
case middle = 2
}

@objc protocol X1KitMouseDelegate: class {
@objc protocol X1KitMouseDelegate: AnyObject {
func connectedStateDidChange(identifier: UUID, isConnected: Bool)
func mouseDidMove(identifier: UUID, deltaX: Int16, deltaY: Int16)
func mouseDown(identifier: UUID, button: X1MouseButton)
Expand Down Expand Up @@ -160,6 +160,11 @@ extension X1Mouse: CBPeripheralDelegate {
}

func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor descriptor: CBDescriptor, error: Error?) {
#if swift(>=5.5)
guard let characteristic = descriptor.characteristic else { return }
#else
let characteristic = descriptor.characteristic
#endif
guard descriptor.uuid == X1Mouse.descriptorReportReference else { return }
guard let value = descriptor.value as? NSData else { return }
guard value.count == 2 else { return } /* report reference is 2 bytes long */
Expand All @@ -169,10 +174,10 @@ extension X1Mouse: CBPeripheralDelegate {
switch reportId {
case X1Mouse.xyReport,
X1Mouse.wheelAndButtonsReport:
peripheral.setNotifyValue(true, for: descriptor.characteristic)
peripheral.setNotifyValue(true, for: characteristic)

if descriptor.characteristic.properties.contains(.notify) {
peripheral.setNotifyValue(true, for: descriptor.characteristic)
if characteristic.properties.contains(.notify) {
peripheral.setNotifyValue(true, for: characteristic)
}

default:
Expand Down