Merge pull request #357 from PlayerData/deps-update

feat(deps): Upgrade native dependencies

Author: ball-hayden

react-native-mcu-manager/android/build.gradle

@@ -50,5 +50,5 @@ repositories {
 }
 
 dependencies {
-  implementation "no.nordicsemi.android:mcumgr-ble:1.9.2"
+  implementation "no.nordicsemi.android:mcumgr-ble:2.1.0"
 }

react-native-mcu-manager/android/src/main/java/uk/co/playerdata/reactnativemcumanager/DeviceUpgrade.kt

@@ -9,7 +9,8 @@ import expo.modules.kotlin.exception.CodedException
 import io.runtime.mcumgr.ble.McuMgrBleTransport
 import io.runtime.mcumgr.dfu.FirmwareUpgradeCallback
 import io.runtime.mcumgr.dfu.FirmwareUpgradeController
-import io.runtime.mcumgr.dfu.FirmwareUpgradeManager
+import io.runtime.mcumgr.dfu.mcuboot.FirmwareUpgradeManager
+import io.runtime.mcumgr.dfu.mcuboot.FirmwareUpgradeManager.Settings
 import io.runtime.mcumgr.exception.McuMgrException
 import java.io.IOException
 
@@ -27,7 +28,7 @@ class DeviceUpgrade(
         private val updateFileUri: Uri,
         private val updateOptions: UpdateOptions,
         private val manager: ReactNativeMcuManagerModule
-) : FirmwareUpgradeCallback {
+) : FirmwareUpgradeCallback<FirmwareUpgradeManager.State> {
     private val TAG = "DeviceUpdate"
     private var lastNotification = -1
     private var transport = McuMgrBleTransport(context, device)
@@ -67,7 +68,7 @@ class DeviceUpgrade(
         val modeInt = updateOptions.upgradeMode ?: 1
         val upgradeMode = UpgradeModes[modeInt] ?: FirmwareUpgradeManager.Mode.TEST_AND_CONFIRM
 
-        dfuManager.setEstimatedSwapTime(estimatedSwapTime)
+        val settings = Settings.Builder().setEstimatedSwapTime(estimatedSwapTime).build()
 
         try {
             val stream = context.contentResolver.openInputStream(updateBundleUri)
@@ -76,7 +77,7 @@ class DeviceUpgrade(
             stream.read(imageData)
 
             dfuManager.setMode(upgradeMode)
-            dfuManager.start(imageData)
+            dfuManager.start(imageData, settings)
         } catch (e: IOException) {
             e.printStackTrace()
             disconnectDevice()

react-native-mcu-manager/ios/DeviceUpgrade.swift

@@ -54,7 +54,7 @@ class DeviceUpgrade {
       let image = ImageManager.Image(image: 0, hash: binHash, data: binData)
 
       self.bleTransport = McuMgrBleTransport(bleUuid)
-      self.dfuManager = FirmwareUpgradeManager(transporter: self.bleTransport!, delegate: self)
+      self.dfuManager = FirmwareUpgradeManager(transport: self.bleTransport!, delegate: self)
       let config = FirmwareUpgradeConfiguration(
         estimatedSwapTime: self.options.estimatedSwapTime,
         upgradeMode: self.getMode()

react-native-mcu-manager/ios/ReactNativeMcuManager.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'iOSMcuManagerLibrary', '~> 1.6.0'
+  s.dependency 'iOSMcuManagerLibrary', '1.7.3'
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {

react-native-mcu-manager/ios/ReactNativeMcuManagerModule.swift

@@ -24,7 +24,7 @@ public class ReactNativeMcuManagerModule: Module {
       }
 
       let bleTransport = McuMgrBleTransport(bleUuid)
-      let imageManager = ImageManager(transporter: bleTransport)
+      let imageManager = ImageManager(transport: bleTransport)
 
       imageManager.erase { (response: McuMgrResponse?, err: Error?) in
         bleTransport.close()