fix(deps): update expo monorepo

Author: renovate-bot

example/.assets/images/pd.png

@@ -7,6 +7,10 @@ const config: ExpoConfig = {
   version: "1.0.0",
   orientation: "portrait",
   assetBundlePatterns: ["**/*"],
+  splash: {
+    image: ".assets/images/pd.png",
+    backgroundColor: "#FFFFFF",
+  },
   ios: {
     supportsTablet: true,
     bundleIdentifier: "uk.co.playerdata.reactnativemcumanager.example",

example/app.config.ts

@@ -12,13 +12,12 @@
   },
   "dependencies": {
     "@playerdata/react-native-mcu-manager": "workspace:*",
-    "expo": "51.0.38",
-    "expo-document-picker": "^12.0.2",
-    "expo-splash-screen": "0.27.6",
-    "expo-status-bar": "1.12.1",
+    "expo": "52.0.14",
+    "expo-document-picker": "13.0.1",
+    "expo-splash-screen": "0.29.13",
     "lodash": "4.17.21",
     "react": "18.3.1",
-    "react-native": "0.74.5",
+    "react-native": "0.76.3",
     "react-native-ble-plx": "3.2.1",
     "react-native-toast-message": "2.2.1"
   },

example/package.json

@@ -1,5 +1,3 @@
-import 'react-native-get-random-values';
-
 import { UpgradeMode } from '@playerdata/react-native-mcu-manager';
 
 import React, { useState } from 'react';

example/src/App.tsx

@@ -15,10 +15,16 @@ const useFirmwareUpdate = (
       return () => null;
     }
 
-    const upgrade = new Upgrade(bleId, updateFileUri, {
-      estimatedSwapTime: 60,
-      upgradeMode,
-    });
+    const upgrade = new Upgrade(
+      bleId,
+      updateFileUri,
+      {
+        estimatedSwapTime: 60,
+        upgradeMode,
+      },
+      setProgress,
+      setState
+    );
 
     upgradeRef.current = upgrade;
 

example/src/useFirmwareUpdate.ts

@@ -21,11 +21,16 @@
   "devDependencies": {
     "@commitlint/config-conventional": "19.6.0",
     "@react-native-community/eslint-config": "3.2.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "commitlint": "19.6.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
     "husky": "9.1.7",
-    "prettier": "3.4.2",
+    "prettier": "3.3.3",
     "semantic-release": "24.2.0"
+  },
+  "resolutions": {
+    "expo": ">52.0.0"
   }
 }

package.json

@@ -24,10 +24,10 @@ if (useManagedAndroidSdkVersions) {
   }
 
   project.android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 34)
+    compileSdkVersion safeExtGet("compileSdkVersion", 35)
     defaultConfig {
-      minSdkVersion safeExtGet("minSdkVersion", 21)
-      targetSdkVersion safeExtGet("targetSdkVersion", 34)
+      minSdkVersion safeExtGet("minSdkVersion", 24)
+      targetSdkVersion safeExtGet("targetSdkVersion", 35)
     }
   }
 }

pnpm-lock.yaml

@@ -30,7 +30,8 @@ class DeviceUpgrade(
         private val context: Context,
         private val updateFileUri: Uri,
         private val updateOptions: UpdateOptions,
-        private val manager: ReactNativeMcuManagerModule
+        private val progressCallback: (Int) -> Unit,
+        private val stateCallback: (String) -> Unit
 ) : FirmwareUpgradeCallback<FirmwareUpgradeManager.State> {
     private val TAG = "DeviceUpdate"
     private var lastNotification = -1
@@ -128,8 +129,7 @@ class DeviceUpgrade(
             prevState: FirmwareUpgradeManager.State,
             newState: FirmwareUpgradeManager.State
     ) {
-        val stateMap: Map<String, Any?> = mapOf("id" to id, "state" to newState.name)
-        manager.upgradeStateCB(stateMap)
+        stateCallback(newState.name)
     }
 
     override fun onUpgradeCompleted() {
@@ -155,8 +155,7 @@ class DeviceUpgrade(
         val progressPercent = bytesSent * 100 / imageSize
         if (progressPercent != lastNotification) {
             lastNotification = progressPercent
-            val progressMap: Map<String, Any?> = mapOf("id" to id, "progress" to progressPercent)
-            manager.updateProgressCB(progressMap)
+            progressCallback(progressPercent)
         }
     }
 }

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

@@ -6,6 +6,7 @@ import android.net.Uri
 import android.util.Log
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.exception.CodedException
+import expo.modules.kotlin.jni.JavaScriptFunction
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.kotlin.records.Field
@@ -17,16 +18,12 @@ import io.runtime.mcumgr.managers.ImageManager
 private const val MODULE_NAME = "ReactNativeMcuManager"
 private val TAG = "McuManagerModule"
 
-private const val UPGRADE_STATE_EVENTS = "upgradeStateChanged"
-private const val UPLOAD_PROGRESS_EVENTS = "uploadProgress"
-
 class UpdateOptions : Record {
   @Field val estimatedSwapTime: Int = 0
   @Field val upgradeMode: Int? = null
 }
 
 class ReactNativeMcuManagerModule : Module() {
-
   private val bluetoothAdapter: BluetoothAdapter? = BluetoothAdapter.getDefaultAdapter()
   private val upgrades: MutableMap<String, DeviceUpgrade> = mutableMapOf()
   private val context
@@ -35,9 +32,6 @@ class ReactNativeMcuManagerModule : Module() {
   override fun definition() = ModuleDefinition {
     Name(MODULE_NAME)
 
-    // Defines event names that the module can send to JavaScript.
-    Events(UPGRADE_STATE_EVENTS, UPLOAD_PROGRESS_EVENTS)
-
     AsyncFunction("eraseImage") { macAddress: String?, promise: Promise ->
       if (this@ReactNativeMcuManagerModule.bluetoothAdapter == null) {
         throw Exception("No bluetooth adapter")
@@ -62,7 +56,9 @@ class ReactNativeMcuManagerModule : Module() {
         id: String,
         macAddress: String?,
         updateFileUriString: String?,
-        updateOptions: UpdateOptions ->
+        updateOptions: UpdateOptions,
+        progressCallback: JavaScriptFunction<Unit>,
+        stateCallback: JavaScriptFunction<Unit> ->
       if (this@ReactNativeMcuManagerModule.bluetoothAdapter == null) {
         throw Exception("No bluetooth adapter")
       }
@@ -74,15 +70,23 @@ class ReactNativeMcuManagerModule : Module() {
       val device: BluetoothDevice = bluetoothAdapter.getRemoteDevice(macAddress)
       val updateFileUri = Uri.parse(updateFileUriString)
 
-      val upgrade =
-          DeviceUpgrade(
-              id,
-              device,
-              context,
-              updateFileUri,
-              updateOptions,
-              this@ReactNativeMcuManagerModule
-          )
+      val upgrade = DeviceUpgrade(
+          id,
+          device,
+          context,
+          updateFileUri,
+          updateOptions,
+          { progress ->
+            appContext.executeOnJavaScriptThread {
+              progressCallback(id, progress)
+            }
+          },
+          { state ->
+            appContext.executeOnJavaScriptThread {
+              stateCallback(id, state)
+            }
+          }
+      )
       this@ReactNativeMcuManagerModule.upgrades[id] = upgrade
     }
 
@@ -120,12 +124,4 @@ class ReactNativeMcuManagerModule : Module() {
       upgrades.remove(id)
     }
   }
-
-  fun updateProgressCB(progress: Map<String, Any?>) {
-    sendEvent(UPLOAD_PROGRESS_EVENTS, progress)
-  }
-
-  fun upgradeStateCB(state: Map<String, Any?>) {
-    sendEvent(UPGRADE_STATE_EVENTS, state)
-  }
 }