Merge pull request #29 from PureSwift/feature/async

Added Swift Concurrency support

Author: colemancda

.github/workflows/docs.yml

@@ -11,7 +11,7 @@ jobs:
         runs-on: macOS-latest
         steps:
         - name: Checkout
-          uses: actions/checkout@v1
+          uses: actions/checkout@v2
         - name: Xcode Version
           run: |
             xcodebuild -version

.github/workflows/swift.yml

@@ -4,34 +4,13 @@ on: [push]
 
 jobs:
 
-    macOS-swift:
-        name: macOS
-        runs-on: macOS-latest
-        steps:
-        - name: Checkout
-          uses: actions/checkout@v1
-        - name: Xcode Version
-          run: |
-            xcodebuild -version
-            swift --version
-        - name: Swift Version
-          run: swift --version
-        - name: Build (Debug)
-          run: swift build -c debug
-        - name: Build (Release)
-          run: swift build -c release
-        - name: Test (Debug)
-          run: swift test --configuration debug  --enable-test-discovery
-        - name: Test (Release)
-          run: swift test --configuration release -Xswiftc -enable-testing --enable-test-discovery
-
     linux-swift:
         name: Linux x86_64
         runs-on: ubuntu-20.04
         container: swift:5.6.1-focal
         steps:
         - name: Checkout
-          uses: actions/checkout@v1
+          uses: actions/checkout@v2
         - name: Swift Version
           run: swift --version
         - name: Build (Debug)

.gitignore

@@ -40,6 +40,7 @@ Package.pins
 .build/
 GATT.xcodeproj/*
 *.resolved
+.swiftpm
 
 # CocoaPods
 #

Package.swift

@@ -1,10 +1,16 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.5
 import PackageDescription
 
 let libraryType: PackageDescription.Product.Library.LibraryType = .static
 
 let package = Package(
     name: "GATT",
+    platforms: [
+        .macOS(.v10_15),
+        .iOS(.v13),
+        .watchOS(.v6),
+        .tvOS(.v13),
+    ],
     products: [
         .library(
             name: "GATT",
@@ -13,7 +19,6 @@ let package = Package(
         ),
         .library(
             name: "DarwinGATT",
-            type: libraryType,
             targets: ["DarwinGATT"]
         )
     ],
@@ -27,20 +32,58 @@ let package = Package(
         .target(
             name: "GATT",
             dependencies: [
-                "Bluetooth"
+                .product(
+                    name: "Bluetooth",
+                    package: "Bluetooth"
+                ),
+                .product(
+                    name: "BluetoothGATT",
+                    package: "Bluetooth",
+                    condition: .when(platforms: [.macOS, .linux])
+                ),
+                .product(
+                    name: "BluetoothGAP",
+                    package: "Bluetooth",
+                    condition: .when(platforms: [.macOS, .linux])
+                ),
+                .product(
+                    name: "BluetoothHCI",
+                    package: "Bluetooth",
+                    condition: .when(platforms: [.macOS, .linux])
+                ),
             ]
         ),
         .target(
             name: "DarwinGATT",
             dependencies: [
-                "GATT"
+                "GATT",
+                .product(
+                    name: "BluetoothGATT",
+                    package: "Bluetooth",
+                    condition: .when(platforms: [.macOS])
+                )
             ]
         ),
         .testTarget(
             name: "GATTTests",
             dependencies: [
                 "GATT",
-                "Bluetooth"
+                .product(
+                    name: "Bluetooth",
+                    package: "Bluetooth"
+                ),
+                .product(
+                    name: "BluetoothGATT",
+                    package: "Bluetooth"
+                ),
+                .product(
+                    name: "BluetoothGAP",
+                    package: "Bluetooth"
+                ),
+                .product(
+                    name: "BluetoothHCI",
+                    package: "Bluetooth"
+                )
             ]
         )
     ]

[email protected]

@@ -55,7 +55,7 @@ extension GATTAttribute.Characteristic: CoreBluetoothAttributeConvertible {
 
 extension GATTAttribute.Descriptor: CoreBluetoothAttributeConvertible {
 
-    func toCoreBluetooth() -> CBDescriptor {
+    func toCoreBluetooth() -> CBMutableDescriptor {
 
         /*
          Only the Characteristic User Description and Characteristic Presentation Format descriptors are currently supported. The Characteristic Extended Properties and Client Characteristic Configuration descriptors will be created automatically upon publication of the parent service, depending on the properties of the characteristic itself
@@ -66,10 +66,10 @@ extension GATTAttribute.Descriptor: CoreBluetoothAttributeConvertible {
          ```
          */
 
-        guard let descriptor = DarwinDescriptor(uuid: uuid, data: value)
+        guard let descriptor = CBMutableDescriptor(uuid: self.uuid, data: self.value)
             else { fatalError("Unsupported \(CBDescriptor.self) \(uuid)") }
 
-        return CBMutableDescriptor(descriptor)
+        return descriptor
     }
 }
 

Sources/DarwinGATT/DarwinAttributes.swift

@@ -7,8 +7,8 @@
 //
 
 #if canImport(CoreBluetooth)
-
 import Foundation
+import CoreBluetooth
 
 /// Darwin Bluetooth State
 ///
@@ -46,4 +46,17 @@ extension DarwinBluetoothState: CustomStringConvertible {
     }
 }
 
+internal extension CBCentralManager {
+    
+    var _state: DarwinBluetoothState {
+        return unsafeBitCast(self.state, to: DarwinBluetoothState.self)
+    }
+}
+
+internal extension CBPeripheralManager {
+    
+    var _state: DarwinBluetoothState {
+        return unsafeBitCast(self.state, to: DarwinBluetoothState.self)
+    }
+}
 #endif