From 8937c33d55fd0a683c16ad8a01c41e01e7c58ef6 Mon Sep 17 00:00:00 2001
From: Alsey Coleman Miller <alseycmiller@gmail.com>
Date: Sun, 10 Dec 2017 23:12:05 -0500
Subject: [PATCH] Use BitMaskOptionSet instead of Set

---
 Sources/ATT.swift            |  3 ---
 Sources/BitMaskOption.swift  |  2 +-
 Sources/GATT.swift           |  3 ---
 Sources/GATTAttributes.swift | 12 ++++++------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Sources/ATT.swift b/Sources/ATT.swift
index 96fc5a61d..8f7e183c3 100644
--- a/Sources/ATT.swift
+++ b/Sources/ATT.swift
@@ -289,10 +289,7 @@ public enum ATTAttributePermission: UInt8, BitMaskOption {
                                                           .authorized,
                                                           .noAuthorization]
     
-    #if swift(>=3.1)
-    #elseif swift(>=3.0)
     public typealias RawValue = UInt8
-    #endif
 }
 
 
diff --git a/Sources/BitMaskOption.swift b/Sources/BitMaskOption.swift
index 140d85ae6..018567d0e 100644
--- a/Sources/BitMaskOption.swift
+++ b/Sources/BitMaskOption.swift
@@ -73,7 +73,7 @@ public extension BitMaskOption {
     @inline(__always)
     static func from(flags: RawValue) -> Set<Self> {
         
-        #if swift(>=4.0) || swift(>=3.2)
+        #if swift(>=4.0)
             return Self.all.filter({ $0.isContained(in: flags) })
         #elseif swift(>=3.0.2)
             return Set(Array(Self.all).filter({ $0.isContained(in: flags) }))
diff --git a/Sources/GATT.swift b/Sources/GATT.swift
index 3d6fcb14a..b4f8dd39a 100644
--- a/Sources/GATT.swift
+++ b/Sources/GATT.swift
@@ -83,10 +83,7 @@ public struct GATT {
                                                               .signedWrite,
                                                               .extendedProperties]
         
-        #if swift(>=3.1)
-        #elseif swift(>=3.0)
         public typealias RawValue = UInt8
-        #endif
     }
     
     /// GATT Characteristic Extended Properties Bitfield values.
diff --git a/Sources/GATTAttributes.swift b/Sources/GATTAttributes.swift
index d3b63c683..7d4f384d6 100644
--- a/Sources/GATTAttributes.swift
+++ b/Sources/GATTAttributes.swift
@@ -51,16 +51,16 @@ public extension GATT {
         
         public var value: Data
         
-        public var permissions: [Permission]
+        public var permissions: BitMaskOptionSet<Permission>
         
-        public var properties: [Property]
+        public var properties: BitMaskOptionSet<Property>
         
         public var descriptors: [Descriptor]
         
         public init(uuid: BluetoothUUID = BluetoothUUID(),
                     value: Data = Data(),
-                    permissions: [Permission] = [],
-                    properties: [Property] = [],
+                    permissions: BitMaskOptionSet<Permission> = [],
+                    properties: BitMaskOptionSet<Property> = [],
                     descriptors: [Descriptor] = []) {
             
             self.uuid = uuid
@@ -78,11 +78,11 @@ public extension GATT {
         
         public var value: Data
         
-        public var permissions: [Permission]
+        public var permissions: BitMaskOptionSet<Permission>
         
         public init(uuid: BluetoothUUID = BluetoothUUID(),
                     value: Data = Data(),
-                    permissions: [Permission] = []) {
+                    permissions: BitMaskOptionSet<Permission> = []) {
             
             self.uuid = uuid
             self.value = value