Merge pull request #33 from PureSwift/feature/embedded

Add Embedded Swift support

.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # [Choice] Swift version: 5.6-focal, 5.5, 5.4, 5.3, 5.2, 5.1, 4.2
-ARG VARIANT=5.7.1-jammy
+ARG VARIANT=6.0.2-jammy
 FROM swift:${VARIANT}
 
 # [Option] Install zsh

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
 		"dockerfile": "Dockerfile",
 		"args": {
 			// Update the VARIANT arg to pick a Swift version 
-			"VARIANT": "5.7.1-jammy",
+			"VARIANT": "6.0.2-jammy",
 			// Options
 			"NODE_VERSION": "lts/*",
 			"UPGRADE_PACKAGES": "true"

.github/workflows/swift.yml

@@ -9,7 +9,7 @@ jobs:
     - name: Install Swift
       uses: slashmo/[email protected]
       with:
-        version: 5.8
+        version: 6.0.2
     - name: Checkout
       uses: actions/checkout@v2
     - name: Swift Version
@@ -25,7 +25,7 @@ jobs:
     name: Linux
     strategy:
       matrix:
-        swift: [5.6.3, 5.7.3, 5.8]
+        swift: [6.0.2]
         os: [ubuntu-20.04]
     runs-on: ${{ matrix.os }}
     steps:

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:6.0
 import PackageDescription
 import class Foundation.ProcessInfo
 
@@ -8,12 +8,6 @@ let libraryType: PackageDescription.Product.Library.LibraryType? = dynamicLibrar
 
 var package = Package(
     name: "GATT",
-    platforms: [
-        .macOS(.v10_15),
-        .iOS(.v13),
-        .watchOS(.v6),
-        .tvOS(.v13),
-    ],
     products: [
         .library(
             name: "GATT",
@@ -22,13 +16,14 @@ var package = Package(
         ),
         .library(
             name: "DarwinGATT",
+            type: libraryType,
             targets: ["DarwinGATT"]
         )
     ],
     dependencies: [
         .package(
             url: "https://github.com/PureSwift/Bluetooth.git",
-            .upToNextMajor(from: "6.0.0")
+            branch: "master"
         )
     ],
     targets: [
@@ -53,7 +48,7 @@ var package = Package(
                     name: "BluetoothHCI",
                     package: "Bluetooth",
                     condition: .when(platforms: [.macOS, .linux])
-                ),
+                )
             ]
         ),
         .target(
@@ -65,7 +60,8 @@ var package = Package(
                     package: "Bluetooth",
                     condition: .when(platforms: [.macOS])
                 )
-            ]
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
         ),
         .testTarget(
             name: "GATTTests",
@@ -90,7 +86,8 @@ var package = Package(
                     package: "Bluetooth",
                     condition: .when(platforms: [.macOS, .linux])
                 )
-            ]
+            ],
+            swiftSettings: [.swiftLanguageMode(.v5)]
         )
     ]
 )

Sources/DarwinGATT/DarwinAdvertisementData.swift

@@ -5,17 +5,18 @@
 //  Created by Alsey Coleman Miller on 7/15/18.
 //
 
-import Foundation
+@preconcurrency import Foundation
 import Bluetooth
 import GATT
 
 #if canImport(CoreBluetooth)
-
 import CoreBluetooth
 
 /// CoreBluetooth Adverisement Data
 public struct DarwinAdvertisementData: AdvertisementData {
 
+    public typealias Data = Foundation.Data
+
     // MARK: - Properties
 
     internal let data: [String: NSObject]
@@ -69,10 +70,10 @@ public extension DarwinAdvertisementData {
     }
 
     /// The Manufacturer data of a peripheral.
-    var manufacturerData: ManufacturerSpecificData? {
+    var manufacturerData: ManufacturerSpecificData<Foundation.Data>? {
 
         guard let manufacturerDataBytes = data[CBAdvertisementDataManufacturerDataKey] as? Data,
-            let manufacturerData = ManufacturerSpecificData(data: manufacturerDataBytes)
+            let manufacturerData = ManufacturerSpecificData<Data>(data: manufacturerDataBytes)
             else { return nil }
 
         return manufacturerData

Sources/DarwinGATT/DarwinAttributes.swift

@@ -20,17 +20,17 @@ internal protocol CoreBluetoothAttributeConvertible {
     func toCoreBluetooth() -> CoreBluetoothPeripheralType
 }
 
-extension GATTAttribute.Service: CoreBluetoothAttributeConvertible {
+extension GATTAttribute.Service: CoreBluetoothAttributeConvertible where Data == Foundation.Data {
 
     func toCoreBluetooth() -> CBMutableService {
 
-        let service = CBMutableService(type: CBUUID(uuid), primary: primary)
+        let service = CBMutableService(type: CBUUID(uuid), primary: isPrimary)
         service.characteristics = characteristics.map { $0.toCoreBluetooth() }
         return service
     }
 }
 
-extension GATTAttribute.Characteristic: CoreBluetoothAttributeConvertible {
+extension GATTAttribute.Characteristic: CoreBluetoothAttributeConvertible where Data == Foundation.Data {
 
     func toCoreBluetooth() -> CBMutableCharacteristic {
 
@@ -53,7 +53,7 @@ extension GATTAttribute.Characteristic: CoreBluetoothAttributeConvertible {
     }
 }
 
-extension GATTAttribute.Descriptor: CoreBluetoothAttributeConvertible {
+extension GATTAttribute.Descriptor: CoreBluetoothAttributeConvertible where Data == Foundation.Data {
 
     func toCoreBluetooth() -> CBMutableDescriptor {
 

Sources/DarwinGATT/DarwinBluetoothState.swift

@@ -13,7 +13,7 @@ import CoreBluetooth
 /// Darwin Bluetooth State
 ///
 /// - SeeAlso: [CBManagerState](https://developer.apple.com/documentation/corebluetooth/cbmanagerstate).
-@objc public enum DarwinBluetoothState: Int {
+@objc public enum DarwinBluetoothState: Int, Sendable, CaseIterable {
 
     case unknown
     case resetting