Merge pull request #116 from PureSwift/feature/swift42

Updated for Swift 4.2
PureSwift · Nov 19, 2018 · 821ead6 · 821ead6
2 parents 157b540 + 8c77ec6
commit 821ead6
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 20 deletions.
diff --git a/[email protected] b/[email protected]
@@ -0,0 +1,15 @@
+// swift-tools-version:4.2
+import PackageDescription
+
+let package = Package(name: "Bluetooth",
+                      products: [
+                        .library(
+                            name: "Bluetooth",
+                            targets: ["Bluetooth"]
+                        )
+                      ],
+                      targets: [
+                        .target(name: "Bluetooth", path: "./Sources"),
+                        .testTarget(name: "BluetoothTests", dependencies: ["Bluetooth"])
+                      ],
+                      swiftLanguageVersions: [.v4, .v4_2])
diff --git a/Sources/ATT.swift b/Sources/ATT.swift
@@ -213,6 +213,8 @@ public enum ATTAttributePermission: UInt8, BitMaskOption {
     case authorized                                 = 0x40
     case noAuthorization                            = 0x80
 
+    #if swift(>=4.2)
+    #else
     public static let allCases: Set<ATTAttributePermission> = [.read,
                                                                .write,
                                                                .readEncrypt,
@@ -221,6 +223,7 @@ public enum ATTAttributePermission: UInt8, BitMaskOption {
                                                                .writeAuthentication,
                                                                .authorized,
                                                                .noAuthorization]
+    #endif
 }
 
 public extension ATTAttributePermission {

diff --git a/Sources/ATTConnection.swift b/Sources/ATTConnection.swift
@@ -564,9 +564,7 @@ internal enum ATTResponse <Value: ATTProtocolDataUnit> {
     }
 }
 
-// MARK: - Private Supporting Types
-
-fileprivate final class ATTSendOperation {
+private final class ATTSendOperation {
 
     typealias Response = AnyATTResponse
 

diff --git a/Sources/Data.swift b/Sources/Data.swift
@@ -10,13 +10,24 @@ import Foundation
 
 internal extension Data {
 
+    #if swift(>=4.2)
+    func subdataNoCopy(in range: Range<Int>) -> Data {
+
+        let pointer = withUnsafeBytes { UnsafeMutableRawPointer(mutating: $0).advanced(by: range.lowerBound) }
+        return Data(bytesNoCopy: pointer, count: range.count, deallocator: .none)
+    }
+    #else
     func subdataNoCopy(in range: CountableRange<Int>) -> Data {
 
         let pointer = withUnsafeBytes { UnsafeMutableRawPointer(mutating: $0).advanced(by: range.lowerBound) }
-
         return Data(bytesNoCopy: pointer, count: range.count, deallocator: .none)
     }
 
+    func subdata(in range: CountableRange<Int>) -> Data {
+        return Data(self[range])
+    }
+    #endif
+
     func suffixNoCopy(from index: Int) -> Data {
 
         return subdataNoCopy(in: index ..< count)

diff --git a/Sources/GAPDataEncoder.swift b/Sources/GAPDataEncoder.swift
@@ -109,7 +109,7 @@ public struct GAPDataDecoder {
                 guard index <= data.count
                     else { throw Error.insufficientBytes(expected: index + 1, actual: data.count) }
 
-                value = copyBytes ? data.subdata(in: Range(dataRange)) : data.subdataNoCopy(in: dataRange)
+                value = copyBytes ? data.subdata(in: dataRange) : data.subdataNoCopy(in: dataRange)
 
             } else {
 

diff --git a/Sources/GATTClient.swift b/Sources/GATTClient.swift
@@ -36,8 +36,6 @@ public final class GATTClient {
 
     public let preferredMaximumTransmissionUnit: ATTMaximumTransmissionUnit
 
-    // Don't modify
-    @_versioned
     internal private(set) var connection: ATTConnection
 
     /// Whether the client is currently writing a long value.

diff --git a/Sources/GATTDatabase.swift b/Sources/GATTDatabase.swift
@@ -13,11 +13,9 @@ public struct GATTDatabase {
 
     // MARK: - Internal Properties
 
-    @_versioned
     internal private(set) var attributeGroups = [AttributeGroup]()
 
     /// Do not access directly, use `newHandle()`
-    @_versioned
     internal private(set) var lastHandle: UInt16 = 0x0000
 
     // MARK: - Initialization

diff --git a/Sources/GATTServer.swift b/Sources/GATTServer.swift
@@ -46,7 +46,6 @@ public final class GATTServer {
     public var didWrite: ((_ uuid: BluetoothUUID, _ handle: UInt16, _ value: Data) -> Void)?
 
     // Don't modify
-    @_versioned
     internal let connection: ATTConnection
 
     private var preparedWrites = [PreparedWrite]()
@@ -879,7 +878,7 @@ internal extension GATTDatabase {
     /// Used for Service discovery. Should return tuples with the Service start handle, end handle and UUID.
     func readByGroupType(handle: (start: UInt16, end: UInt16), type: BluetoothUUID) -> [(start: UInt16, end: UInt16, uuid: BluetoothUUID)] {
 
-        let handleRange = handle.end < UInt16.max ? Range(handle.start ... handle.end) : Range(handle.start ..< handle.end)
+        let handleRange = handle.end < UInt16.max ? Range(handle.start ... handle.end) : handle.start ..< handle.end
 
         var data: [(start: UInt16, end: UInt16, uuid: BluetoothUUID)] = []
         data.reserveCapacity(attributeGroups.count)
@@ -902,21 +901,21 @@ internal extension GATTDatabase {
 
     func readByType(handle: (start: UInt16, end: UInt16), type: BluetoothUUID) -> [Attribute] {
 
-        let range = handle.end < UInt16.max ? Range(handle.start ... handle.end) : Range(handle.start ..< handle.end)
+        let range = handle.end < UInt16.max ? Range(handle.start ... handle.end) : handle.start ..< handle.end
 
         return attributes.filter { range.contains($0.handle) && $0.uuid == type }
     }
 
     func findInformation(handle: (start: UInt16, end: UInt16)) -> [Attribute] {
 
-        let range = handle.end < UInt16.max ? Range(handle.start ... handle.end) : Range(handle.start ..< handle.end)
+        let range = handle.end < UInt16.max ? Range(handle.start ... handle.end) : handle.start ..< handle.end
 
         return attributes.filter { range.contains($0.handle) }
     }
 
     func findByTypeValue(handle: (start: UInt16, end: UInt16), type: UInt16, value: Data) -> [(UInt16, UInt16)] {
 
-        let range = handle.end < UInt16.max ? Range(handle.start ... handle.end) : Range(handle.start ..< handle.end)
+        let range = handle.end < UInt16.max ? Range(handle.start ... handle.end) : handle.start ..< handle.end
 
         var results = [(UInt16, UInt16)]()
 

diff --git a/Tests/BluetoothTests/BluetoothTests.swift b/Tests/BluetoothTests/BluetoothTests.swift
@@ -259,11 +259,21 @@ final class BluetoothTests: XCTestCase {
             // set conversion
             let all = BitMaskOptionSet(ATT.AttributePermission.allCases)
 
+            let expected: Set<ATT.AttributePermission> = [.read,
+                                                          .write,
+                                                          .readEncrypt,
+                                                          .writeEncrypt,
+                                                          .readAuthentication,
+                                                          .writeAuthentication,
+                                                          .authorized,
+                                                          .noAuthorization]
+
+            XCTAssertEqual(expected, Set(ATT.AttributePermission.allCases))
             XCTAssert(all.contains(ATT.AttributePermission.allCases))
-            XCTAssert(all.count == ATT.AttributePermission.allCases.count)
-            XCTAssert(all.count == 8)
-            XCTAssert(Set(all) == ATT.AttributePermission.allCases)
-            XCTAssert(all == BitMaskOptionSet<ATT.AttributePermission>.all)
+            XCTAssertEqual(all.count, ATT.AttributePermission.allCases.count)
+            XCTAssertEqual(all.count, 8)
+            XCTAssertEqual(Set(all), Set(ATT.AttributePermission.allCases))
+            XCTAssertEqual(all, BitMaskOptionSet<ATT.AttributePermission>.all)
             XCTAssert(all.contains(ATT.AttributePermission.encrypt))
             XCTAssert(all.contains(ATT.AttributePermission.authentication))
             XCTAssert(BitMaskOptionSet<ATT.AttributePermission>().contains(.read) == false)

diff --git a/Xcode/Bluetooth.xcodeproj/project.pbxproj b/Xcode/Bluetooth.xcodeproj/project.pbxproj
@@ -3666,7 +3666,7 @@
 				PRODUCT_NAME = $PROJECT_NAME;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -3726,7 +3726,7 @@
 				PRODUCT_NAME = $PROJECT_NAME;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";