expo-updates 1.0.0-canary-20250207-8bc5146 → 1.0.0-canary-20250219-4a5dade

package/CHANGELOG.md

@@ -18,6 +18,7 @@
 - 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))
+- [Android] Fix `bytesToHex` `ArrayIndexOutOfBoundsException` during conversion. ([#34855](https://github.com/expo/expo/pull/34855) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
 ### 💡 Others
 
@@ -26,6 +27,9 @@
 - [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))
+- Fixed incorrect error log on Android. ([#34785](https://github.com/expo/expo/pull/34785) by [@kudo](https://github.com/kudo))
+- [Android] Started using expo modules gradle plugin. ([#34806](https://github.com/expo/expo/pull/34806) by [@lukmccall](https://github.com/lukmccall))
+- Add update id headers to asset requests ([#34453](https://github.com/expo/expo/pull/34453) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
 ## 0.26.10 - 2024-12-05
 

package/android/build.gradle

@@ -1,31 +1,42 @@
 buildscript {
-  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-  apply from: expoModulesCorePlugin
-  applyKotlinExpoModulesCorePlugin()
+  ext {
+    boolish = { value ->
+      return value.toString().toBoolean()
+    }
+    getKspVersion = {
+      if (rootProject.hasProperty("kspVersion")) {
+        return rootProject["kspVersion"]
+      }
+
+      // We can remove this path once we update the test environment
+      // to use the same version of Kotlin as the `expo/expo` repo.
+      def kotlinVersion = rootProject["kotlinVersion"]
+      if (kotlinVersion == "2.0.21") {
+        return "2.0.21-1.0.28"
+      } else if (kotlinVersion == "1.9.25") {
+        return "1.9.25-1.0.20"
+      }
+
+      return "1.9.24-1.0.20"
+    }
+  }
 
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:${kspVersion()}"
+    classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:${getKspVersion()}"
   }
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'expo-module-gradle-plugin'
 apply plugin: 'com.google.devtools.ksp'
 
 group = 'host.exp.exponent'
 version = '0.26.9'
 
-def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-apply from: expoModulesCorePlugin
-applyKotlinExpoModulesCorePlugin()
-applyKspJvmToolchain()
-useCoreDependencies()
-useDefaultAndroidSdkVersions()
-useExpoPublishing()
-
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
 def getBoolStringFromPropOrEnv(String name, Boolean defaultValue) {
@@ -117,7 +128,7 @@ dependencies {
   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.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}"
   testImplementation 'org.robolectric:robolectric:4.14.1'
 
   androidTestImplementation 'com.squareup.okio:okio:2.9.0'
@@ -126,7 +137,7 @@ dependencies {
   androidTestImplementation 'androidx.test:rules:1.5.0'
   androidTestImplementation "io.mockk:mockk-android:$mockk_version"
   androidTestImplementation "androidx.room:room-testing:$room_version"
-  androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion()}"
+  androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}"
 
-  implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion()}"
+  implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
 }

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

@@ -185,7 +185,7 @@ object UpdatesUtils {
   fun bytesToHex(bytes: ByteArray): String {
     val hexChars = CharArray(bytes.size * 2)
     for (j in bytes.indices) {
-      val v = (bytes[j] and 0xFF.toByte()).toInt()
+      val v = bytes[j].toInt() and 0xFF
       hexChars[j * 2] = HEX_ARRAY[v ushr 4]
       hexChars[j * 2 + 1] = HEX_ARRAY[v and 0x0F]
     }

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

@@ -15,8 +15,10 @@ import expo.modules.updates.loader.LoaderFiles
 import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogger
 import expo.modules.updates.manifest.EmbeddedManifestUtils
+import expo.modules.updates.manifest.EmbeddedUpdate
 import expo.modules.updates.manifest.ManifestMetadata
 import expo.modules.updates.selectionpolicy.SelectionPolicy
+import org.json.JSONObject
 import java.io.File
 
 /**
@@ -92,7 +94,10 @@ class DatabaseLauncher(
       this.callback!!.onFailure(Exception("Launch asset relative path should not be null. Debug info: ${launchedUpdate!!.debugInfo()}"))
     }
 
-    val launchAssetFile = ensureAssetExists(launchAsset, database)
+    val embeddedUpdate = EmbeddedManifestUtils.getEmbeddedUpdate(context, configuration)
+    val extraHeaders = FileDownloader.getExtraHeadersForRemoteAssetRequest(launchedUpdate, embeddedUpdate?.updateEntity, launchedUpdate)
+
+    val launchAssetFile = ensureAssetExists(launchAsset, database, embeddedUpdate, extraHeaders)
     if (launchAssetFile != null) {
       this.launchAssetFile = launchAssetFile.toString()
     }
@@ -107,7 +112,7 @@ class DatabaseLauncher(
         }
         val filename = asset.relativePath
         if (filename != null) {
-          val assetFile = ensureAssetExists(asset, database)
+          val assetFile = ensureAssetExists(asset, database, embeddedUpdate, extraHeaders)
           if (assetFile != null) {
             this[asset] = Uri.fromFile(assetFile).toString()
           }
@@ -170,13 +175,12 @@ class DatabaseLauncher(
     }
   }
 
-  fun ensureAssetExists(asset: AssetEntity, database: UpdatesDatabase): File? {
+  fun ensureAssetExists(asset: AssetEntity, database: UpdatesDatabase, embeddedUpdate: EmbeddedUpdate?, extraHeaders: JSONObject): File? {
     val assetFile = File(updatesDirectory, asset.relativePath ?: "")
     var assetFileExists = assetFile.exists()
     if (!assetFileExists) {
       // something has gone wrong, we're missing this asset
       // first we check to see if a copy is embedded in the binary
-      val embeddedUpdate = EmbeddedManifestUtils.getEmbeddedUpdate(context, configuration)
       if (embeddedUpdate != null) {
         val embeddedAssets = embeddedUpdate.assetEntityList
         var matchingEmbeddedAsset: AssetEntity? = null
@@ -204,9 +208,11 @@ class DatabaseLauncher(
     return if (!assetFileExists) {
       // we still don't have the asset locally, so try downloading it remotely
       assetsToDownload++
+
       fileDownloader.downloadAsset(
         asset,
         updatesDirectory,
+        extraHeaders,
         object : AssetDownloadCallback {
           override fun onFailure(e: Exception, assetEntity: AssetEntity) {
             logger.error("Failed to load asset from disk or network", e, UpdatesErrorCode.AssetsFailedToLoad)

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

@@ -7,6 +7,7 @@ import expo.modules.updates.db.UpdatesDatabase
 import expo.modules.updates.loader.FileDownloader.AssetDownloadCallback
 import expo.modules.updates.loader.FileDownloader.RemoteUpdateDownloadCallback
 import expo.modules.updates.UpdatesUtils
+import expo.modules.updates.db.entity.UpdateEntity
 import expo.modules.updates.logging.UpdatesLogger
 import java.io.File
 import java.io.FileNotFoundException
@@ -71,6 +72,8 @@ class EmbeddedLoader internal constructor(
     assetEntity: AssetEntity,
     updatesDirectory: File?,
     configuration: UpdatesConfiguration,
+    requestedUpdate: UpdateEntity?,
+    embeddedUpdate: UpdateEntity?,
     callback: AssetDownloadCallback
   ) {
     val filename = UpdatesUtils.createFilenameForAsset(assetEntity)

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

@@ -450,6 +450,7 @@ class FileDownloader(
   fun downloadAsset(
     asset: AssetEntity,
     destinationDirectory: File?,
+    extraHeaders: JSONObject,
     callback: AssetDownloadCallback
   ) {
     if (asset.url == null) {
@@ -467,7 +468,7 @@ class FileDownloader(
     } else {
       try {
         downloadAssetAndVerifyHashAndWriteToPath(
-          createRequestForAsset(asset, configuration, context),
+          createRequestForAsset(asset, extraHeaders, configuration, context),
           asset.expectedHash,
           path,
           object : FileDownloadCallback {
@@ -595,12 +596,14 @@ class FileDownloader(
 
     internal fun createRequestForAsset(
       assetEntity: AssetEntity,
+      extraHeaders: JSONObject,
       configuration: UpdatesConfiguration,
       context: Context
     ): Request {
       return Request.Builder()
         .url(assetEntity.url!!.toString())
         .addHeadersFromJSONObject(assetEntity.extraRequestHeaders)
+        .addHeadersFromJSONObject(extraHeaders)
         .header("Expo-Platform", "android")
         .header("Expo-Protocol-Version", "1")
         .header("Expo-API-Version", "1")
@@ -701,5 +704,25 @@ class FileDownloader(
 
       return extraHeaders
     }
+
+    fun getExtraHeadersForRemoteAssetRequest(
+      launchedUpdate: UpdateEntity?,
+      embeddedUpdate: UpdateEntity?,
+      requestedUpdate: UpdateEntity?
+    ): JSONObject {
+      val extraHeaders = JSONObject()
+
+      launchedUpdate?.let {
+        extraHeaders.put("Expo-Current-Update-ID", it.id.toString().lowercase())
+      }
+      embeddedUpdate?.let {
+        extraHeaders.put("Expo-Embedded-Update-ID", it.id.toString().lowercase())
+      }
+      requestedUpdate?.let {
+        extraHeaders.put("Expo-Requested-Update-ID", it.id.toString().lowercase())
+      }
+
+      return extraHeaders
+    }
   }
 }

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

@@ -86,6 +86,8 @@ abstract class Loader protected constructor(
     assetEntity: AssetEntity,
     updatesDirectory: File?,
     configuration: UpdatesConfiguration,
+    requestedUpdate: UpdateEntity?,
+    embeddedUpdate: UpdateEntity?,
     callback: AssetDownloadCallback
   )
 
@@ -204,7 +206,7 @@ abstract class Loader protected constructor(
         // however, it's not ready, so we should try to download all the assets again.
         updateEntity = existingUpdateEntity
       }
-      downloadAllAssets(update.assetEntityList)
+      downloadAllAssets(update)
     }
   }
 
@@ -214,8 +216,11 @@ abstract class Loader protected constructor(
     ERRORED
   }
 
-  private fun downloadAllAssets(assetList: List<AssetEntity>) {
+  private fun downloadAllAssets(update: Update) {
+    val assetList = update.assetEntityList
     assetTotal = assetList.size
+
+    val embeddedUpdate = loaderFiles.readEmbeddedUpdate(context, configuration)
     for (assetEntityCur in assetList) {
       var assetEntity = assetEntityCur
 
@@ -243,6 +248,8 @@ abstract class Loader protected constructor(
         assetEntity,
         updatesDirectory,
         configuration,
+        requestedUpdate = update.updateEntity,
+        embeddedUpdate = embeddedUpdate?.updateEntity,
         object : AssetDownloadCallback {
           override fun onFailure(e: Exception, assetEntity: AssetEntity) {
             val identifier = if (assetEntity.hash != null) {

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

@@ -69,7 +69,7 @@ open class LoaderFiles {
       context.resources.openRawResource(id)
         .use { inputStream -> return UpdatesUtils.verifySHA256AndWriteToFile(inputStream, destination, null) }
     } catch (e: Exception) {
-      Log.e(TAG, "Failed to copy asset " + asset.embeddedAssetFilename, e)
+      Log.e(TAG, "Failed to copy resource asset ${asset.resourcesFolder}/${asset.embeddedAssetFilename}", e)
       throw e
     }
   }

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

@@ -55,9 +55,12 @@ class RemoteLoader internal constructor(
     assetEntity: AssetEntity,
     updatesDirectory: File?,
     configuration: UpdatesConfiguration,
+    requestedUpdate: UpdateEntity?,
+    embeddedUpdate: UpdateEntity?,
     callback: AssetDownloadCallback
   ) {
-    mFileDownloader.downloadAsset(assetEntity, updatesDirectory, callback)
+    val extraHeaders = FileDownloader.getExtraHeadersForRemoteAssetRequest(launchedUpdate, embeddedUpdate, requestedUpdate)
+    mFileDownloader.downloadAsset(assetEntity, updatesDirectory, extraHeaders, callback)
   }
 
   companion object {

package/e2e/setup/project.ts

@@ -59,9 +59,11 @@ function getExpoDependencyChunks({
             'expo-linear-gradient',
             'expo-linking',
             'expo-localization',
+            'expo-media-library',
             'expo-network',
             'expo-secure-store',
             'expo-symbols',
+            'expo-system-ui',
             'expo-ui',
             'expo-video',
           ],

package/ios/EXUpdates/AppLoader/AppLoader.swift

@@ -97,7 +97,7 @@ open class AppLoader: NSObject {
     preconditionFailure("Must override in concrete class")
   }
 
-  open func downloadAsset(_ asset: UpdateAsset) {
+  open func downloadAsset(_ asset: UpdateAsset, extraHeaders: [String: Any]) {
     preconditionFailure("Must override in concrete class")
   }
 
@@ -202,6 +202,13 @@ open class AppLoader: NSObject {
       if let assets = updateManifest.assets(),
         !assets.isEmpty {
         self.assetsToLoad = assets
+        let embeddedUpdate = EmbeddedAppLoader.embeddedManifest(withConfig: self.config, database: self.database)
+        let extraHeaders = FileDownloader.extraHeadersForRemoteAssetRequest(
+          launchedUpdate: self.launchedUpdate,
+          embeddedUpdate: embeddedUpdate,
+          requestedUpdate: updateManifest
+        )
+
         for asset in assets {
           // before downloading, check to see if we already have this asset in the database
           let matchingDbEntry = try? self.database.asset(withKey: asset.key)
@@ -226,11 +233,11 @@ open class AppLoader: NSObject {
                   self.handleAssetDownloadAlreadyExists(asset)
                 }
               } else {
-                self.downloadAsset(asset)
+                self.downloadAsset(asset, extraHeaders: extraHeaders)
               }
             }
           } else {
-            self.downloadAsset(asset)
+            self.downloadAsset(asset, extraHeaders: extraHeaders)
           }
         }
       } else {

package/ios/EXUpdates/AppLoader/EmbeddedAppLoader.swift

@@ -119,7 +119,7 @@ public final class EmbeddedAppLoader: AppLoader {
     ))
   }
 
-  override public func downloadAsset(_ asset: UpdateAsset) {
+  override public func downloadAsset(_ asset: UpdateAsset, extraHeaders: [String: Any]) {
     FileDownloader.assetFilesQueue.async {
       self.handleAssetDownloadAlreadyExists(asset)
     }

package/ios/EXUpdates/AppLoader/FileDownloader.swift

@@ -221,6 +221,30 @@ public final class FileDownloader {
     return extraHeaders
   }
 
+   /**
+   * Get extra headers to pass into `downloadAsset:`
+   */
+  static func extraHeadersForRemoteAssetRequest(
+    launchedUpdate: Update?,
+    embeddedUpdate: Update?,
+    requestedUpdate: Update?
+  ) -> [String: Any] {
+    var extraHeaders: [String: Any] = [:]
+    if let launchedUpdate {
+      extraHeaders["Expo-Current-Update-ID"] = launchedUpdate.updateId.uuidString.lowercased()
+    }
+
+    if let embeddedUpdate {
+      extraHeaders["Expo-Embedded-Update-ID"] = embeddedUpdate.updateId.uuidString.lowercased()
+    }
+
+    if let requestedUpdate {
+      extraHeaders["Expo-Requested-Update-ID"] = requestedUpdate.updateId.uuidString.lowercased()
+    }
+
+    return extraHeaders
+  }
+
   private static func setHTTPHeaderFields(_ headers: [String: Any?]?, onRequest request: inout URLRequest) {
     guard let headers = headers else {
       return

package/ios/EXUpdates/AppLoader/RemoteAppLoader.swift

@@ -84,7 +84,7 @@ public final class RemoteAppLoader: AppLoader {
     }
   }
 
-  override public func downloadAsset(_ asset: UpdateAsset) {
+  override public func downloadAsset(_ asset: UpdateAsset, extraHeaders: [String: Any]) {
     let urlOnDisk = self.directory.appendingPathComponent(asset.filename)
 
     FileDownloader.assetFilesQueue.async {
@@ -101,12 +101,11 @@ public final class RemoteAppLoader: AppLoader {
           )
           return
         }
-
         self.downloader.downloadAsset(
           fromURL: assetUrl,
           verifyingHash: asset.expectedHash,
           toPath: urlOnDisk.path,
-          extraHeaders: asset.extraRequestHeaders ?? [:]
+          extraHeaders: extraHeaders.merging(asset.extraRequestHeaders ?? [:]) { current, _ in current }
         ) { data, response, _ in
           DispatchQueue.global().async {
             self.handleAssetDownload(withData: data, response: response, asset: asset)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "1.0.0-canary-20250207-8bc5146",
+  "version": "1.0.0-canary-20250219-4a5dade",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -39,15 +39,15 @@
   },
   "dependencies": {
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "11.0.0-canary-20250207-8bc5146",
-    "@expo/config-plugins": "9.0.16-canary-20250207-8bc5146",
+    "@expo/config": "11.0.0-canary-20250219-4a5dade",
+    "@expo/config-plugins": "9.0.16-canary-20250219-4a5dade",
     "@expo/spawn-async": "^1.7.2",
     "arg": "4.1.0",
     "chalk": "^4.1.2",
-    "expo-eas-client": "0.13.3-canary-20250207-8bc5146",
-    "expo-manifests": "0.15.6-canary-20250207-8bc5146",
-    "expo-structured-headers": "4.0.1-canary-20250207-8bc5146",
-    "expo-updates-interface": "1.0.1-canary-20250207-8bc5146",
+    "expo-eas-client": "0.13.3-canary-20250219-4a5dade",
+    "expo-manifests": "0.15.7-canary-20250219-4a5dade",
+    "expo-structured-headers": "4.0.1-canary-20250219-4a5dade",
+    "expo-updates-interface": "1.0.1-canary-20250219-4a5dade",
     "fast-glob": "^3.3.2",
     "fbemitter": "^3.0.0",
     "ignore": "^5.3.1",
@@ -57,7 +57,7 @@
     "@types/jest": "^29.2.1",
     "@types/node": "^18.19.34",
     "@types/node-forge": "^1.0.0",
-    "expo-module-scripts": "4.0.4-canary-20250207-8bc5146",
+    "expo-module-scripts": "4.0.5-canary-20250219-4a5dade",
     "express": "^4.21.1",
     "form-data": "^4.0.0",
     "fs-extra": "~8.1.0",
@@ -65,8 +65,8 @@
     "xstate": "^4.37.2"
   },
   "peerDependencies": {
-    "expo": "53.0.0-canary-20250207-8bc5146",
+    "expo": "53.0.0-canary-20250219-4a5dade",
     "react": "*"
   },
-  "gitHead": "8bc5146852ccd7033138bac9ef8d3c41ae85a211"
+  "gitHead": "4a5daded61d3d8b9d501059039ac74c09c25675b"
 }