expo-updates 1.0.0-canary-20250122-166c2cb → 1.0.0-canary-20250207-8bc5146

package/CHANGELOG.md

@@ -9,15 +9,23 @@
 ### 🎉 New features
 
 - Add new state machine context about startup procedure. ([#32433](https://github.com/expo/expo/pull/32433) by [@wschurman](https://github.com/wschurman))
+- Add `Updates.setUpdateURLAndRequestHeadersOverride()` to allow overriding update URL configuration from the JS API. ([#34422](https://github.com/expo/expo/pull/34422), [#34423](https://github.com/expo/expo/pull/34423), [#34425](https://github.com/expo/expo/pull/34425), [#34426](https://github.com/expo/expo/pull/34426), [#34454](https://github.com/expo/expo/pull/34454), [#34455](https://github.com/expo/expo/pull/34455), [#34428](https://github.com/expo/expo/pull/34428), [#34404](https://github.com/expo/expo/pull/34404) by [@kudo](https://github.com/kudo), [@wschurman](https://github.com/wschurman))
 
 ### 🐛 Bug fixes
 
 - Fix an issue where `launchFallbackUpdateFromDisk` is called from a foreground thread leading to ANRs. ([#33693](https://github.com/expo/expo/pull/33693) by [@alanjhughes](https://github.com/alanjhughes))
 - [android] Use more robust mechanism for determining empty multipart bodies. ([#33977](https://github.com/expo/expo/pull/33977) by [@wschurman](https://github.com/wschurman))
+- fix E2E tests in Detox debug build ([#32951](https://github.com/expo/expo/pull/32951) by [@matejkriz](https://github.com/matejkriz))
+- Fix issue where syncing codesigning config for bare projects would clobber existing Expo.plist config ([#34597](https://github.com/expo/expo/pull/34597) by [@brentvatne](https://github.com/brentvatne))
+- Removed Apache Commons IO dependency and fixed crash issue on Android 7. ([#34638](https://github.com/expo/expo/pull/34638) by [@kudo](https://github.com/kudo))
 
 ### 💡 Others
 
+- [Android] Made ReactNativeFeatureFlags a parameter to the constructor of the ErrorRecovery class to be able to make tests pass ([#34363](https://github.com/expo/expo/pull/34363) by [@chrfalch](https://github.com/chrfalch))
 - [iOS] Inject logger from controllers down to dependent objects. ([#34035](https://github.com/expo/expo/pull/34035) by [@wschurman](https://github.com/wschurman))
+- [apple] Migrate remaining `expo-module.config.json` to unified platform syntax. ([#34445](https://github.com/expo/expo/pull/34445) by [@reichhartd](https://github.com/reichhartd))
+- Fixed build error on iOS Expo Go. ([#34485](https://github.com/expo/expo/pull/34485) by [@kudo](https://github.com/kudo))
+- Fixed Android unit test errors in BuilDataTest. ([#34510](https://github.com/expo/expo/pull/34510) by [@kudo](https://github.com/kudo))
 
 ## 0.26.10 - 2024-12-05
 

package/android/build.gradle

@@ -112,13 +112,13 @@ dependencies {
   implementation("com.squareup.okhttp3:okhttp:4.9.2")
   implementation("com.squareup.okhttp3:okhttp-urlconnection:4.9.2")
   implementation("com.squareup.okhttp3:okhttp-brotli:4.9.2")
-  implementation("commons-io:commons-io:2.16.1")
   implementation("org.bouncycastle:bcutil-jdk15to18:1.78.1")
 
   testImplementation 'junit:junit:4.13.2'
   testImplementation 'androidx.test:core:1.5.0'
   testImplementation "io.mockk:mockk:$mockk_version"
   testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion()}"
+  testImplementation 'org.robolectric:robolectric:4.14.1'
 
   androidTestImplementation 'com.squareup.okio:okio:2.9.0'
   androidTestImplementation 'androidx.test:runner:1.5.2'

package/android/src/main/java/expo/modules/updates/DisabledUpdatesController.kt

@@ -162,6 +162,10 @@ class DisabledUpdatesController(
     callback.onFailure(UpdatesDisabledException("Updates.setExtraParamAsync() is not supported when expo-updates is not enabled."))
   }
 
+  override fun setUpdateURLAndRequestHeadersOverride(configOverride: UpdatesConfigurationOverride?) {
+    throw UpdatesDisabledException("Updates.setUpdateURLAndRequestHeadersOverride() is not supported when expo-updates is not enabled.")
+  }
+
   @Synchronized
   private fun notifyController() {
     if (launcher == null) {

package/android/src/main/java/expo/modules/updates/EnabledUpdatesController.kt

@@ -262,6 +262,13 @@ class EnabledUpdatesController(
     }
   }
 
+  override fun setUpdateURLAndRequestHeadersOverride(configOverride: UpdatesConfigurationOverride?) {
+    if (!updatesConfiguration.disableAntiBrickingMeasures) {
+      throw CodedException("ERR_UPDATES_RUNTIME_OVERRIDE", "Must set disableAntiBrickingMeasures configuration to use updates overriding", null)
+    }
+    UpdatesConfigurationOverride.save(context, configOverride)
+  }
+
   companion object {
     private val TAG = EnabledUpdatesController::class.java.simpleName
   }

package/android/src/main/java/expo/modules/updates/IUpdatesController.kt

@@ -165,4 +165,6 @@ interface IUpdatesController {
   fun getExtraParams(callback: ModuleCallback<Bundle>)
 
   fun setExtraParam(key: String, value: String?, callback: ModuleCallback<Unit>)
+
+  fun setUpdateURLAndRequestHeadersOverride(configOverride: UpdatesConfigurationOverride?)
 }

package/android/src/main/java/expo/modules/updates/UpdatesConfiguration.kt

@@ -6,8 +6,6 @@ import android.net.Uri
 import android.util.Log
 import expo.modules.core.errors.InvalidArgumentException
 import expo.modules.updates.codesigning.CodeSigningConfiguration
-import org.apache.commons.io.IOUtils
-import java.nio.charset.StandardCharsets
 
 enum class UpdatesConfigurationValidationResult {
   VALID,
@@ -39,7 +37,8 @@ data class UpdatesConfiguration(
   val codeSigningMetadata: Map<String, String>?,
   val codeSigningIncludeManifestResponseCertificateChain: Boolean,
   private val codeSigningAllowUnsignedManifests: Boolean,
-  val enableExpoUpdatesProtocolV0CompatibilityMode: Boolean // used only in Expo Go to prevent loading rollbacks and other directives, which don't make much sense in the context of Expo Go
+  val enableExpoUpdatesProtocolV0CompatibilityMode: Boolean, // used only in Expo Go to prevent loading rollbacks and other directives, which don't make much sense in the context of Expo Go
+  val disableAntiBrickingMeasures: Boolean
 ) {
   enum class CheckAutomaticallyConfiguration {
     NEVER {
@@ -60,12 +59,27 @@ data class UpdatesConfiguration(
     }
   }
 
-  constructor(context: Context?, overrideMap: Map<String, Any>?) : this(
+  constructor(
+    context: Context?,
+    overrideMap: Map<String, Any>?
+  ) : this(
+    context,
+    overrideMap,
+    disableAntiBrickingMeasures = getDisableAntiBrickingMeasures(context, overrideMap),
+    configOverride = context?.let { UpdatesConfigurationOverride.load(context) }
+  )
+
+  internal constructor(
+    context: Context?,
+    overrideMap: Map<String, Any>?,
+    disableAntiBrickingMeasures: Boolean,
+    configOverride: UpdatesConfigurationOverride?
+  ) : this(
     scopeKey = maybeGetDefaultScopeKey(
       overrideMap?.readValueCheckingType<String>(UPDATES_CONFIGURATION_SCOPE_KEY_KEY) ?: context?.getMetadataValue("expo.modules.updates.EXPO_SCOPE_KEY"),
-      updateUrl = getUpdatesUrl(context, overrideMap)!!
+      updateUrl = getUpdateUrl(context, overrideMap, disableAntiBrickingMeasures, configOverride)!!
     ),
-    updateUrl = getUpdatesUrl(context, overrideMap)!!,
+    updateUrl = getUpdateUrl(context, overrideMap, disableAntiBrickingMeasures, configOverride)!!,
     runtimeVersionRaw = getRuntimeVersion(context, overrideMap),
     launchWaitMs = overrideMap?.readValueCheckingType<Int>(UPDATES_CONFIGURATION_LAUNCH_WAIT_MS_KEY) ?: context?.getMetadataValue("expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS") ?: UPDATES_CONFIGURATION_LAUNCH_WAIT_MS_DEFAULT_VALUE,
     checkOnLaunch = overrideMap?.readValueCheckingType<String>(UPDATES_CONFIGURATION_CHECK_ON_LAUNCH_KEY)?.let {
@@ -85,10 +99,8 @@ data class UpdatesConfiguration(
         CheckAutomaticallyConfiguration.ALWAYS
       }
     },
-    hasEmbeddedUpdate = overrideMap?.readValueCheckingType<Boolean>(UPDATES_CONFIGURATION_HAS_EMBEDDED_UPDATE_KEY) ?: context?.getMetadataValue("expo.modules.updates.HAS_EMBEDDED_UPDATE") ?: true,
-    requestHeaders = overrideMap?.readValueCheckingType<Map<String, String>>(UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY) ?: (context?.getMetadataValue<String>("expo.modules.updates.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY") ?: "{}").let {
-      UpdatesUtils.getMapFromJSONString(it)
-    },
+    hasEmbeddedUpdate = getHasEmbeddedUpdate(context, overrideMap, disableAntiBrickingMeasures, configOverride),
+    requestHeaders = getRequestHeaders(context, overrideMap, disableAntiBrickingMeasures, configOverride),
     codeSigningCertificate = overrideMap?.readValueCheckingType<String>(UPDATES_CONFIGURATION_CODE_SIGNING_CERTIFICATE) ?: context?.getMetadataValue("expo.modules.updates.CODE_SIGNING_CERTIFICATE"),
     codeSigningMetadata = overrideMap?.readValueCheckingType<Map<String, String>>(UPDATES_CONFIGURATION_CODE_SIGNING_METADATA) ?: (context?.getMetadataValue<String>("expo.modules.updates.CODE_SIGNING_METADATA") ?: "{}").let {
       UpdatesUtils.getMapFromJSONString(it)
@@ -99,7 +111,8 @@ data class UpdatesConfiguration(
     codeSigningAllowUnsignedManifests = overrideMap?.readValueCheckingType<Boolean>(
       UPDATES_CONFIGURATION_CODE_SIGNING_ALLOW_UNSIGNED_MANIFESTS
     ) ?: context?.getMetadataValue("expo.modules.updates.CODE_SIGNING_ALLOW_UNSIGNED_MANIFESTS") ?: false,
-    enableExpoUpdatesProtocolV0CompatibilityMode = overrideMap?.readValueCheckingType<Boolean>(UPDATES_CONFIGURATION_ENABLE_EXPO_UPDATES_PROTOCOL_V0_COMPATIBILITY_MODE) ?: context?.getMetadataValue("expo.modules.updates.ENABLE_EXPO_UPDATES_PROTOCOL_V0_COMPATIBILITY_MODE") ?: false
+    enableExpoUpdatesProtocolV0CompatibilityMode = overrideMap?.readValueCheckingType<Boolean>(UPDATES_CONFIGURATION_ENABLE_EXPO_UPDATES_PROTOCOL_V0_COMPATIBILITY_MODE) ?: context?.getMetadataValue("expo.modules.updates.ENABLE_EXPO_UPDATES_PROTOCOL_V0_COMPATIBILITY_MODE") ?: false,
+    disableAntiBrickingMeasures = getDisableAntiBrickingMeasures(context, overrideMap)
   )
 
   val codeSigningConfiguration: CodeSigningConfiguration? by lazy {
@@ -128,6 +141,7 @@ data class UpdatesConfiguration(
     const val UPDATES_CONFIGURATION_LAUNCH_WAIT_MS_KEY = "launchWaitMs"
     const val UPDATES_CONFIGURATION_HAS_EMBEDDED_UPDATE_KEY = "hasEmbeddedUpdate"
     const val UPDATES_CONFIGURATION_ENABLE_EXPO_UPDATES_PROTOCOL_V0_COMPATIBILITY_MODE = "enableExpoUpdatesProtocolCompatibilityMode"
+    const val UPDATES_CONFIGURATION_DISABLE_ANTI_BRICKING_MEASURES = "disableAntiBrickingMeasures"
 
     const val UPDATES_CONFIGURATION_CODE_SIGNING_CERTIFICATE = "codeSigningCertificate"
     const val UPDATES_CONFIGURATION_CODE_SIGNING_METADATA = "codeSigningMetadata"
@@ -139,12 +153,57 @@ data class UpdatesConfiguration(
     const val UPDATES_CONFIGURATION_RUNTIME_VERSION_READ_FINGERPRINT_FILE_SENTINEL = "file:fingerprint"
     private const val FINGERPRINT_FILE_NAME = "fingerprint"
 
-    private fun getUpdatesUrl(context: Context?, overrideMap: Map<String, Any>?): Uri? {
+    private fun getDisableAntiBrickingMeasures(context: Context?, overrideMap: Map<String, Any>?): Boolean {
+      return overrideMap?.readValueCheckingType<Boolean>(UPDATES_CONFIGURATION_DISABLE_ANTI_BRICKING_MEASURES) ?: context?.getMetadataValue("expo.modules.updates.DISABLE_ANTI_BRICKING_MEASURES") ?: false
+    }
+
+    private fun getHasEmbeddedUpdate(
+      context: Context?,
+      overrideMap: Map<String, Any>?,
+      disableAntiBrickingMeasures: Boolean,
+      configOverride: UpdatesConfigurationOverride?
+    ): Boolean {
+      if (disableAntiBrickingMeasures && configOverride != null) {
+        return false
+      }
+      return overrideMap?.readValueCheckingType<Boolean>(UPDATES_CONFIGURATION_HAS_EMBEDDED_UPDATE_KEY)
+        ?: context?.getMetadataValue("expo.modules.updates.HAS_EMBEDDED_UPDATE")
+        ?: true
+    }
+
+    private fun getUpdateUrl(
+      context: Context?,
+      overrideMap: Map<String, Any>?,
+      disableAntiBrickingMeasures: Boolean,
+      configOverride: UpdatesConfigurationOverride?
+    ): Uri? {
+      if (disableAntiBrickingMeasures) {
+        configOverride?.let {
+          return it.updateUrl
+        }
+      }
       return overrideMap?.readValueCheckingType(UPDATES_CONFIGURATION_UPDATE_URL_KEY)
         ?: context?.getMetadataValue<String>("expo.modules.updates.EXPO_UPDATE_URL")
           ?.let { Uri.parse(it) }
     }
 
+    private fun getRequestHeaders(
+      context: Context?,
+      overrideMap: Map<String, Any>?,
+      disableAntiBrickingMeasures: Boolean,
+      configOverride: UpdatesConfigurationOverride?
+    ): Map<String, String> {
+      if (disableAntiBrickingMeasures) {
+        configOverride?.let {
+          return it.requestHeaders
+        }
+      }
+      return overrideMap?.readValueCheckingType<Map<String, String>>(UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY)
+        ?: (context?.getMetadataValue<String>("expo.modules.updates.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY") ?: "{}").let {
+          UpdatesUtils.getMapFromJSONString(it)
+        }
+    }
+
     private fun getIsEnabled(context: Context?, overrideMap: Map<String, Any>?): Boolean {
       return overrideMap?.readValueCheckingType(UPDATES_CONFIGURATION_ENABLED_KEY) ?: context?.getMetadataValue("expo.modules.updates.ENABLED") ?: true
     }
@@ -154,7 +213,7 @@ data class UpdatesConfiguration(
 
       if (context != null && runtimeVersion == UPDATES_CONFIGURATION_RUNTIME_VERSION_READ_FINGERPRINT_FILE_SENTINEL) {
         return context.assets.open(FINGERPRINT_FILE_NAME).use { stream ->
-          IOUtils.toString(stream, StandardCharsets.UTF_8)
+          stream.bufferedReader(Charsets.UTF_8).use { it.readText() }
         }
       }
 
@@ -166,7 +225,9 @@ data class UpdatesConfiguration(
       if (!isEnabledConfigSetting) {
         return UpdatesConfigurationValidationResult.INVALID_NOT_ENABLED
       }
-      getUpdatesUrl(context, overrideMap) ?: return UpdatesConfigurationValidationResult.INVALID_MISSING_URL
+      val disableAntiBrickingMeasures = getDisableAntiBrickingMeasures(context, overrideMap)
+      val configOverride = if (context != null) UpdatesConfigurationOverride.load(context) else null
+      getUpdateUrl(context, overrideMap, disableAntiBrickingMeasures, configOverride) ?: return UpdatesConfigurationValidationResult.INVALID_MISSING_URL
 
       if (getRuntimeVersion(context, overrideMap).isNullOrEmpty()) {
         return UpdatesConfigurationValidationResult.INVALID_MISSING_RUNTIME_VERSION

package/android/src/main/java/expo/modules/updates/UpdatesConfigurationOverride.kt

@@ -0,0 +1,57 @@
+package expo.modules.updates
+
+import android.content.Context
+import android.net.Uri
+import expo.modules.manifests.core.toMap
+import org.json.JSONObject
+
+/**
+ * [UpdatesConfiguration] values set at runtime that override build-time configuration.
+ */
+data class UpdatesConfigurationOverride(
+  val updateUrl: Uri,
+  val requestHeaders: Map<String, String>
+) {
+  private fun toJSONObject(): JSONObject {
+    return JSONObject().apply {
+      put("updateUrl", updateUrl.toString())
+      put("requestHeaders", JSONObject(requestHeaders))
+    }
+  }
+
+  companion object {
+    private const val UPDATES_PREFS_FILE = "dev.expo.updates.prefs"
+    private const val UPDATES_PREFS_KEY_UPDATES_CONFIGURATION_OVERRIDE = "updatesConfigOverride"
+
+    internal fun load(context: Context): UpdatesConfigurationOverride? {
+      val configOverride =
+        context.getSharedPreferences(UPDATES_PREFS_FILE, Context.MODE_PRIVATE)
+          ?.getString(UPDATES_PREFS_KEY_UPDATES_CONFIGURATION_OVERRIDE, null)
+      return configOverride?.let {
+        fromJSONObject(JSONObject(it))
+      }
+    }
+
+    internal fun save(context: Context, configOverride: UpdatesConfigurationOverride?) {
+      val prefs = context.getSharedPreferences(UPDATES_PREFS_FILE, Context.MODE_PRIVATE)
+      with(prefs.edit()) {
+        if (configOverride != null) {
+          putString(UPDATES_PREFS_KEY_UPDATES_CONFIGURATION_OVERRIDE, configOverride.toJSONObject().toString())
+        } else {
+          remove(UPDATES_PREFS_KEY_UPDATES_CONFIGURATION_OVERRIDE)
+        }
+        apply()
+      }
+    }
+
+    private fun fromJSONObject(json: JSONObject): UpdatesConfigurationOverride {
+      val requestHeaders = json.getJSONObject("requestHeaders")
+        .toMap()
+        .mapValues { it.value.toString() }
+      return UpdatesConfigurationOverride(
+        updateUrl = Uri.parse(json.getString("updateUrl")),
+        requestHeaders = requestHeaders
+      )
+    }
+  }
+}

package/android/src/main/java/expo/modules/updates/UpdatesDevLauncherController.kt

@@ -78,8 +78,11 @@ class UpdatesDevLauncherController(
   }
 
   @get:Synchronized
-  override val launchAssetFile: String
-    get() = throw Exception("IUpdatesController.launchAssetFile should not be called in dev client")
+  override val launchAssetFile: String?
+    get() {
+      logger.warn("launchAssetFile should not be called from expo-dev-client build, except for Detox testing")
+      return null
+    }
 
   override val bundleAssetName: String
     get() = throw Exception("IUpdatesController.bundleAssetName should not be called in dev client")
@@ -363,6 +366,10 @@ class UpdatesDevLauncherController(
     callback.onFailure(NotAvailableInDevClientException("Updates.setExtraParamAsync() is not supported in development builds."))
   }
 
+  override fun setUpdateURLAndRequestHeadersOverride(configOverride: UpdatesConfigurationOverride?) {
+    throw NotAvailableInDevClientException("Updates.setUpdateURLAndRequestHeadersOverride() is not supported in development builds.")
+  }
+
   companion object {
     private val TAG = UpdatesDevLauncherController::class.java.simpleName
   }

package/android/src/main/java/expo/modules/updates/UpdatesModule.kt

@@ -1,6 +1,7 @@
 package expo.modules.updates
 
 import android.content.Context
+import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
 import expo.modules.kotlin.Promise
@@ -8,6 +9,8 @@ import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
 import expo.modules.kotlin.types.Enumerable
 import expo.modules.updates.events.IUpdatesEventManagerObserver
 import expo.modules.updates.logging.UpdatesErrorCode
@@ -211,6 +214,10 @@ class UpdatesModule : Module(), IUpdatesEventManagerObserver {
         }
       }
     }
+
+    Function("setUpdateURLAndRequestHeadersOverride") { configOverride: UpdatesConfigurationOverrideParam? ->
+      UpdatesController.instance.setUpdateURLAndRequestHeadersOverride(configOverride?.toUpdatesConfigurationOverride())
+    }
   }
 
   companion object {
@@ -253,4 +260,13 @@ class UpdatesModule : Module(), IUpdatesEventManagerObserver {
   override fun onStateMachineContextEvent(context: UpdatesStateContext) {
     sendEvent(UpdatesJSEvent.StateChange, Bundle().apply { putBundle("context", context.bundle) })
   }
+
+  internal data class UpdatesConfigurationOverrideParam(
+    @Field val updateUrl: Uri,
+    @Field val requestHeaders: Map<String, String>
+  ) : Record {
+    fun toUpdatesConfigurationOverride(): UpdatesConfigurationOverride {
+      return UpdatesConfigurationOverride(updateUrl, requestHeaders)
+    }
+  }
 }

package/android/src/main/java/expo/modules/updates/UpdatesUtils.kt

@@ -8,7 +8,6 @@ import expo.modules.updates.UpdatesConfiguration.CheckAutomaticallyConfiguration
 import expo.modules.updates.db.entity.AssetEntity
 import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogger
-import org.apache.commons.io.FileUtils
 import org.json.JSONArray
 import org.json.JSONObject
 import java.io.*
@@ -112,7 +111,12 @@ object UpdatesUtils {
       // write file atomically by writing it to a temporary path and then renaming
       // this protects us against partially written files if the process is interrupted
       val tmpFile = File(destination.absolutePath + ".tmp")
-      FileUtils.copyInputStreamToFile(digestInputStream, tmpFile)
+      tmpFile.parentFile?.mkdirs()
+      digestInputStream.use { input ->
+        tmpFile.outputStream().use { output ->
+          input.copyTo(output)
+        }
+      }
 
       // this message digest must be read after the input stream has been consumed in order to get the hash correctly
       val md = digestInputStream.messageDigest

package/android/src/main/java/expo/modules/updates/db/BuildData.kt

@@ -1,8 +1,9 @@
 package expo.modules.updates.db
 
-import android.net.Uri
-import expo.modules.jsonutils.getNullable
+import expo.modules.manifests.core.toMap
 import expo.modules.updates.UpdatesConfiguration
+import expo.modules.updates.db.dao.JSONDataDao
+import expo.modules.updates.manifest.ManifestMetadata
 import org.json.JSONObject
 
 /**
@@ -27,8 +28,6 @@ import org.json.JSONObject
  *   UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY
  */
 object BuildData {
-  private var staticBuildDataKey = "staticBuildData"
-
   fun ensureBuildDataIsConsistent(
     updatesConfiguration: UpdatesConfiguration,
     database: UpdatesDatabase
@@ -39,6 +38,7 @@ object BuildData {
       setBuildDataInDatabase(database, updatesConfiguration)
     } else if (!isBuildDataConsistent(updatesConfiguration, buildJSON)) {
       clearAllUpdatesFromDatabase(database)
+      clearManifestMetadataFromDatabase(database)
       setBuildDataInDatabase(database, updatesConfiguration)
     }
   }
@@ -48,28 +48,17 @@ object BuildData {
     database.updateDao().deleteUpdates(allUpdates)
   }
 
+  fun clearManifestMetadataFromDatabase(database: UpdatesDatabase) {
+    ManifestMetadata.clearMetadataForBuildDataClearOperation(database)
+  }
+
   fun isBuildDataConsistent(
     updatesConfiguration: UpdatesConfiguration,
     databaseBuildData: JSONObject
   ): Boolean {
-    val configBuildData = getBuildDataFromConfig(updatesConfiguration)
-
-    val updateUrlKey = UpdatesConfiguration.UPDATES_CONFIGURATION_UPDATE_URL_KEY
-    val requestHeadersKey = UpdatesConfiguration.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY
-
-    // check equality of the two JSONObjects. The build data object is string valued with the
-    // exception of "requestHeaders" which is a string valued object.
-    return mutableListOf<Boolean>().apply {
-      add(databaseBuildData.get(updateUrlKey).let { Uri.parse(it.toString()) } == configBuildData.get(updateUrlKey))
-
-      // loop through keys from both requestHeaders objects.
-      for (key in configBuildData.getJSONObject(requestHeadersKey).keys()) {
-        add(databaseBuildData.getJSONObject(requestHeadersKey).getNullable<String>(key) == configBuildData.getJSONObject(requestHeadersKey).getNullable(key))
-      }
-      for (key in databaseBuildData.getJSONObject(requestHeadersKey).keys()) {
-        add(databaseBuildData.getJSONObject(requestHeadersKey).getNullable<String>(key) == configBuildData.getJSONObject(requestHeadersKey).getNullable(key))
-      }
-    }.all { it }
+    val configBuildData = defaultBuildData + getBuildDataFromConfig(updatesConfiguration).toMap()
+    val dbBuildData = defaultBuildData + databaseBuildData.toMap()
+    return configBuildData == dbBuildData
   }
 
   fun setBuildDataInDatabase(
@@ -78,14 +67,14 @@ object BuildData {
   ) {
     val buildDataJSON = getBuildDataFromConfig(updatesConfiguration)
     database.jsonDataDao()?.setJSONStringForKey(
-      staticBuildDataKey,
+      JSONDataDao.JSONDataKey.STATIC_BUILD_DATA,
       buildDataJSON.toString(),
       updatesConfiguration.scopeKey
     )
   }
 
   fun getBuildDataFromDatabase(database: UpdatesDatabase, scopeKey: String): JSONObject? {
-    val buildJSONString = database.jsonDataDao()?.loadJSONStringForKey(staticBuildDataKey, scopeKey)
+    val buildJSONString = database.jsonDataDao()?.loadJSONStringForKey(JSONDataDao.JSONDataKey.STATIC_BUILD_DATA, scopeKey)
     return if (buildJSONString == null) null else JSONObject(buildJSONString)
   }
 
@@ -94,9 +83,17 @@ object BuildData {
       for ((key, value) in updatesConfiguration.requestHeaders) put(key, value)
     }
     val buildData = JSONObject().apply {
-      put(UpdatesConfiguration.UPDATES_CONFIGURATION_UPDATE_URL_KEY, updatesConfiguration.updateUrl)
+      put(UpdatesConfiguration.UPDATES_CONFIGURATION_UPDATE_URL_KEY, updatesConfiguration.updateUrl.toString())
       put(UpdatesConfiguration.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY, requestHeadersJSON)
+      put(UpdatesConfiguration.UPDATES_CONFIGURATION_HAS_EMBEDDED_UPDATE_KEY, updatesConfiguration.hasEmbeddedUpdate)
     }
     return buildData
   }
+
+  /**
+   * Fallback data specifically for migration while database data doesn't have these keys
+   */
+  private val defaultBuildData = mapOf(
+    UpdatesConfiguration.UPDATES_CONFIGURATION_HAS_EMBEDDED_UPDATE_KEY to true
+  )
 }

package/android/src/main/java/expo/modules/updates/db/dao/JSONDataDao.kt

@@ -12,6 +12,13 @@ import java.util.*
  */
 @Dao
 abstract class JSONDataDao {
+  enum class JSONDataKey(val key: String) {
+    STATIC_BUILD_DATA("staticBuildData"),
+    EXTRA_PARAMS("extraParams"),
+    MANIFEST_SERVER_DEFINED_HEADERS("serverDefinedHeaders"),
+    MANIFEST_FILTERS("manifestFilters")
+  }
+
   @Query("SELECT * FROM json_data WHERE `key` = :key AND scope_key = :scopeKey ORDER BY last_updated DESC LIMIT 1;")
   protected abstract fun loadJSONDataForKeyInternal(key: String, scopeKey: String): List<JSONDataEntity>
 
@@ -21,11 +28,14 @@ abstract class JSONDataDao {
   @Query("DELETE FROM json_data WHERE `key` = :key AND scope_key = :scopeKey;")
   protected abstract fun deleteJSONDataForKeyInternal(key: String, scopeKey: String)
 
+  @Query("DELETE FROM json_data WHERE `key` IN (:keys)")
+  protected abstract fun deleteJSONDataForKeysForAllScopeKeysInternal(keys: List<String>)
+
   /**
    * for public use
    */
-  fun loadJSONStringForKey(key: String, scopeKey: String): String? {
-    val rows = loadJSONDataForKeyInternal(key, scopeKey)
+  fun loadJSONStringForKey(key: JSONDataKey, scopeKey: String): String? {
+    val rows = loadJSONDataForKeyInternal(key.key, scopeKey)
     return if (rows.isEmpty()) {
       null
     } else {
@@ -34,25 +44,30 @@ abstract class JSONDataDao {
   }
 
   @Transaction
-  open fun setJSONStringForKey(key: String, value: String, scopeKey: String) {
-    deleteJSONDataForKeyInternal(key, scopeKey)
-    insertJSONDataInternal(JSONDataEntity(key, value, Date(), scopeKey))
+  open fun setJSONStringForKey(key: JSONDataKey, value: String, scopeKey: String) {
+    deleteJSONDataForKeyInternal(key.key, scopeKey)
+    insertJSONDataInternal(JSONDataEntity(key.key, value, Date(), scopeKey))
   }
 
   @Transaction
-  open fun setMultipleFields(fields: Map<String, String>, scopeKey: String) {
+  open fun setMultipleFields(fields: Map<JSONDataKey, String>, scopeKey: String) {
     val iterator = fields.entries.iterator()
     while (iterator.hasNext()) {
       val entry = iterator.next()
-      deleteJSONDataForKeyInternal(entry.key, scopeKey)
-      insertJSONDataInternal(JSONDataEntity(entry.key, entry.value, Date(), scopeKey))
+      deleteJSONDataForKeyInternal(entry.key.key, scopeKey)
+      insertJSONDataInternal(JSONDataEntity(entry.key.key, entry.value, Date(), scopeKey))
     }
   }
 
   @Transaction
-  open fun updateJSONStringForKey(key: String, scopeKey: String, updater: (previousValue: String?) -> String) {
+  open fun updateJSONStringForKey(key: JSONDataKey, scopeKey: String, updater: (previousValue: String?) -> String) {
     val previousValue = loadJSONStringForKey(key, scopeKey)
-    deleteJSONDataForKeyInternal(key, scopeKey)
-    insertJSONDataInternal(JSONDataEntity(key, updater(previousValue), Date(), scopeKey))
+    deleteJSONDataForKeyInternal(key.key, scopeKey)
+    insertJSONDataInternal(JSONDataEntity(key.key, updater(previousValue), Date(), scopeKey))
+  }
+
+  @Transaction
+  open fun deleteJSONDataForKeysForAllScopeKeys(keys: List<JSONDataKey>) {
+    deleteJSONDataForKeysForAllScopeKeysInternal(keys.map { it.key })
   }
 }

package/android/src/main/java/expo/modules/updates/errorrecovery/ErrorRecovery.kt

@@ -8,7 +8,7 @@ import com.facebook.react.bridge.ReactMarker.MarkerListener
 import com.facebook.react.bridge.ReactMarkerConstants
 import com.facebook.react.devsupport.ReleaseDevSupportManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
-import expo.modules.rncompatibility.ReactNativeFeatureFlags
+import expo.modules.rncompatibility.IReactNativeFeatureFlagsProvider
 import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogger
 import java.lang.ref.WeakReference
@@ -27,7 +27,8 @@ import java.lang.ref.WeakReference
  * and so there is no more need to trigger the error recovery pipeline.
  */
 class ErrorRecovery(
-  private val logger: UpdatesLogger
+  private val logger: UpdatesLogger,
+  private val reactNativeFeatureFlagsProvider: IReactNativeFeatureFlagsProvider
 ) {
   internal val handlerThread = HandlerThread("expo-updates-error-recovery")
   internal lateinit var handler: Handler
@@ -97,7 +98,7 @@ class ErrorRecovery(
   }
 
   private fun registerErrorHandler(devSupportManager: DevSupportManager) {
-    if (ReactNativeFeatureFlags.enableBridgelessArchitecture) {
+    if (reactNativeFeatureFlagsProvider.enableBridgelessArchitecture) {
       registerErrorHandlerImplBridgeless()
     } else {
       registerErrorHandlerImplBridge(devSupportManager)
@@ -130,7 +131,7 @@ class ErrorRecovery(
   }
 
   private fun unregisterErrorHandler() {
-    if (ReactNativeFeatureFlags.enableBridgelessArchitecture) {
+    if (reactNativeFeatureFlagsProvider.enableBridgelessArchitecture) {
       unregisterErrorHandlerImplBridgeless()
     } else {
       unregisterErrorHandlerImplBridge()

package/android/src/main/java/expo/modules/updates/launcher/NoDatabaseLauncher.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.os.AsyncTask
 import expo.modules.updates.loader.EmbeddedLoader
 import expo.modules.updates.logging.UpdatesLogger
-import org.apache.commons.io.FileUtils
 import java.io.File
 
 /**
@@ -30,7 +29,7 @@ class NoDatabaseLauncher @JvmOverloads constructor(
     try {
       val errorLogFile = File(context.filesDir, ERROR_LOG_FILENAME)
       val exceptionString = fatalException.toString()
-      FileUtils.writeStringToFile(errorLogFile, exceptionString, "UTF-8", true)
+      errorLogFile.appendText(exceptionString, Charsets.UTF_8)
     } catch (e: Exception) {
       logger.error("Failed to write fatal error to log", e)
     }
@@ -47,7 +46,7 @@ class NoDatabaseLauncher @JvmOverloads constructor(
         if (!errorLogFile.exists()) {
           return null
         }
-        val logContents = FileUtils.readFileToString(errorLogFile, "UTF-8")
+        val logContents = errorLogFile.readText(Charsets.UTF_8)
         errorLogFile.delete()
         logContents
       } catch (e: Exception) {

package/android/src/main/java/expo/modules/updates/manifest/EmbeddedManifestUtils.kt

@@ -3,9 +3,7 @@ package expo.modules.updates.manifest
 import android.content.Context
 import android.util.Log
 import expo.modules.updates.UpdatesConfiguration
-import org.apache.commons.io.IOUtils
 import org.json.JSONObject
-import java.nio.charset.StandardCharsets
 
 /**
  * Helper object for accessing and memoizing the manifest embedded in the application package.
@@ -24,7 +22,7 @@ object EmbeddedManifestUtils {
     if (sEmbeddedUpdate == null) {
       try {
         context.assets.open(MANIFEST_FILENAME).use { stream ->
-          val manifestString = IOUtils.toString(stream, StandardCharsets.UTF_8)
+          val manifestString = stream.bufferedReader(Charsets.UTF_8).use { it.readText() }
           val manifestJson = JSONObject(manifestString)
           // automatically verify embedded manifest since it was already codesigned
           manifestJson.put("isVerified", true)