expo-updates 1.0.0-canary-20250131-5c4e588 → 1.0.0-canary-20250207-8bc5146

package/CHANGELOG.md

@@ -16,6 +16,8 @@
 - 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
 

package/android/build.gradle

@@ -112,7 +112,6 @@ 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'

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,
@@ -215,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() }
         }
       }
 

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/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)

package/cli/build/syncConfigurationToNativeAsync.js

@@ -29,7 +29,7 @@ async function syncConfigurationToNativeAsync(options) {
 exports.syncConfigurationToNativeAsync = syncConfigurationToNativeAsync;
 async function syncConfigurationToNativeAndroidAsync(options) {
     const { exp } = (0, config_1.getConfig)(options.projectRoot, {
-        isPublicConfig: true,
+        isPublicConfig: false,
         skipSDKVersionRequirement: true,
     });
     // sync AndroidManifest.xml
@@ -50,7 +50,7 @@ async function syncConfigurationToNativeAndroidAsync(options) {
 }
 async function syncConfigurationToNativeIosAsync(options) {
     const { exp } = (0, config_1.getConfig)(options.projectRoot, {
-        isPublicConfig: true,
+        isPublicConfig: false,
         skipSDKVersionRequirement: true,
     });
     const expoPlist = await readExpoPlistAsync(options.projectRoot);

package/cli/src/syncConfigurationToNativeAsync.ts

@@ -37,7 +37,7 @@ async function syncConfigurationToNativeAndroidAsync(
   options: SyncConfigurationToNativeOptions
 ): Promise<void> {
   const { exp } = getConfig(options.projectRoot, {
-    isPublicConfig: true,
+    isPublicConfig: false, // This must be false or it will drop codesigning config
     skipSDKVersionRequirement: true,
   });
 
@@ -84,7 +84,7 @@ async function syncConfigurationToNativeIosAsync(
   options: SyncConfigurationToNativeOptions
 ): Promise<void> {
   const { exp } = getConfig(options.projectRoot, {
-    isPublicConfig: true,
+    isPublicConfig: false, // This must be false or it will drop codesigning config
     skipSDKVersionRequirement: true,
   });
 

package/e2e/setup/project.ts

@@ -54,11 +54,11 @@ function getExpoDependencyChunks({
             'expo-audio',
             'expo-av',
             'expo-blur',
+            'expo-crypto',
             'expo-image',
             'expo-linear-gradient',
             'expo-linking',
             'expo-localization',
-            'expo-crypto',
             'expo-network',
             'expo-secure-store',
             'expo-symbols',
@@ -314,10 +314,10 @@ async function preparePackageJson(
 
   const extraDevDependencies = configureE2E
     ? {
-        '@config-plugins/detox': '^5.0.1',
+        '@config-plugins/detox': '^9.0.0',
         '@types/express': '^4.17.17',
         '@types/jest': '^29.4.0',
-        detox: '^20.4.0',
+        detox: '^20.33.0',
         express: '^4.18.2',
         'form-data': '^4.0.0',
         jest: '^29.3.1',
@@ -367,7 +367,7 @@ async function preparePackageJson(
       ...packageJson,
       dependencies: {
         ...packageJson.dependencies,
-        'react-native': 'npm:react-native-tvos@~0.76.6-0',
+        'react-native': 'npm:react-native-tvos@~0.77.0-0',
         '@react-native-tvos/config-tv': '^0.1.1',
       },
       expo: {
@@ -460,7 +460,15 @@ function transformAppJsonForE2E(
   runtimeVersion: string,
   isTV: boolean
 ) {
-  const plugins: any[] = ['expo-updates', '@config-plugins/detox'];
+  const plugins: any[] = [
+    'expo-updates',
+    [
+      '@config-plugins/detox',
+      {
+        subdomains: Array.from(new Set(['10.0.2.2', 'localhost', process.env.UPDATES_HOST])),
+      },
+    ],
+  ];
   if (isTV) {
     plugins.push([
       '@react-native-tvos/config-tv',
@@ -576,7 +584,15 @@ export function transformAppJsonForUpdatesDisabledE2E(
   projectName: string,
   runtimeVersion: string
 ) {
-  const plugins: any[] = ['expo-updates', '@config-plugins/detox'];
+  const plugins: any[] = [
+    'expo-updates',
+    [
+      '@config-plugins/detox',
+      {
+        subdomains: Array.from(new Set(['10.0.2.2', 'localhost', process.env.UPDATES_HOST])),
+      },
+    ],
+  ];
   return {
     ...appJson,
     expo: {
@@ -770,7 +786,7 @@ export async function initAsync(
   // enable proguard on Android
   await fs.appendFile(
     path.join(projectRoot, 'android', 'gradle.properties'),
-    '\nandroid.enableProguardInReleaseBuilds=true\nandroid.kotlinVersion=1.9.24\nEXPO_UPDATES_NATIVE_DEBUG=true',
+    '\nandroid.enableProguardInReleaseBuilds=true\nEXPO_UPDATES_NATIVE_DEBUG=true',
     'utf-8'
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "1.0.0-canary-20250131-5c4e588",
+  "version": "1.0.0-canary-20250207-8bc5146",
   "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-20250131-5c4e588",
-    "@expo/config-plugins": "9.0.15-canary-20250131-5c4e588",
+    "@expo/config": "11.0.0-canary-20250207-8bc5146",
+    "@expo/config-plugins": "9.0.16-canary-20250207-8bc5146",
     "@expo/spawn-async": "^1.7.2",
     "arg": "4.1.0",
     "chalk": "^4.1.2",
-    "expo-eas-client": "0.13.3-canary-20250131-5c4e588",
-    "expo-manifests": "0.15.6-canary-20250131-5c4e588",
-    "expo-structured-headers": "4.0.1-canary-20250131-5c4e588",
-    "expo-updates-interface": "1.0.1-canary-20250131-5c4e588",
+    "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",
     "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-20250131-5c4e588",
+    "expo-module-scripts": "4.0.4-canary-20250207-8bc5146",
     "express": "^4.21.1",
     "form-data": "^4.0.0",
     "fs-extra": "~8.1.0",
@@ -65,7 +65,8 @@
     "xstate": "^4.37.2"
   },
   "peerDependencies": {
-    "expo": "53.0.0-canary-20250131-5c4e588",
+    "expo": "53.0.0-canary-20250207-8bc5146",
     "react": "*"
-  }
+  },
+  "gitHead": "8bc5146852ccd7033138bac9ef8d3c41ae85a211"
 }