Release 4.0.1

Author: Mostafa Berg

Example/iOSDFULibrary/AppDelegate.swift

@@ -18,7 +18,7 @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */ 
 
 import UIKit
 

Example/iOSDFULibrary/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0</string>
+	<string>4.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>38</string>
+	<string>39</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

changelog

@@ -1,5 +1,8 @@
 ### Changelog
 
+- **4.0.1**
+    - Bugfix/Improvement: Added @objc tags for Xcode projects that are built with no Objc inference.
+
 - **4.0**:
     - Feature: Migration to Swift 4
 

iOSDFULibrary.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "iOSDFULibrary"
-  s.version          = "4.0.0"
+  s.version          = "4.0.1"
   s.summary          = "This repository contains a tested library for iOS 8+ devices 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.

iOSDFULibrary/Classes/Implementation/DFUPeripheralSelectorDelegate.swift

@@ -57,7 +57,7 @@ import CoreBluetooth
 
      - returns: true (YES) if given peripheral is what service is looking for
      */
-    func select(_ peripheral: CBPeripheral, advertisementData: [String : AnyObject], RSSI: NSNumber, hint name: String?) -> Bool
+    @objc func select(_ peripheral: CBPeripheral, advertisementData: [String : AnyObject], RSSI: NSNumber, hint name: String?) -> Bool
 
     /**
      Returns an optional list of services that the scanner will use to filter advertising packets
@@ -72,5 +72,5 @@ import CoreBluetooth
 
      - returns: an optional list of services or nil
      */
-    func filterBy(hint dfuServiceUUID: CBUUID) -> [CBUUID]?
+    @objc func filterBy(hint dfuServiceUUID: CBUUID) -> [CBUUID]?
 }

iOSDFULibrary/Classes/Implementation/DFUServiceController.swift

@@ -39,7 +39,7 @@ import CoreBluetooth
      next Packet Receipt Notification. Otherwise it will continue to send Op Codes and pause before sending the first bytes
      of the firmware. With Packet Receipt Notifications disabled it is the only moment when upload may be paused.
      */
-    public func pause() {
+    @objc public func pause() {
         guard let executor = executor, !servicePaused, !serviceAborted else { return }
         if executor.pause() {
             servicePaused = true
@@ -49,7 +49,7 @@ import CoreBluetooth
     /**
      Call this method to resume the paused transffer, otherwise does nothing.
      */
-    public func resume() {
+    @objc public func resume() {
         guard let executor = executor, servicePaused, !serviceAborted else { return }
         if executor.resume() {
             servicePaused = false
@@ -67,7 +67,7 @@ import CoreBluetooth
 
      - returns: true if DFU has been aborted.
      */
-    public func abort() -> Bool {
+    @objc public func abort() -> Bool {
         guard let executor = executor, !serviceAborted else { return serviceAborted }
         serviceAborted = true
         servicePaused = false
@@ -77,7 +77,7 @@ import CoreBluetooth
     /**
      Starts again aborted DFU operation.
      */
-    public func restart() {
+    @objc public func restart() {
         guard let executor = executor, serviceAborted else { return }
         serviceAborted = false
         servicePaused = false
@@ -87,14 +87,14 @@ import CoreBluetooth
     /**
      Returns true if DFU operation has been paused.
      */
-    public var paused: Bool {
+    @objc public var paused: Bool {
         return servicePaused
     }
 
     /**
      Returns true if DFU operation has been aborted.
      */
-    public var aborted: Bool {
+    @objc public var aborted: Bool {
         return serviceAborted
     }
 }

iOSDFULibrary/Classes/Implementation/DFUServiceDelegate.swift

@@ -143,7 +143,7 @@
      - parameter currentSpeedBytesPerSecond: the current speed in bytes per second
      - parameter avgSpeedBytesPerSecond: the average speed in bytes per second
      */
-    func dfuProgressDidChange(for part: Int, outOf totalParts: Int, to progress: Int,
+    @objc func dfuProgressDidChange(for part: Int, outOf totalParts: Int, to progress: Int,
         currentSpeedBytesPerSecond: Double, avgSpeedBytesPerSecond: Double)
 }
 
@@ -158,7 +158,7 @@
 
      - parameter state: the new state fo the service
      */
-    func dfuStateDidChange(to state: DFUState)
+    @objc func dfuStateDidChange(to state: DFUState)
 
     /**
      Called after an error occurred.
@@ -169,6 +169,6 @@
      - parameter error:   the error code
      - parameter message: error description
      */
-    func dfuError(_ error: DFUError, didOccurWithMessage message: String)
+    @objc func dfuError(_ error: DFUError, didOccurWithMessage message: String)
 
 }

iOSDFULibrary/Classes/Implementation/DFUServiceInitiator.swift

@@ -41,18 +41,18 @@ import CoreBluetooth
      The service delegate is an object that will be notified about state changes of the DFU Service.
      Setting it is optional but recommended.
      */
-    public weak var delegate: DFUServiceDelegate?
+    @objc public weak var delegate: DFUServiceDelegate?
 
     /**
      An optional progress delegate will be called only during upload. It notifies about current upload
      percentage and speed.
      */
-    public weak var progressDelegate: DFUProgressDelegate?
+    @objc public weak var progressDelegate: DFUProgressDelegate?
 
     /**
      The logger is an object that should print given messages to the user. It is optional.
      */
-    public weak var logger: LoggerDelegate?
+    @objc public weak var logger: LoggerDelegate?
 
     /**
      The selector object is used when the device needs to disconnect and start advertising with a different address
@@ -68,7 +68,7 @@ import CoreBluetooth
 
      Ignore this property if not updating Softdevice and Application from one ZIP file or your 
      */
-    public var peripheralSelector: DFUPeripheralSelectorDelegate
+    @objc public var peripheralSelector: DFUPeripheralSelectorDelegate
 
     /**
      The number of packets of firmware data to be received by the DFU target before sending
@@ -78,7 +78,7 @@ import CoreBluetooth
      but also cause a buffer overflow and hang the Bluetooth adapter.
      Maximum verified values were 29 for iPhone 6 Plus or 22 for iPhone 7, both iOS 10.1.
      */
-    public var packetReceiptNotificationParameter: UInt16 = 12
+    @objc public var packetReceiptNotificationParameter: UInt16 = 12
 
     /**
      **Legacy DFU only.**
@@ -127,7 +127,7 @@ import CoreBluetooth
      if the only service found is the DFU Service. Setting the forceDfu to true (YES) will prevent from
      jumping in these both cases.
      */
-    public var forceDfu = false
+    @objc public var forceDfu = false
 
     /**
      Set this flag to true to enable experimental buttonless feature in Secure DFU. When the 
@@ -164,7 +164,7 @@ import CoreBluetooth
      passing bond information to the bootloader, encryption, well tested). It is recommended to use this 
      new service when SDK 13 (or later) is out. TODO: fix the docs when SDK 13 is out.
      */
-    public var enableUnsafeExperimentalButtonlessServiceInSecureDfu = false
+    @objc public var enableUnsafeExperimentalButtonlessServiceInSecureDfu = false
 
     //MARK: - Public API
 
@@ -183,7 +183,7 @@ import CoreBluetooth
      - seeAlso: peripheralSelector property - a selector used when scanning for a device in DFU Bootloader mode
      in case you want to update a Softdevice and Application from a single ZIP Distribution Packet.
      */
-    public init(centralManager: CBCentralManager, target: CBPeripheral) {
+    @objc public init(centralManager: CBCentralManager, target: CBPeripheral) {
         self.centralManager = centralManager
         // Just to be sure that manager is not scanning
         self.centralManager.stopScan()
@@ -201,7 +201,7 @@ import CoreBluetooth
 
      - returns: the initiator instance to allow chain use
      */
-    public func with(firmware file: DFUFirmware) -> DFUServiceInitiator {
+    @objc public func with(firmware file: DFUFirmware) -> DFUServiceInitiator {
         self.file = file
         return self
     }
@@ -219,7 +219,7 @@ import CoreBluetooth
 
      - returns: A DFUServiceController object that can be used to control the DFU operation.
      */
-    public func start() -> DFUServiceController? {
+    @objc public func start() -> DFUServiceController? {
         // The firmware file must be specified before calling `start()`
         if file == nil {
             delegate?.dfuError(.fileNotSpecified, didOccurWithMessage: "Firmare not specified")

iOSDFULibrary/Classes/Implementation/Firmware/DFUFirmware.swift

@@ -46,22 +46,22 @@
     internal let stream: DFUStream?
 
     /// The name of the firmware file.
-    public let fileName: String?
+    @objc public let fileName: String?
     /// The URL to the firmware file.
-    public let fileUrl: URL?
+    @objc public let fileUrl: URL?
 
     /// Information whether the firmware was successfully initialized.
-    public var valid: Bool {
+    @objc public var valid: Bool {
         return stream != nil
     }
 
     /// The size of each component of the firmware.
-    public var size: DFUFirmwareSize {
+    @objc public var size: DFUFirmwareSize {
         return stream!.size
     }
 
     /// Number of connectinos required to transfer the firmware. This does not include the connection needed to switch to the DFU mode.
-    public var parts: Int {
+    @objc public var parts: Int {
         if stream == nil {
             return 0
         }
@@ -89,7 +89,7 @@
 
      - returns: the DFU firmware object or null in case of an error
      */
-    convenience public init?(urlToZipFile: URL) {
+    @objc convenience public init?(urlToZipFile: URL) {
         self.init(urlToZipFile: urlToZipFile, type: DFUFirmwareType.softdeviceBootloaderApplication)
     }
 
@@ -103,7 +103,7 @@
 
      - returns: the DFU firmware object or null in case of an error
      */
-    public init?(urlToZipFile: URL, type: DFUFirmwareType) {
+    @objc public init?(urlToZipFile: URL, type: DFUFirmwareType) {
         fileUrl = urlToZipFile
         fileName = urlToZipFile.lastPathComponent
 
@@ -136,7 +136,7 @@
 
      - returns: the DFU firmware object or null in case of an error
      */
-    convenience public init?(zipFile: Data) {
+    @objc convenience public init?(zipFile: Data) {
         self.init(zipFile: zipFile, type: DFUFirmwareType.softdeviceBootloaderApplication)
     }
 
@@ -150,7 +150,7 @@
 
      - returns: the DFU firmware object or null in case of an error
      */
-    public init?(zipFile: Data, type: DFUFirmwareType) {
+    @objc public init?(zipFile: Data, type: DFUFirmwareType) {
         fileUrl = nil
         fileName = nil
 
@@ -175,7 +175,7 @@
 
      - returns: the DFU firmware object or null in case of an error
      */
-    public init?(urlToBinOrHexFile: URL, urlToDatFile: URL?, type: DFUFirmwareType) {
+    @objc public init?(urlToBinOrHexFile: URL, urlToDatFile: URL?, type: DFUFirmwareType) {
         fileUrl = urlToBinOrHexFile
         fileName = urlToBinOrHexFile.lastPathComponent
 
@@ -218,7 +218,7 @@
 
      - returns: the DFU firmware object or null in case of an error
      */
-    public init?(binFile: Data, datFile: Data?, type: DFUFirmwareType) {
+    @objc public init?(binFile: Data, datFile: Data?, type: DFUFirmwareType) {
         fileUrl = nil
         fileName = nil
 
@@ -236,7 +236,7 @@
 
      - returns: the DFU firmware object or null in case of an error
      */
-    public init?(hexFile: Data, datFile: Data?, type: DFUFirmwareType) {
+    @objc public init?(hexFile: Data, datFile: Data?, type: DFUFirmwareType) {
         fileUrl = nil
         fileName = nil
 

iOSDFULibrary/Classes/Utilities/Logging/LoggerDelegate.swift

@@ -71,5 +71,5 @@ Log level. Logger application may filter log entries based on their level. Level
      - parameter level:   the log level
      - parameter message: the message
      */
-    func logWith(_ level: LogLevel, message: String)
+    @objc func logWith(_ level: LogLevel, message: String)
 }