Merge pull request #460 from NordicSemiconductor/develop

Version 4.11.1

Author: philips77

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - iOSDFULibrary (4.11.0):
+  - iOSDFULibrary (4.11.1):
     - ZIPFoundation (= 0.9.11)
   - ZIPFoundation (0.9.11)
 
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  iOSDFULibrary: 65f745d4224ac06625d60b3fc51aad2dec60346a
+  iOSDFULibrary: 3500ac00451aa7d8ec48a752e91099669a2c1d27
   ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
 
 PODFILE CHECKSUM: 16697609d795697cac6384a823bc962ccbddb9d0

Example/Pods/Local Podspecs/iOSDFULibrary.podspec.json

@@ -345,7 +345,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					37E4ADEF2008CA1C005464DD = {

Example/Pods/Manifest.lock

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -48,15 +48,15 @@ if you need to resymbolicate crash logs. you may want to keep those files bundle
 **For Swift Package Manager:**
 
 ```swift
-// swift-tools-version:5.4
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(
   name: "<Your Product Name>",
   dependencies: [
     .package(
       url: "https://github.com/NordicSemiconductor/IOS-DFU-Library", 
-      .upToNextMajor(from: "<Desired Version, e.g. 4.11.0>")
+      .upToNextMajor(from: "<Desired Version, e.g. 4.11.1>")
     )
   ],
   targets: [.target(name: "<Your Target Name>", dependencies: ["NordicDFU"])]

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/iOSDFULibrary-iOS.xcscheme

@@ -18,7 +18,7 @@ end
 pod install
 
 - Open the newly created `.xcworkspace` and begin working on your project.
-- If Xcode asks to migrate code to Swift 5.2, choose **Later**. (The codebase is Swift 5.2 already)
+- If Xcode asks to migrate code to Swift 5.5, choose **Later**. (The codebase is Swift 5.5 already)
 - Click on the `Pods` project, then go to the `Build Settings`
 - Click on the `iOSDFULibrary` target, then set the `Use Legacy Swift version` setting to `No`
 - Repeat the same for the `ZIPFoundation` target.

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/iOSDFULibrary-macOS.xcscheme

@@ -1,4 +1,7 @@
 ### Changelog
+- **4.11.1**
+   - Improvement: Xcode 13 issue fixed (#455).
+   
 - **4.11.0**
    - Feature: Support for Abort op code added in Secure DFU (#447). 
    - Improvement: More op codes added in Secure DFU in SDK 15 (#447).

Example/Pods/Target Support Files/iOSDFULibrary-iOS/iOSDFULibrary-iOS-Info.plist

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "iOSDFULibrary"
-  s.version          = "4.11.0"
+  s.version          = "4.11.1"
   s.summary          = "This repository contains a library to perform Device Firmware Update on the nRF5x devices."
   s.description      = <<-DESC
 The nRF5x Series chips are flash-based SoCs, and as such they represent the most flexible solution available. A key feature of the nRF5x Series and their associated software architecture and S-Series SoftDevices is the possibility for Over-The-Air Device Firmware Upgrade (OTA-DFU). See Figure 1. OTA-DFU allows firmware upgrades to be issued and downloaded to products in the field via the cloud and so enables OEMs to fix bugs and introduce new features to products that are already out on the market. This brings added security and flexibility to product development when using the nRF5x Series SoCs.

Example/Pods/Target Support Files/iOSDFULibrary-macOS/iOSDFULibrary-macOS-Info.plist

@@ -224,14 +224,11 @@ internal struct PacketReceiptNotification {
      */
     func enableNotifications(onSuccess success: Callback?, onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         // Save callbacks.
         self.success = success
@@ -255,14 +252,11 @@ internal struct PacketReceiptNotification {
      */
     func send(_ request: Request, onSuccess success: Callback?, onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         // Save callbacks and parameter.
         self.success   = success
@@ -309,14 +303,11 @@ internal struct PacketReceiptNotification {
                                  onPacketReceiptNofitication proceed: ProgressCallback?,
                                  onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         // Save callbacks. The proceed callback will be called periodically whenever
         // a packet receipt notification is received. It resumes uploading.

Example/iOSDFULibrary.xcodeproj/project.pbxproj

@@ -68,14 +68,11 @@ internal class DFUPacket: DFUCharacteristic {
      */
     func sendFirmwareSize(_ size: DFUFirmwareSize, onError report: ErrorCallback?) {
         // Get the peripheral object
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         let data = Data()
             + size.softdevice.littleEndian
@@ -98,14 +95,11 @@ internal class DFUPacket: DFUCharacteristic {
      */
     func sendFirmwareSize_v1(_ size: DFUFirmwareSize, onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         let data = Data() + size.application.littleEndian
 
@@ -124,14 +118,11 @@ internal class DFUPacket: DFUCharacteristic {
      */
     func sendInitPacket(_ data: Data, onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         // Data may be sent in up-to-20-bytes packets.
         var offset: UInt32 = 0
@@ -169,14 +160,11 @@ internal class DFUPacket: DFUCharacteristic {
                   andReportProgressTo progress: DFUProgressDelegate?, on queue: DispatchQueue,
                   onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         // Some super complicated computations...
         let bytesTotal   = UInt32(firmware.data.count)

Example/iOSDFULibrary.xcodeproj/xcshareddata/xcschemes/iOSDFULibrary-Example.xcscheme

@@ -62,14 +62,11 @@ internal typealias VersionCallback = (_ major: UInt8, _ minor: UInt8) -> Void
      */
     func readVersion(onSuccess success: VersionCallback?, onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         // Save callbacks.
         self.success = success

README.md

@@ -154,14 +154,11 @@ import CoreBluetooth
         self.report  = report
 
         // Get the peripheral object
-        #if swift(>=5.5)
-        guard let peripheral = service.peripheral else {
+        let optPeripheral: CBPeripheral? = service.peripheral
+        guard let peripheral = optPeripheral else {
             report(.invalidInternalState, "Assert service.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = service.peripheral
-        #endif
 
         // Set the peripheral delegate to self
         peripheral.delegate = self
@@ -200,14 +197,11 @@ import CoreBluetooth
         // - we must be in the DFU mode already (otherwise the device would be useless...).
         // Note: On iOS the Generic Access and Generic Attribute services (nor HID Service)
         //       are not returned during service discovery.
-        #if swift(>=5.5)
-        guard let peripheral = service.peripheral else {
+        let optPeripheral: CBPeripheral? = service.peripheral
+        guard let peripheral = optPeripheral else {
             logger.e("Assert service.peripheral != nil failed")
             return false // Return value doesn't really matter.
         }
-        #else
-        let peripheral = service.peripheral
-        #endif
         let services = peripheral.services
         if services?.count == 1 {
             return false

README_OBJC.md

@@ -189,14 +189,11 @@ internal class ButtonlessDFU : NSObject, CBPeripheralDelegate, DFUCharacteristic
      */
     func enable(onSuccess success: Callback?, onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         // Save callbacks.
         self.success = success
@@ -225,14 +222,11 @@ internal class ButtonlessDFU : NSObject, CBPeripheralDelegate, DFUCharacteristic
     func send(_ request: ButtonlessDFURequest,
               onSuccess success: Callback?, onError report: ErrorCallback?) {
         // Get the peripheral object.
-        #if swift(>=5.5)
-        guard let peripheral = characteristic.service?.peripheral else {
+        let optService: CBService? = characteristic.service
+        guard let peripheral = optService?.peripheral else {
             report?(.invalidInternalState, "Assert characteristic.service?.peripheral != nil failed")
             return
         }
-        #else
-        let peripheral = characteristic.service.peripheral
-        #endif
 
         // Save callbacks and parameter.
         self.success = success