expo-updates 0.18.17 → 0.18.18

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.18.18 — 2023-12-15
+
+### 🐛 Bug fixes
+
+- [Android] overwrite duplicates when copying assets. ([#25898](https://github.com/expo/expo/pull/25898) by [@douglowder](https://github.com/douglowder))
+
 ## 0.18.17 — 2023-10-25
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.18.17'
+version = '0.18.18'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -95,7 +95,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 31
-    versionName '0.18.17'
+    versionName '0.18.18'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -1,10 +1,8 @@
 package expo.modules.updates
 
 import android.content.Context
-import expo.modules.updates.UpdatesConfiguration.CheckAutomaticallyConfiguration
-import expo.modules.updates.db.entity.AssetEntity
-import android.os.AsyncTask
 import android.net.ConnectivityManager
+import android.os.AsyncTask
 import android.util.Base64
 import android.util.Log
 import com.facebook.react.ReactNativeHost
@@ -12,14 +10,14 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
+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.*
-import java.lang.ClassCastException
-import java.lang.Exception
 import java.lang.ref.WeakReference
 import java.security.DigestInputStream
 import java.security.MessageDigest
@@ -130,16 +128,15 @@ object UpdatesUtils {
       if (expectedBase64URLEncodedHash != null && expectedBase64URLEncodedHash != hashBase64String) {
         throw IOException("File download was successful but base64url-encoded SHA-256 did not match expected; expected: $expectedBase64URLEncodedHash; actual: $hashBase64String")
       }
-
       // only rename after the hash has been verified
       // Since renameTo() does not expose detailed errors, and can fail if source and destination
       // are not on the same mount point, we do a copyTo followed by delete
+      // if there are two assets with identical content, they will be written to the same file path,
+      // so we allow overwrites
       try {
-        tmpFile.copyTo(destination)
+        tmpFile.copyTo(destination, true)
       } catch (e: NoSuchFileException) {
         throw IOException("File download was successful, but temp file ${tmpFile.absolutePath} does not exist")
-      } catch (e: FileAlreadyExistsException) {
-        throw IOException("File download was successful, but file already exists at ${destination.absolutePath}")
       } catch (e: Exception) {
         throw IOException("File download was successful, but an exception occurred: $e")
       } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.18.17",
+  "version": "0.18.18",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -64,5 +64,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "63bbdf029ce2847c870649449ee593c97bbe3fb3"
+  "gitHead": "4c1bf9223e08092f72d8bee2df24f75d042e790b"
 }