Make Sendable & Codable

Kuniwak · Jul 23, 2024 · 369c91f · 369c91f
1 parent 7487887
commit 369c91f
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/Sources/BLEInternal/HexEncoding.swift b/Sources/BLEInternal/HexEncoding.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 
-public enum HexEncoding: String, Equatable {
+public enum HexEncoding: String, Equatable, Codable, Sendable {
     case upper = "%02hhX"
     case lower = "%02hhx"
 

diff --git a/Sources/BLEInternal/HexEncodingError.swift b/Sources/BLEInternal/HexEncodingError.swift
@@ -1,4 +1,4 @@
-public enum HexEncodingError: Error, Equatable {
+public enum HexEncodingError: Error, Equatable, Codable, Sendable {
     case oddNumberOfCharacters(hexString: String)
     case invalidCharacter(hexString: String)
     case mixedCase(hexString: String)

diff --git a/Sources/BLEInternal/UUIDError.swift b/Sources/BLEInternal/UUIDError.swift
@@ -1,4 +1,4 @@
-public struct UUIDError: Error, Equatable, CustomStringConvertible {
+public struct UUIDError: Error, Equatable, CustomStringConvertible, Codable, Sendable {
     public let description: String
 
     public init(_ description: String) {

diff --git a/Sources/BLEMacro/AssertCCCD.swift b/Sources/BLEMacro/AssertCCCD.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public struct AssertCCCD: Equatable {
+public struct AssertCCCD: Equatable, Codable, Sendable {
     public let description: String?
 
 

diff --git a/Sources/BLEMacro/AssertCharacteristic.swift b/Sources/BLEMacro/AssertCharacteristic.swift
@@ -2,7 +2,7 @@ import struct Foundation.UUID
 import Fuzi
 
 
-public struct AssertCharacteristic: Equatable {
+public struct AssertCharacteristic: Equatable, Codable, Sendable {
     public let description: String?
     public let uuid: UUID
     public let properties: [Property]

diff --git a/Sources/BLEMacro/AssertDescriptor.swift b/Sources/BLEMacro/AssertDescriptor.swift
@@ -2,7 +2,7 @@ import struct Foundation.UUID
 import Fuzi
 
 
-public struct AssertDescriptor: Equatable {
+public struct AssertDescriptor: Equatable, Codable, Sendable {
     public let description: String?
     public let uuid: UUID
 

diff --git a/Sources/BLEMacro/AssertService.swift b/Sources/BLEMacro/AssertService.swift
@@ -3,7 +3,7 @@ import Fuzi
 import BLEInternal
 
 
-public struct AssertService: Equatable {
+public struct AssertService: Equatable, Codable, Sendable {
     public let description: String?
     public let uuid: UUID
     public let assertCharacteristics: [AssertCharacteristic]

diff --git a/Sources/BLEMacro/AssertValue.swift b/Sources/BLEMacro/AssertValue.swift
@@ -2,7 +2,7 @@ import Fuzi
 import BLEInternal
 
 
-public struct AssertValue: Equatable {
+public struct AssertValue: Equatable, Codable, Sendable {
     public let description: String?
     public let value: Value
 

diff --git a/Sources/BLEMacro/Icon.swift b/Sources/BLEMacro/Icon.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public struct Icon: RawRepresentable, Equatable {
+public struct Icon: RawRepresentable, Equatable, Codable, Sendable {
     public typealias RawValue = String
 
     public let rawValue: String

diff --git a/Sources/BLEMacro/Macro.swift b/Sources/BLEMacro/Macro.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public struct Macro: Equatable {
+public struct Macro: Equatable, Codable, Sendable {
     public let name: String
     public let icon: Icon
     public let assertServices: [AssertService]

diff --git a/Sources/BLEMacro/MacroXMLError.swift b/Sources/BLEMacro/MacroXMLError.swift
@@ -1,7 +1,7 @@
 import BLEInternal
 
 
-public enum MacroXMLError: Error, Equatable {
+public enum MacroXMLError: Error, Equatable, Codable, Sendable {
     case bothValueAndValueStringAttributesPresent(element: String?)
     case malformedSleepTimeoutAttribute(element: String?, timeoutString: String)
     case malformedUUIDAttribute(element: String?, attribute: String, uuidString: String)

diff --git a/Sources/BLEMacro/Operation.swift b/Sources/BLEMacro/Operation.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public enum Operation: Equatable {
+public enum Operation: Equatable, Codable, Sendable {
     case write(Write)
     case writeDescriptor(WriteDescriptor)
     case read(Read)

diff --git a/Sources/BLEMacro/Property.swift b/Sources/BLEMacro/Property.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public struct Property: Equatable {
+public struct Property: Equatable, Codable, Sendable {
     public let name: PropertyName
     public let requirement: PropertyRequirement?
 

diff --git a/Sources/BLEMacro/PropertyName.swift b/Sources/BLEMacro/PropertyName.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public struct PropertyName: RawRepresentable, Hashable, Codable {
+public struct PropertyName: RawRepresentable, Hashable, Codable, Sendable {
     public typealias RawValue = String
     public let rawValue: String
 

diff --git a/Sources/BLEMacro/PropertyRequirement.swift b/Sources/BLEMacro/PropertyRequirement.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public struct PropertyRequirement: RawRepresentable, Equatable, Codable {
+public struct PropertyRequirement: RawRepresentable, Equatable, Codable, Sendable {
     public typealias RawValue = String
 
     public let rawValue: String

diff --git a/Sources/BLEMacro/Read.swift b/Sources/BLEMacro/Read.swift
@@ -2,7 +2,7 @@ import struct Foundation.UUID
 import Fuzi
 
 
-public struct Read: Equatable {
+public struct Read: Equatable, Codable, Sendable {
     public let description: String?
     public let serviceUUID: UUID
     public let characteristicUUID: UUID

diff --git a/Sources/BLEMacro/Sleep.swift b/Sources/BLEMacro/Sleep.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public struct Sleep: Equatable {
+public struct Sleep: Equatable, Codable, Sendable {
     public let description: String?
     public let timeout: UInt
 

diff --git a/Sources/BLEMacro/Value.swift b/Sources/BLEMacro/Value.swift
@@ -3,7 +3,7 @@ import Fuzi
 import BLEInternal
 
 
-public enum Value: Equatable {
+public enum Value: Equatable, Codable, Sendable {
     typealias RawValue = String
 
     case data(data: Data, encoding: HexEncoding)

diff --git a/Sources/BLEMacro/WaitForNotification.swift b/Sources/BLEMacro/WaitForNotification.swift
@@ -2,7 +2,7 @@ import struct Foundation.UUID
 import Fuzi
 
 
-public struct WaitForNotification: Equatable {
+public struct WaitForNotification: Equatable, Codable, Sendable {
     public let description: String?
     public let serviceUUID: UUID
     public let characteristicUUID: UUID

diff --git a/Sources/BLEMacro/Write.swift b/Sources/BLEMacro/Write.swift
@@ -2,7 +2,7 @@ import struct Foundation.UUID
 import Fuzi
 
 
-public struct Write: Equatable {
+public struct Write: Equatable, Codable, Sendable {
     public let description: String?
     public let serviceUUID: UUID
     public let characteristicUUID: UUID

diff --git a/Sources/BLEMacro/WriteDescriptor.swift b/Sources/BLEMacro/WriteDescriptor.swift
@@ -2,7 +2,7 @@ import struct Foundation.UUID
 import Fuzi
 
 
-public struct WriteDescriptor: Equatable {
+public struct WriteDescriptor: Equatable, Codable, Sendable {
     public let description: String?
     public let uuid: UUID
     public let serviceUUID: UUID

diff --git a/Sources/BLEMacro/WritingType.swift b/Sources/BLEMacro/WritingType.swift
@@ -1,7 +1,7 @@
 import Fuzi
 
 
-public struct WritingType: RawRepresentable, Equatable {
+public struct WritingType: RawRepresentable, Hashable, Codable, Sendable {
     public typealias RawValue = String
     public let rawValue: String
 

diff --git a/Sources/BLEMacro/XMLWriter.swift b/Sources/BLEMacro/XMLWriter.swift
@@ -1,4 +1,4 @@
-public struct XMLElement {
+public struct XMLElement: Equatable, Codable, Sendable {
     public var tag: String
     public var attributes: [String: String]
     public var children: [XMLElement]
@@ -11,7 +11,7 @@ public struct XMLElement {
 }
 
 
-public class XMLWriter {
+public final class XMLWriter {
     private var stream: TextOutputStream