Merge pull request #148 from PureSwift/feature/wasm

Added WASM support
PureSwift · Nov 17, 2022 · 241f191 · 241f191
2 parents e316b04 + fda397b
commit 241f191
Show file tree

Hide file tree

Showing 26 changed files with 97 additions and 47 deletions.
diff --git a/.github/workflows/swift-wasm.yml b/.github/workflows/swift-wasm.yml
@@ -0,0 +1,14 @@
+name: SwiftWASM
+on: [push]
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    container: ghcr.io/swiftwasm/carton:latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Swift Version
+      run: swift --version
+    - name: Test
+      run: carton test
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -6,8 +6,8 @@ jobs:
     name: Build
     strategy:
       matrix:
-        swift: [5.5.3, 5.6.3, 5.7.1]
-        os: [ubuntu-latest, macos-latest]
+        swift: [5.6.3, 5.7.1]
+        os: [macos-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Install Swift
@@ -22,37 +22,5 @@ jobs:
       run: swift build -c debug
     - name: Build (Release)
       run: swift build -c release
-
-  test-linux:
-    name: Test Linux
-    strategy:
-      matrix:
-        swift: [5.5.3, 5.6.3, 5.7.1]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Install Swift
-      uses: slashmo/[email protected]
-      with:
-        version: ${{ matrix.swift }}
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Swift Version
-      run: swift --version
-    - name: Test (Debug)
-      run: swift test --configuration debug
-    - name: Test (Release)
-      run: swift test --configuration release -Xswiftc -enable-testing
-
-  test-macOS:
-    name: Test macOS
-    runs-on: macos-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Swift Version
-      run: swift --version
     - name: Test (Debug)
-      run: swift test --configuration debug --enable-code-coverage
-    - name: Test (Release)
-      run: swift test --configuration release -Xswiftc -enable-testing --enable-code-coverage
+      run: swift test -c debug
diff --git a/Package.swift b/Package.swift
@@ -68,9 +68,18 @@ var package = Package(
             name: "BluetoothTests",
             dependencies: [
                 "Bluetooth",
-                "BluetoothGAP",
-                "BluetoothGATT",
-                "BluetoothHCI"
+                .target(
+                    name: "BluetoothGAP", 
+                    condition: .when(platforms: [.macOS, .linux, .macCatalyst, .windows])
+                ),
+                .target(
+                    name: "BluetoothGATT", 
+                    condition: .when(platforms: [.macOS, .linux, .macCatalyst, .windows])
+                ),
+                .target(
+                    name: "BluetoothHCI", 
+                    condition: .when(platforms: [.macOS, .linux, .macCatalyst, .windows])
+                )
             ]
         )
     ]

diff --git a/Sources/Bluetooth/BluetoothUUID.swift b/Sources/Bluetooth/BluetoothUUID.swift
@@ -31,11 +31,15 @@ extension BluetoothUUID: CustomStringConvertible {
 
     public var description: String {
 
+        #if os(WASI)
+        return rawValue
+        #else
         if let name = self.name {
             return "\(rawValue) (\(name))"
         } else {
             return rawValue
         }
+        #endif
     }
 }
 

diff --git a/Sources/Bluetooth/CompanyIdentifier.swift b/Sources/Bluetooth/CompanyIdentifier.swift
@@ -32,6 +32,7 @@ public struct CompanyIdentifier: RawRepresentable, Equatable, Hashable {
     }
 }
 
+#if !os(WASI)
 public extension CompanyIdentifier {
 
     /// Bluetooth Company name.
@@ -41,6 +42,7 @@ public extension CompanyIdentifier {
         return Self.companyIdentifiers[rawValue]
     }
 }
+#endif
 
 // MARK: - ExpressibleByIntegerLiteral
 
@@ -56,6 +58,10 @@ extension CompanyIdentifier: ExpressibleByIntegerLiteral {
 extension CompanyIdentifier: CustomStringConvertible {
 
     public var description: String {
+        #if os(WASI)
+        return rawValue.description
+        #else
         return name ?? rawValue.description
+        #endif
     }
 }
diff --git a/Sources/Bluetooth/DefinedUUID.swift b/Sources/Bluetooth/DefinedUUID.swift
@@ -5,6 +5,7 @@
 //  Created by Alsey Coleman Miller on 1/5/18.
 //
 
+#if !os(WASI)
 public extension BluetoothUUID {
 
     /// Bluetooth UUID Definition name.
@@ -665,3 +666,4 @@ internal let definedUUIDs: [UInt16: String] = [
     0xfffe: "Alliance for Wireless Power (A4WP)",
     0xfffd: "Fast IDentity Online Alliance (FIDO)"
 ]
+#endif
diff --git a/Sources/Bluetooth/DefinedUUIDExtension.swift b/Sources/Bluetooth/DefinedUUIDExtension.swift
@@ -5,6 +5,7 @@
 //  Generated by Alsey Coleman Miller on 5/29/20.
 //
 
+#if !os(WASI)
 public extension BluetoothUUID {
 
     /// SDP (`0x0001`)
@@ -3093,3 +3094,4 @@ public extension BluetoothUUID {
     }
 
 }
+#endif
diff --git a/Sources/Bluetooth/Generated/GeneratedCompanyIdentifierNames.swift b/Sources/Bluetooth/Generated/GeneratedCompanyIdentifierNames.swift
@@ -3,7 +3,7 @@
 //  Bluetooth
 //
 
-#if swift(<5.6) || !SWIFTPM_ENABLE_PLUGINS
+#if (swift(<5.6) || !SWIFTPM_ENABLE_PLUGINS) && !os(WASI)
 internal extension CompanyIdentifier {
 
     static let companyIdentifiers: [UInt16: String] = {

diff --git a/Sources/Bluetooth/Generated/GeneratedCompanyIdentifiers.swift b/Sources/Bluetooth/Generated/GeneratedCompanyIdentifiers.swift
@@ -3,7 +3,7 @@
 //  Bluetooth
 //
 
-#if swift(<5.6) || !SWIFTPM_ENABLE_PLUGINS
+#if (swift(<5.6) || !SWIFTPM_ENABLE_PLUGINS) && !os(WASI)
 public extension CompanyIdentifier {
 
     /// Ericsson Technology Licensing (`0`)

diff --git a/Sources/Bluetooth/iBeacon.swift b/Sources/Bluetooth/iBeacon.swift
@@ -20,8 +20,10 @@ import Foundation
 @frozen
 public struct AppleBeacon: Equatable, Hashable {
 
+    #if !os(WASI)
     /// The company that created this specification.
     public static var companyIdentifier: CompanyIdentifier { return .apple }
+    #endif
 
     /// The unique ID of the beacons being targeted.
     ///

diff --git a/Tests/BluetoothTests/AttributeProtocolTests.swift b/Tests/BluetoothTests/AttributeProtocolTests.swift
@@ -6,6 +6,7 @@
 //
 //
 
+#if canImport(BluetoothGATT)
 import XCTest
 import Foundation
 @testable import Bluetooth
@@ -982,3 +983,4 @@ final class AttributeProtocolTests: XCTestCase {
         }
     }
 }
+#endif
diff --git a/Tests/BluetoothTests/BluetoothTests.swift b/Tests/BluetoothTests/BluetoothTests.swift
@@ -9,11 +9,16 @@
 import XCTest
 import Foundation
 @testable import Bluetooth
+#if canImport(BluetoothHCI)
 import BluetoothHCI
+#endif
+#if canImport(BluetoothGATT)
 import BluetoothGATT
+#endif
 
 final class BluetoothTests: XCTestCase {
 
+    #if canImport(BluetoothHCI)
     func testAdvertisingInterval() {
 
         let value = AdvertisingInterval.default
@@ -38,6 +43,7 @@ final class BluetoothTests: XCTestCase {
         XCTAssertEqual("\(AdvertisingInterval.max)", "10240ms")
         XCTAssertEqual("\(AdvertisingInterval.default)", "1280ms")
     }
+    #endif
 
     func testSecurityLevel() {
 
@@ -51,11 +57,14 @@ final class BluetoothTests: XCTestCase {
 
         let company: CompanyIdentifier = 76 // Apple, Inc.
 
+        #if !os(WASI)
         XCTAssertEqual(company.description, "Apple, Inc.")
+        #endif
         XCTAssertNotEqual(company.hashValue, 0)
         XCTAssertNotEqual(company, 77)
     }
 
+    #if canImport(BluetoothHCI)
     func testChannelIdentifier() {
 
         XCTAssertEqual(ChannelIdentifier.att, 4)
@@ -87,6 +96,7 @@ final class BluetoothTests: XCTestCase {
         XCTAssertLessThan(HCIVersion.v4_0, .v4_2)
         XCTAssertGreaterThan(HCIVersion.v5_0, .v4_2)
     }
+    #endif
 
     func testLowEnergyAdvertisingData() {
 
@@ -106,7 +116,8 @@ final class BluetoothTests: XCTestCase {
             XCTAssertNotEqual(advertisingData.hashValue, 0)
         }
     }
-
+
+    #if canImport(BluetoothHCI)
     func testLowEnergyAddressType() {
 
         XCTAssertEqual(LowEnergyAddressType(), .public)
@@ -238,7 +249,9 @@ final class BluetoothTests: XCTestCase {
         XCTAssertEqual(AdvertisingChannelHeader().rawValue, 0)
         XCTAssertEqual(AdvertisingChannelHeader(), .undirectedAdvertising)
     }
+    #endif
 
+    #if canImport(BluetoothGATT)
     func testBitMaskOption() {
 
         do {
@@ -301,6 +314,7 @@ final class BluetoothTests: XCTestCase {
             XCTAssert(set == [.read, .write])
         }
     }
+    #endif
 
     func testClassOfDevice() {
 

diff --git a/Tests/BluetoothTests/BluetoothUUIDTests.swift b/Tests/BluetoothTests/BluetoothUUIDTests.swift
@@ -8,8 +8,12 @@
 
 import XCTest
 import Foundation
+#if canImport(BluetoothGATT)
 import Bluetooth
 @testable import BluetoothGATT
+#else
+@testable import Bluetooth
+#endif
 
 final class BluetoothUUIDTests: XCTestCase {
 
@@ -83,6 +87,7 @@ final class BluetoothUUIDTests: XCTestCase {
         }
     }
 
+    #if canImport(BluetoothGATT)
     func testPrimaryServiceUUID() {
 
         let uuidString = "2800" // big endian representation
@@ -96,6 +101,7 @@ final class BluetoothUUIDTests: XCTestCase {
         XCTAssert(uuid.bigEndian.data == Data([0x28, 0x00]))
         XCTAssertEqual(uuid, BluetoothUUID(data: uuid.data))
     }
+    #endif
 
     func test128BitUUID() {
 
@@ -119,6 +125,7 @@ final class BluetoothUUIDTests: XCTestCase {
 
     }
 
+    #if !os(WASI)
     func testDefinedUUID() {
 
         let uuidString = "FEA9"
@@ -145,6 +152,7 @@ final class BluetoothUUIDTests: XCTestCase {
 
         XCTAssertEqual(uuid, BluetoothUUID(data: uuid.data))
     }
+    #endif
 
     func test32BitUUID() {
 
@@ -154,7 +162,9 @@ final class BluetoothUUIDTests: XCTestCase {
         guard let uuid = BluetoothUUID(rawValue: uuidString)
             else { XCTFail("Could not parse UUID string"); return }
 
+        #if !os(WASI)
         XCTAssertNil(uuid.name)
+        #endif
         XCTAssertEqual(uuid.rawValue, uuidString)
         XCTAssertEqual(uuid.description, uuidString)
         XCTAssertEqual(uuid, uuid)

diff --git a/Tests/BluetoothTests/DarwinTests.swift b/Tests/BluetoothTests/DarwinTests.swift
@@ -6,12 +6,11 @@
 //  Copyright © 2018 PureSwift. All rights reserved.
 //
 
+#if os(macOS)
 import XCTest
 import Foundation
 @testable import Bluetooth
 import BluetoothGAP
-
-#if os(macOS)
 import CoreBluetooth
 import IOKit
 import Darwin

diff --git a/Tests/BluetoothTests/DefinedUUIDTests.swift b/Tests/BluetoothTests/DefinedUUIDTests.swift
@@ -5,6 +5,7 @@
 //  Generated by Alsey Coleman Miller on 5/29/20.
 //
 
+#if !os(WASI)
 import XCTest
 import Foundation
 @testable import Bluetooth
@@ -4953,4 +4954,5 @@ final class DefinedUUIDTests: XCTestCase {
     }
 
 }
+#endif
 // swiftlint:enable type_body_length
diff --git a/Tests/BluetoothTests/GAPTests.swift b/Tests/BluetoothTests/GAPTests.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 PureSwift. All rights reserved.
 //
 
+#if canImport(BluetoothGAP)
 import XCTest
 import Foundation
 import Bluetooth
@@ -978,3 +979,4 @@ internal extension GAPDataDecoder {
         return try decoder.decode(data)
     }
 }
+#endif
diff --git a/Tests/BluetoothTests/GATTCharacteristicTests.swift b/Tests/BluetoothTests/GATTCharacteristicTests.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2018 PureSwift. All rights reserved.
 //
 
+#if canImport(BluetoothGATT)
 import XCTest
 import Foundation
 import Bluetooth
@@ -1449,3 +1450,4 @@ final class GATTCharacteristicTests: XCTestCase {
         XCTAssertEqual(GATTObjectID(data: data), GATTObjectID(data: data))
     }
 }
+#endif