Merge pull request #13 from SomaticLabs/swift4

Swift4 support

Author: jakerockland

README.md

@@ -1,15 +1,13 @@
 # SwiftyBluetooth
-Swift 3, fully featured closures based library for CoreBluetooth on iOS 9+ devices. 
-
-For Swift 2 use v0.1.1
+Fully featured closures based library for CoreBluetooth on iOS 9+ devices.
 
 ## Background 
 CoreBluetooth and its delegate based API can be difficult to use at time. Often times you already know the specifications of the peripheral you're about to use and simply want to read or write to predetermined characteristics.  
 
 SwiftyBluetooth tries to address these concerns by providing a clear, closure based, API for every `CBCentralManager` and `CBPeripheral` calls. Furthermore, all your calls are guaranteed to timeout in case of untraceable errors. If required, SwiftyBluetooth will also take care of connecting to peripherals and discovering the required attributes when executing read or write operations lowering the amount of work you need to do. 
 
 ## Features
-- Supports Swift 3 ~> v0.2.0 and Swift 2 = v0.1.1
+- Supports Swift 4 ~> v1.0.0, for Swift 3 use v0.3.4
 - Synthaxic sugar and helper functions for common CoreBluetooth tasks 
 - Closure based CBCentralManager peripheral scanning with a timeout
 - Notification based event for CBCentralManager state changes and state restoration  
@@ -21,7 +19,7 @@ SwiftyBluetooth tries to address these concerns by providing a clear, closure ba
 ## Usage
 The Library has 2 important class:  
 
-- The `Central` class, a Singleton wrapper around `CBCentralManager` mostly used to scan for peripherals with a closure callback. 
+- The `Central` class, a Singleton wrapper around `CBCentralManager` used to scan for peripherals with a closure callback and restore previous sessions.
 - The `Peripheral` class, a wrapper around `CBPeripheral` used to call `CBPeripheral` functions with closure callbacks. 
 
 Note: The library is currently not thread safe, make sure to run your `Central` and `Peripheral` operations on the main thread. 
@@ -57,17 +55,6 @@ peripheral.connect { result in
     }
 }
 ```
-### Disconnecting from a peripheral
-```swift
-peripheral.disconnect { result in 
-    switch result {
-    case .success:
-        break // You are now disconnected from the peripheral
-    case .failure(let error):
-        break // An error happened during the disconnection
-    }
-}
-```
 ### Reading from a peripheral's service's characteristic
 If you already know the characteristic and service UUIDs you want to read from, once a peripheral has been found you can read from it right away like this: 
 
@@ -97,10 +84,10 @@ peripheral.readValue(ofCharac: charac) { result in
 ### Writing to a Peripheral's service's characteristic
 If you already know the characteristic and service UUID you want to write to, once a peripheral has been found, you can write to that characteristic right away like this: 
 ```swift
-let exampleBinaryData = String(0b1010).dataUsingEncoding(NSUTF8StringEncoding)!
+let data = String(0b1010).dataUsingEncoding(NSUTF8StringEncoding)!
 peripheral.writeValue(ofCharacWithUUID: "1d5bc11d-e28c-4157-a7be-d8b742a013d8", 
                       fromServiceWithUUID: "4011e369-5981-4dae-b686-619dc656c7ba", 
-                      value: exampleBinaryData) { result in
+                      value: data) { result in
     switch result {
     case .success:
         break // The write was successful.
@@ -109,34 +96,13 @@ peripheral.writeValue(ofCharacWithUUID: "1d5bc11d-e28c-4157-a7be-d8b742a013d8",
     }
 }
 ```
-<<<<<<< HEAD
-### Listening to and receiving Characteristic update notifications
-=======
 ### Receiving Characteristic update notifications
->>>>>>> e38dfdfb7686e99d983675988bc6228705919464
 Receiving characteristic value updates is done through notifications on the default `NotificationCenter`. All supported `Peripheral` notifications are part of the `PeripheralEvent` enum. Use this enum's raw values as the notification string when registering for notifications:
 ```swift
 // First we prepare ourselves to receive update notifications 
 let peripheral = somePeripheral
 
-<<<<<<< HEAD
-NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: PeripheralEvent.characteristicValueUpdate.rawValue), 
-                                                                    object: peripheral, 
-                                                                    queue: nil) { notification in
-    let updatedCharacteristic = notification.userInfo?["characteristic"] as! CBCharacteristic
-    var newValue = updatedCharacteristic.value
-}
-
-// We can then set a characteristic's notification value to true and start receiving updates to that characteristic
-peripheral.setNotifyValue(toEnabled: true, forCharacWithUUID: "2A29", ofServiceWithUUID: "180A") { result in
-    switch result {
-    case .success(let isNotifying):
-        break // You will now receive NSNotifications when that characteristic value gets updated.
-    case .failure(let error):
-        break // An error happened setting the characteristic to notify.
-    }
-=======
-NotificationCenter.default.addObserver(forName: Peripheral.PeripheralCharacteristicValueUpdate, 
+NotificationCenter.default.addObserver(forName: Peripheral.PeripheralCharacteristicValueUpdate,
                                         object: peripheral, 
                                         queue: nil) { (notification) in
     let charac = notification.userInfo!["characteristic"] as! CBCharacteristic
@@ -148,7 +114,6 @@ NotificationCenter.default.addObserver(forName: Peripheral.PeripheralCharacteris
 // We can then set a characteristic's notification value to true and start receiving updates to that characteristic
 peripheral.setNotifyValue(toEnabled: true, forCharacWithUUID: "2A29", ofServiceWithUUID: "180A") { (isNotifying, error) in
     // If there were no errors, you will now receive Notifications when that characteristic value gets updated.
->>>>>>> e38dfdfb7686e99d983675988bc6228705919464
 }
 ```
 ### Discovering services 
@@ -223,7 +188,7 @@ $ pod install
 Add this to your Cartfile 
 
 ```ogdl
-github "tehjord/SwiftyBluetooth"
+github "jordanebelanger/SwiftyBluetooth"
 ```
 
 ## Requirements

SwiftyBluetooth.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = 'SwiftyBluetooth'
-  s.version      = '0.4.0'
+  s.version      = '1.0.0'
   s.license      =  'MIT'
-  s.homepage     = 'https://github.com/tehjord/SwiftyBluetooth'
-  s.authors      = { 'Jordan Belanger' => '[email protected]' }
+  s.homepage     = 'https://github.com/jordanebelanger/SwiftyBluetooth'
+  s.authors      = { 'Jordane Belanger' => '[email protected]' }
   s.summary      = 'Fully featured closures based library for CoreBluetooth'
-  s.source       = { :git => 'https://github.com/tehjord/SwiftyBluetooth.git', :tag => s.version }
+  s.source       = { :git => 'https://github.com/jordanebelanger/SwiftyBluetooth.git', :tag => s.version }
   s.source_files = 'SwiftyBluetooth/Source/*.swift'
   s.requires_arc = true
   s.ios.deployment_target = '9.0'

SwiftyBluetooth.xcodeproj/project.pbxproj

@@ -164,11 +164,11 @@
 		096409A51CC6103D00ADD4D9 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0900;
 				TargetAttributes = {
 					096409AD1CC6103D00ADD4D9 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -232,14 +232,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -286,14 +292,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -342,7 +354,8 @@
 				SKIP_INSTALL = YES;
 				SWIFTYBLUETOOTH_DIRECT_ACCESS = SWIFTYBLUETOOTH_DIRECT_ACCESS;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -363,7 +376,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFTYBLUETOOTH_DIRECT_ACCESS = SWIFTYBLUETOOTH_DIRECT_ACCESS;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

SwiftyBluetooth.xcodeproj/xcshareddata/xcschemes/SwiftyBluetooth.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

SwiftyBluetooth/Source/CentralProxy.swift

@@ -172,7 +172,7 @@ private final class ConnectPeripheralRequest {
             if let error = error {
                 return .failure(error)
             } else {
-                return .success()
+                return .success(())
             }
         }()
         for callback in callbacks {
@@ -192,7 +192,7 @@ extension CentralProxy {
             let uuid = peripheral.identifier
 
             if let cbPeripheral = self.centralManager.retrievePeripherals(withIdentifiers: [uuid]).first , cbPeripheral.state == .connected {
-                callback(.success())
+                callback(.success(()))
                 return
             }
 
@@ -250,7 +250,7 @@ private final class DisconnectPeripheralRequest {
             if let error = error {
                 return .failure(error)
             } else {
-                return .success()
+                return .success(())
             }
         }()
         for callback in callbacks {
@@ -272,7 +272,7 @@ extension CentralProxy {
 
             if let cbPeripheral = self.centralManager.retrievePeripherals(withIdentifiers: [uuid]).first,
                 (cbPeripheral.state == .disconnected || cbPeripheral.state == .disconnecting) {
-                callback(.success())
+                callback(.success(()))
                 return
             }
 
@@ -383,7 +383,7 @@ extension CentralProxy: CBCentralManagerDelegate {
 
         let peripheral = Peripheral(peripheral: peripheral)
 
-        var rssiOptional: Int? = Int(RSSI)
+        var rssiOptional: Int? = Int(truncating: RSSI)
         if let rssi = rssiOptional, rssi == 127 {
             rssiOptional = nil
         }

SwiftyBluetooth/Source/PeripheralProxy.swift

@@ -742,7 +742,7 @@ extension PeripheralProxy {
                 self.writeCharacteristicValueRequests[writePath] = nil
             }
 
-            request.callback(.success())
+            request.callback(.success(()))
 
             self.runWriteCharacteristicValueRequest(writePath)
         }
@@ -1141,7 +1141,7 @@ extension PeripheralProxy: CBPeripheralDelegate {
         if let error = error {
             request.callback(.failure(error))
         } else {
-            request.callback(.success())
+            request.callback(.success(()))
         }
     }
 
@@ -1215,7 +1215,7 @@ extension PeripheralProxy: CBPeripheralDelegate {
         if let error = error {
             request.callback(.failure(error))
         } else {
-            request.callback(.success())
+            request.callback(.success(()))
         }
     }
 }

SwiftyBluetooth/Source/Util.swift

@@ -45,6 +45,6 @@ extension UInt16 {
             return nil
         }
 
-        self = UInt16(truncatingBitPattern: numberValue.intValue)
+        self = UInt16(truncatingIfNeeded: numberValue.intValue)
     }
 }

SwiftyBluetooth/Supporting Files/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.0</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>