expo-updates 58.0.10 → 58.0.12

package/CHANGELOG.md

@@ -1,14 +1,27 @@
 # Changelog
 
-## Unpublished
+## 58.0.12
 
-### 🛠 Breaking changes
+### Patch Changes
 
-### 🎉 New features
+- Updated dependencies. ([#50734](https://github.com/expo/expo/pull/50734))
+  - expo-eas-client@58.0.2
 
-### 🐛 Bug fixes
+## 58.0.11
 
-### 💡 Others
+### Patch Changes
+
+- Force-bump all packages, due to migration to changesets. ([#50762](https://github.com/expo/expo/pull/50762) by [@kitten](https://github.com/kitten))
+- [iOS] Add configurable update cache retention with `EXUpdatesMaxUpdatesToKeep`. ([#50459](https://github.com/expo/expo/pull/50459) by [@expo-tuft](https://github.com/apps/expo-tuft))
+- [Android] Add configurable update cache retention with `expo.modules.updates.EXPO_UPDATES_MAX_UPDATES_TO_KEEP`. ([#50460](https://github.com/expo/expo/pull/50460) by [@expo-tuft](https://github.com/apps/expo-tuft))
+- Cover configurable update cache retention in E2E tests. ([#50463](https://github.com/expo/expo/pull/50463) by [@expo-tuft](https://github.com/apps/expo-tuft))
+- Fix the embedded manifest giving every duplicate asset scale the same `packagerHash`, which made updates download assets already in the binary. ([#50757](https://github.com/expo/expo/pull/50757) by [@alanjhughes](https://github.com/alanjhughes))
+- Updated dependencies. ([#50762](https://github.com/expo/expo/pull/50762))
+  - @expo/plist@0.10.1
+  - expo-eas-client@58.0.1
+  - expo-manifests@58.0.1
+  - expo-structured-headers@58.0.1
+  - expo-updates-interface@58.0.1
 
 ## 58.0.10 — 2026-09-28
 

package/android/build.gradle

@@ -42,7 +42,7 @@ expoModule {
 }
 
 group = 'host.exp.exponent'
-version = '58.0.10'
+version = '58.0.12'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -103,7 +103,7 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '58.0.10'
+    versionName '58.0.12'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -43,10 +43,19 @@ data class UpdatesConfiguration(
   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 enableBsdiffPatchSupport: Boolean,
   val disableAntiBrickingMeasures: Boolean,
+  val maxUpdatesToKeep: Int = UPDATES_CONFIGURATION_MAX_UPDATES_TO_KEEP_DEFAULT_VALUE,
   val hasUpdatesOverride: Boolean,
 
   private val cachedOverrideMap: Map<String, Any>?
 ) {
+  init {
+    if (maxUpdatesToKeep < UPDATES_CONFIGURATION_MAX_UPDATES_TO_KEEP_MIN_VALUE) {
+      throw AssertionError(
+        "UpdatesConfiguration failed to initialize: maxUpdatesToKeep must be >= $UPDATES_CONFIGURATION_MAX_UPDATES_TO_KEEP_MIN_VALUE"
+      )
+    }
+  }
+
   enum class CheckAutomaticallyConfiguration {
     NEVER {
       override fun toJSString() = "NEVER"
@@ -128,6 +137,7 @@ data class UpdatesConfiguration(
       ?: context?.getMetadataValue("expo.modules.updates.ENABLE_BSDIFF_PATCH_SUPPORT")
       ?: true,
     disableAntiBrickingMeasures = getDisableAntiBrickingMeasures(context, overrideMap),
+    maxUpdatesToKeep = getMaxUpdatesToKeep(context, overrideMap),
     hasUpdatesOverride = configOverride != null
   )
 
@@ -159,6 +169,7 @@ data class UpdatesConfiguration(
     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_ENABLE_BSDIFF_PATCH_SUPPORT = "enableBsdiffPatchSupport"
+    const val UPDATES_CONFIGURATION_MAX_UPDATES_TO_KEEP_KEY = "maxUpdatesToKeep"
 
     const val UPDATES_CONFIGURATION_CODE_SIGNING_CERTIFICATE = "codeSigningCertificate"
     const val UPDATES_CONFIGURATION_CODE_SIGNING_METADATA = "codeSigningMetadata"
@@ -166,6 +177,8 @@ data class UpdatesConfiguration(
     const val UPDATES_CONFIGURATION_CODE_SIGNING_ALLOW_UNSIGNED_MANIFESTS = "codeSigningAllowUnsignedManifests"
 
     private const val UPDATES_CONFIGURATION_LAUNCH_WAIT_MS_DEFAULT_VALUE = 0
+    private const val UPDATES_CONFIGURATION_MAX_UPDATES_TO_KEEP_DEFAULT_VALUE = 2
+    private const val UPDATES_CONFIGURATION_MAX_UPDATES_TO_KEEP_MIN_VALUE = 2
 
     const val UPDATES_CONFIGURATION_RUNTIME_VERSION_READ_FINGERPRINT_FILE_SENTINEL = "file:fingerprint"
     private const val FINGERPRINT_FILE_NAME = "fingerprint"
@@ -174,6 +187,12 @@ data class UpdatesConfiguration(
       return overrideMap?.readValueCheckingType<Boolean>(UPDATES_CONFIGURATION_DISABLE_ANTI_BRICKING_MEASURES) ?: context?.getMetadataValue("expo.modules.updates.DISABLE_ANTI_BRICKING_MEASURES") ?: false
     }
 
+    private fun getMaxUpdatesToKeep(context: Context?, overrideMap: Map<String, Any>?): Int {
+      return overrideMap?.readValueCheckingType<Int>(UPDATES_CONFIGURATION_MAX_UPDATES_TO_KEEP_KEY)
+        ?: context?.getMetadataValue("expo.modules.updates.EXPO_UPDATES_MAX_UPDATES_TO_KEEP")
+        ?: UPDATES_CONFIGURATION_MAX_UPDATES_TO_KEEP_DEFAULT_VALUE
+    }
+
     private fun getHasEmbeddedUpdate(
       context: Context?,
       overrideMap: Map<String, Any>?,
@@ -281,7 +300,11 @@ data class UpdatesConfiguration(
         return UpdatesConfigurationValidationResult.INVALID_NOT_ENABLED
       }
       val disableAntiBrickingMeasures = getDisableAntiBrickingMeasures(context, overrideMap)
-      val configOverride = if (context != null) UpdatesConfigurationOverride.load(context) else null
+      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()) {
@@ -350,7 +373,11 @@ internal fun getNormalizedUrlOrigin(url: Uri): String {
   if (port == getDefaultPortForScheme(scheme)) {
     port = -1
   }
-  return if (port > -1) "$scheme://${url.host}:$port" else "$scheme://${url.host}"
+  return if (port > -1) {
+    "$scheme://${url.host}:$port"
+  } else {
+    "$scheme://${url.host}"
+  }
 }
 
 private fun maybeGetDefaultScopeKey(scopeKey: String?, updateUrl: Uri): String {

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

@@ -28,11 +28,19 @@ class UpdatesPackage : Package {
     val handler: ReactNativeHostHandler = object : ReactNativeHostHandler {
 
       override fun getJSBundleFile(useDeveloperSupport: Boolean): String? {
-        return if (UpdatesController.instance.isActiveController) UpdatesController.instance.launchAssetFile else null
+        return if (UpdatesController.instance.isActiveController) {
+          UpdatesController.instance.launchAssetFile
+        } else {
+          null
+        }
       }
 
       override fun getBundleAssetName(useDeveloperSupport: Boolean): String? {
-        return if (UpdatesController.instance.isActiveController) UpdatesController.instance.bundleAssetName else null
+        return if (UpdatesController.instance.isActiveController) {
+          UpdatesController.instance.bundleAssetName
+        } else {
+          null
+        }
       }
 
       override fun onWillCreateReactInstance(useDeveloperSupport: Boolean) {

package/android/src/main/java/expo/modules/updates/codesigning/CodeSigningConfiguration.kt

@@ -96,7 +96,11 @@ class CodeSigningConfiguration(
     }.verify(Base64.decode(info.signature, Base64.DEFAULT))
 
     return SignatureValidationResult(
-      if (isValid) ValidationResult.VALID else ValidationResult.INVALID,
+      if (isValid) {
+        ValidationResult.VALID
+      } else {
+        ValidationResult.INVALID
+      },
       certificateChain.codeSigningCertificate.expoProjectInformation()
     )
   }

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

@@ -75,7 +75,11 @@ object BuildData {
 
   fun getBuildDataFromDatabase(database: UpdatesDatabase, scopeKey: String): JSONObject? {
     val buildJSONString = database.jsonDataDao()?.loadJSONStringForKey(JSONDataDao.JSONDataKey.STATIC_BUILD_DATA, scopeKey)
-    return if (buildJSONString == null) null else JSONObject(buildJSONString)
+    return if (buildJSONString == null) {
+      null
+    } else {
+      JSONObject(buildJSONString)
+    }
   }
 
   private fun getBuildDataFromConfig(updatesConfiguration: UpdatesConfiguration): JSONObject {

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

@@ -15,7 +15,11 @@ class Converters {
 
   @TypeConverter
   fun longToDate(value: Long?): Date? {
-    return if (value == null) null else Date(value)
+    return if (value == null) {
+      null
+    } else {
+      Date(value)
+    }
   }
 
   @TypeConverter
@@ -25,7 +29,11 @@ class Converters {
 
   @TypeConverter
   fun stringToUri(string: String?): Uri? {
-    return if (string == null) null else Uri.parse(string)
+    return if (string == null) {
+      null
+    } else {
+      Uri.parse(string)
+    }
   }
 
   @TypeConverter

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

@@ -58,7 +58,11 @@ abstract class UpdateDao {
 
   fun loadUpdateWithId(id: UUID): UpdateEntity? {
     val updateEntities = loadUpdatesWithId(id)
-    return if (updateEntities.isNotEmpty()) updateEntities[0] else null
+    return if (updateEntities.isNotEmpty()) {
+      updateEntities[0]
+    } else {
+      null
+    }
   }
 
   fun loadLaunchAssetForUpdate(updateId: UUID): AssetEntity? {

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

@@ -265,7 +265,11 @@ class DatabaseLauncher(
 
         database.assetDao().updateAsset(result.assetEntity)
         val assetFileLocal = File(updatesDirectory, result.assetEntity.relativePath!!)
-        if (assetFileLocal.exists()) assetFileLocal else null
+        if (assetFileLocal.exists()) {
+          assetFileLocal
+        } else {
+          null
+        }
       } catch (e: Exception) {
         logger.error("Failed to load asset from disk or network", e, UpdatesErrorCode.AssetsFailedToLoad)
         if (asset.isLaunchAsset) {

package/android/src/main/java/expo/modules/updates/loader/EmbeddedLoader.kt

@@ -102,7 +102,11 @@ class EmbeddedLoader internal constructor(
       } catch (e: FileNotFoundException) {
         throw AssertionError(
           "APK bundle must contain the expected embedded asset " +
-            if (assetEntity.embeddedAssetFilename != null) assetEntity.embeddedAssetFilename else assetEntity.resourcesFilename
+            if (assetEntity.embeddedAssetFilename != null) {
+              assetEntity.embeddedAssetFilename
+            } else {
+              assetEntity.resourcesFilename
+            }
         )
       }
     }

package/android/src/main/java/expo/modules/updates/loader/FileDownloader.kt

@@ -1095,7 +1095,11 @@ private class FileDownloadProgressResponseBody(
 
       override fun read(sink: Buffer, byteCount: Long): Long {
         val bytesRead = super.read(sink, byteCount)
-        totalBytesRead += if (bytesRead != -1L) bytesRead else 0
+        totalBytesRead += if (bytesRead != -1L) {
+          bytesRead
+        } else {
+          0
+        }
         progressListener.update(totalBytesRead, responseBody.contentLength())
         return bytesRead
       }

package/android/src/main/java/expo/modules/updates/loader/Loader.kt

@@ -238,7 +238,11 @@ abstract class Loader protected constructor(
 
         handleAssetDownloadCompleted(
           result.assetEntity,
-          if (result.isNew) AssetLoadResult.FINISHED else AssetLoadResult.ALREADY_EXISTS
+          if (result.isNew) {
+            AssetLoadResult.FINISHED
+          } else {
+            AssetLoadResult.ALREADY_EXISTS
+          }
         )
       }
       assetDownloadJobs.add(job)

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

@@ -24,7 +24,11 @@ object ManifestMetadata {
     return try {
       val jsonString = database.jsonDataDao()!!
         .loadJSONStringForKey(key, configuration.scopeKey)
-      if (jsonString != null) JSONObject(jsonString) else null
+      if (jsonString != null) {
+        JSONObject(jsonString)
+      } else {
+        null
+      }
     } catch (e: Exception) {
       Log.e(TAG, "Error retrieving $key from database", e)
       null

package/android/src/main/java/expo/modules/updates/selectionpolicy/ReaperSelectionPolicyFilterAware.kt

@@ -4,17 +4,22 @@ import expo.modules.updates.db.entity.UpdateEntity
 import expo.modules.updates.db.enums.UpdateStatus
 import org.json.JSONObject
 
+private const val DEFAULT_MAX_UPDATES_TO_KEEP = 2
+private const val MIN_MAX_UPDATES_TO_KEEP = 2
+
 /**
  * ReaperSelectionPolicy which chooses which updates to delete taking into account manifest filters
- * originating from the server. If an older update is available, it will choose to keep one older
- * update in addition to the one currently running, preferring updates that match the same filters
- * if available.
+ * originating from the server. If older updates are available, it will choose to keep up to
+ * `maxUpdatesToKeep - 1` older updates in addition to the one currently running, preferring
+ * updates that match the same filters if available.
  *
  * Uses `commitTime` to determine ordering of updates.
  *
  * Chooses only to delete updates whose scope matches that of `launchedUpdate`.
  */
-class ReaperSelectionPolicyFilterAware : ReaperSelectionPolicy {
+class ReaperSelectionPolicyFilterAware @JvmOverloads constructor(
+  private val maxUpdatesToKeep: Int = DEFAULT_MAX_UPDATES_TO_KEEP
+) : ReaperSelectionPolicy {
   override fun selectUpdatesToDelete(
     updates: List<UpdateEntity>,
     launchedUpdate: UpdateEntity?,
@@ -24,11 +29,8 @@ class ReaperSelectionPolicyFilterAware : ReaperSelectionPolicy {
       return listOf()
     }
     val updatesToDelete = mutableListOf<UpdateEntity>()
-    // keep the launched update and one other, to be safe and make roll backs faster
-    // keep the next newest update that matches all the manifest filters, unless no other updates do
-    // in which case, keep the next newest across all updates
-    var nextNewestUpdate: UpdateEntity? = null
-    var nextNewestUpdateMatchingFilters: UpdateEntity? = null
+    val olderUpdates = mutableListOf<UpdateEntity>()
+
     for (update in updates) {
       // ignore any updates whose scopeKey doesn't match that of the launched update
       if (update.scopeKey != launchedUpdate.scopeKey) {
@@ -36,23 +38,37 @@ class ReaperSelectionPolicyFilterAware : ReaperSelectionPolicy {
       }
       if (update.commitTime.before(launchedUpdate.commitTime)) {
         updatesToDelete.add(update)
-        if (nextNewestUpdate == null || nextNewestUpdate.commitTime.before(update.commitTime)) {
-          nextNewestUpdate = update
-        }
-        if (SelectionPolicies.matchesFilters(update, filters) &&
-          (nextNewestUpdateMatchingFilters == null || nextNewestUpdateMatchingFilters.commitTime.before(update.commitTime))
-        ) {
-          nextNewestUpdateMatchingFilters = update
-        }
+        olderUpdates.add(update)
       }
     }
-    if (nextNewestUpdateMatchingFilters != null) {
-      updatesToDelete.remove(nextNewestUpdateMatchingFilters)
-    } else if (nextNewestUpdate != null) {
-      updatesToDelete.remove(nextNewestUpdate)
+
+    val maxOlderUpdatesToKeep = maxUpdatesToKeep - 1
+    // Use a set so fallback selection and deletion do not scan all retained updates per candidate.
+    val olderUpdatesToKeep = olderUpdates
+      .filter { SelectionPolicies.matchesFilters(it, filters) }
+      .sortedByDescending { it.commitTime }
+      .take(maxOlderUpdatesToKeep)
+      .toMutableSet()
+
+    if (olderUpdatesToKeep.size < maxOlderUpdatesToKeep) {
+      olderUpdatesToKeep.addAll(
+        olderUpdates
+          .filter { !olderUpdatesToKeep.contains(it) }
+          .sortedByDescending { it.commitTime }
+          .take(maxOlderUpdatesToKeep - olderUpdatesToKeep.size)
+      )
     }
+    updatesToDelete.removeAll(olderUpdatesToKeep)
 
     // don't delete embedded update
     return updatesToDelete.filter { it.status != UpdateStatus.EMBEDDED }
   }
+
+  init {
+    if (maxUpdatesToKeep < MIN_MAX_UPDATES_TO_KEEP) {
+      throw AssertionError(
+        "Cannot initialize ReaperSelectionPolicyFilterAware with maxUpdatesToKeep < $MIN_MAX_UPDATES_TO_KEEP"
+      )
+    }
+  }
 }

package/android/src/main/java/expo/modules/updates/selectionpolicy/SelectionPolicyFactory.kt

@@ -11,7 +11,7 @@ object SelectionPolicyFactory {
     return SelectionPolicy(
       LauncherSelectionPolicyFilterAware(runtimeVersion, config),
       LoaderSelectionPolicyFilterAware(config),
-      ReaperSelectionPolicyFilterAware()
+      ReaperSelectionPolicyFilterAware(config.maxUpdatesToKeep)
     )
   }
 }

package/ios/EXUpdates/AppController.swift

@@ -259,6 +259,11 @@ public class AppController: NSObject {
           message: "The expo-updates system is disabled due to an invalid configuration. Ensure a valid URL is supplied.",
           code: .initializationError
         )
+      case .InvalidMaxUpdatesToKeep:
+        logger.warn(
+          message: "The expo-updates system is disabled due to an invalid configuration. Ensure EXUpdatesMaxUpdatesToKeep is an integer of at least 2.",
+          code: .initializationError
+        )
       case .InvalidMissingRuntimeVersion:
         logger.warn(
           message: "The expo-updates system is disabled due to an invalid configuration. Ensure a runtime version is supplied.",

package/ios/EXUpdates/DevLauncherAppController.swift

@@ -14,6 +14,7 @@ enum DevLauncherAppControllerError: Int, Error, LocalizedError {
   case invalidRuntimeVersion
   case updateLaunchFailed
   case configFailed
+  case invalidMaxUpdatesToKeep
 
   var errorDescription: String? {
     switch self {
@@ -27,6 +28,8 @@ enum DevLauncherAppControllerError: Int, Error, LocalizedError {
       return "Failed to read stored updates: configuration object must include a valid runtime version"
     case .updateLaunchFailed:
       return "Failed to launch update with an unknown error"
+    case .invalidMaxUpdatesToKeep:
+      return "Failed to read stored updates: EXUpdatesMaxUpdatesToKeep must be an integer of at least 2"
     case .configFailed:
       return "Cannot load configuration from Expo.plist. Please ensure you've followed the setup and installation instructions for expo-updates to create Expo.plist and add it to your Xcode project."
     }
@@ -251,6 +254,8 @@ public final class DevLauncherAppController: NSObject, InternalAppControllerInte
       throw DevLauncherAppControllerError.invalidPlist
     case .InvalidMissingURL:
       throw DevLauncherAppControllerError.invalidUpdateURL
+    case .InvalidMaxUpdatesToKeep:
+      throw DevLauncherAppControllerError.invalidMaxUpdatesToKeep
     case .InvalidMissingRuntimeVersion:
       throw DevLauncherAppControllerError.invalidRuntimeVersion
     }

package/ios/EXUpdates/EnabledAppController.swift

@@ -56,7 +56,8 @@ public class EnabledAppController: InternalAppControllerInterface, UpdatesInterf
   private var selectionPolicy: SelectionPolicy {
     return SelectionPolicyFactory.filterAwarePolicy(
       withRuntimeVersion: config.runtimeVersion,
-      config: config
+      config: config,
+      embeddedUpdateId: getEmbeddedUpdate()?.updateId
     )
   }
 

package/ios/EXUpdates/SelectionPolicy/ReaperSelectionPolicyFilterAware.swift

@@ -4,25 +4,44 @@
 
 /**
  * A ReaperSelectionPolicy which chooses which updates to delete taking into account manifest filters
- * originating from the server. If an older update is available, it will choose to keep one older
- * update in addition to the one currently running, preferring updates that match the same filters
- * if available.
+ * originating from the server. If older updates are available, it will choose to keep up to
+ * `maxUpdatesToKeep - 1` older updates in addition to the one currently running, preferring
+ * updates that match the same filters if available.
  *
  * Uses `commitTime` to determine ordering of updates.
  *
- * Chooses only to delete updates who scope matches that of `launchedUpdate`.
+ * Chooses only to delete updates whose scope matches that of `launchedUpdate`.
  */
 @objc(EXUpdatesReaperSelectionPolicyFilterAware)
 @objcMembers
 public final class ReaperSelectionPolicyFilterAware: NSObject, ReaperSelectionPolicy {
-  public func updatesToDelete(withLaunchedUpdate launchedUpdate: Update, updates: [Update], filters: [String: Any]?) -> [Update] {
-    var updatesToDelete: [Update] = []
+  private let maxUpdatesToKeep: Int
+  private let embeddedUpdateId: UUID?
+
+  public override init() {
+    self.maxUpdatesToKeep = 2
+    self.embeddedUpdateId = nil
+  }
+
+  public convenience init(maxUpdatesToKeep: Int) {
+    self.init(maxUpdatesToKeep: maxUpdatesToKeep, embeddedUpdateId: nil)
+  }
+
+  public init(maxUpdatesToKeep: Int, embeddedUpdateId: UUID?) {
+    self.maxUpdatesToKeep = maxUpdatesToKeep
+    self.embeddedUpdateId = embeddedUpdateId
 
-    // keep the launched update and one other, the next newest, to be safe and make rollbacks faster
-    // keep the next newest update that matches all the manifest filters, unless no other updates do
-    // in which case, keep the next newest across all updates
-    var nextNewestUpdate: Update?
-    var nextNewestUpdateMatchingFilters: Update?
+    if maxUpdatesToKeep < 2 {
+      NSException.init(
+        name: .invalidArgumentException,
+        reason: "Cannot initialize ReaperSelectionPolicyFilterAware with maxUpdatesToKeep < 2"
+      )
+      .raise()
+    }
+  }
+
+  public func updatesToDelete(withLaunchedUpdate launchedUpdate: Update, updates: [Update], filters: [String: Any]?) -> [Update] {
+    var olderUpdates: [Update] = []
 
     for update in updates {
       guard let launchedUpdateScopeKey = launchedUpdate.scopeKey,
@@ -36,32 +55,30 @@ public final class ReaperSelectionPolicyFilterAware: NSObject, ReaperSelectionPo
       }
 
       if launchedUpdate.commitTime.compare(update.commitTime) == .orderedDescending {
-        updatesToDelete.append(update)
-
-        if let nextNewestUpdateInner = nextNewestUpdate,
-          update.commitTime.compare(nextNewestUpdateInner.commitTime) == .orderedDescending {
-          nextNewestUpdate = update
-        } else {
-          nextNewestUpdate = update
-        }
-
-        if SelectionPolicies.doesUpdate(update, matchFilters: filters) {
-          if let nextNewestUpdateMatchingFiltersInner = nextNewestUpdateMatchingFilters,
-            update.commitTime.compare(nextNewestUpdateMatchingFiltersInner.commitTime) == .orderedDescending {
-            nextNewestUpdateMatchingFilters = update
-          } else {
-            nextNewestUpdateMatchingFilters = update
-          }
-        }
+        olderUpdates.append(update)
       }
     }
 
-    if let nextNewestUpdateMatchingFilters = nextNewestUpdateMatchingFilters {
-      updatesToDelete.remove(nextNewestUpdateMatchingFilters)
-    } else if let nextNewestUpdate = nextNewestUpdate {
-      updatesToDelete.remove(nextNewestUpdate)
+    // Embedded rows from previous binaries cannot be launched and must not occupy fallback slots.
+    let launchableOlderUpdates = olderUpdates.filter {
+      $0.status != .StatusEmbedded || $0.updateId == embeddedUpdateId
     }
-    return updatesToDelete
+    let maxOlderUpdatesToKeep = maxUpdatesToKeep - 1
+    let matchingUpdatesToKeep = launchableOlderUpdates
+      .filter { SelectionPolicies.doesUpdate($0, matchFilters: filters) }
+      .sorted { $0.commitTime.compare($1.commitTime) == .orderedDescending }
+      .prefix(maxOlderUpdatesToKeep)
+    var olderUpdatesToKeep = Set(matchingUpdatesToKeep)
+
+    if matchingUpdatesToKeep.count < maxOlderUpdatesToKeep {
+      let remainingUpdatesToKeep = launchableOlderUpdates
+        .filter { !olderUpdatesToKeep.contains($0) }
+        .sorted { $0.commitTime.compare($1.commitTime) == .orderedDescending }
+        .prefix(maxOlderUpdatesToKeep - matchingUpdatesToKeep.count)
+      olderUpdatesToKeep.formUnion(remainingUpdatesToKeep)
+    }
+
+    return olderUpdates.filter { !olderUpdatesToKeep.contains($0) && $0.updateId != embeddedUpdateId }
   }
 }
 

package/ios/EXUpdates/SelectionPolicy/SelectionPolicyFactory.swift

@@ -10,10 +10,14 @@ import Foundation
 @objcMembers
 public final class SelectionPolicyFactory: NSObject {
   public static func filterAwarePolicy(withRuntimeVersion runtimeVersion: String, config: UpdatesConfig) -> SelectionPolicy {
+    return filterAwarePolicy(withRuntimeVersion: runtimeVersion, config: config, embeddedUpdateId: nil)
+  }
+
+  public static func filterAwarePolicy(withRuntimeVersion runtimeVersion: String, config: UpdatesConfig, embeddedUpdateId: UUID?) -> SelectionPolicy {
     return SelectionPolicy.init(
       launcherSelectionPolicy: LauncherSelectionPolicyFilterAware.init(runtimeVersion: runtimeVersion, config: config),
       loaderSelectionPolicy: LoaderSelectionPolicyFilterAware(config: config),
-      reaperSelectionPolicy: ReaperSelectionPolicyFilterAware()
+      reaperSelectionPolicy: ReaperSelectionPolicyFilterAware(maxUpdatesToKeep: config.maxUpdatesToKeep, embeddedUpdateId: embeddedUpdateId)
     )
   }
 }