expo-updates 0.18.2 → 0.18.4

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 0.18.4 — 2023-06-27
+
+### 🐛 Bug fixes
+
+- [iOS] Use weak delegate for state machine. ([#23060](https://github.com/expo/expo/pull/23060) by [@wschurman](https://github.com/wschurman))
+- [Android] Convert LoaderTask.RemoteCheckResult to sealed class. ([#23061](https://github.com/expo/expo/pull/23061) by [@wschurman](https://github.com/wschurman))
+
+## 0.18.3 — 2023-06-24
+
+### 🐛 Bug fixes
+
+- [Android] fix instrumentation tests. ([#23037](https://github.com/expo/expo/pull/23037) by [@douglowder](https://github.com/douglowder))
+- [iOS] Fix crash when dev-client and updates used together. ([#23070](https://github.com/expo/expo/pull/23070) by [@douglowder](https://github.com/douglowder))
+- [Android] Use sealed class for UpdatesStateEvent. ([#23038](https://github.com/expo/expo/pull/23038) by [@wschurman](https://github.com/wschurman))
+
 ## 0.18.2 — 2023-06-23
 
 ### 🐛 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.2'
+version = '0.18.4'
 
 def ex_updates_native_debug = System.getenv("EX_UPDATES_NATIVE_DEBUG") == "1" ? "true" : "false"
 
@@ -70,7 +70,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 31
-    versionName '0.18.2'
+    versionName '0.18.4'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -286,13 +286,10 @@ class UpdatesController private constructor(
         }
 
         override fun onRemoteCheckForUpdateFinished(result: LoaderTask.RemoteCheckResult) {
-          var event: UpdatesStateEvent = UpdatesStateEvent.CheckCompleteUnavailable()
-          if (result.manifest != null) {
-            event = UpdatesStateEvent.CheckCompleteWithUpdate(
-              result.manifest
-            )
-          } else if (result.isRollBackToEmbedded == true) {
-            event = UpdatesStateEvent.CheckCompleteWithRollback()
+          val event = when (result) {
+            is LoaderTask.RemoteCheckResult.NoUpdateAvailable -> UpdatesStateEvent.CheckCompleteUnavailable()
+            is LoaderTask.RemoteCheckResult.UpdateAvailable -> UpdatesStateEvent.CheckCompleteWithUpdate(result.manifest)
+            is LoaderTask.RemoteCheckResult.RollBackToEmbedded -> UpdatesStateEvent.CheckCompleteWithRollback()
           }
           stateMachine.processEvent(event)
         }

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

@@ -52,10 +52,18 @@ class LoaderTask(
   enum class RemoteUpdateStatus {
     ERROR, NO_UPDATE_AVAILABLE, UPDATE_AVAILABLE
   }
-  data class RemoteCheckResult(
-    val isRollBackToEmbedded: Boolean? = null,
-    val manifest: JSONObject? = null
-  )
+
+  sealed class RemoteCheckResult(private val status: Status) {
+    private enum class Status {
+      NO_UPDATE_AVAILABLE,
+      UPDATE_AVAILABLE,
+      ROLL_BACK_TO_EMBEDDED
+    }
+
+    class NoUpdateAvailable : RemoteCheckResult(Status.NO_UPDATE_AVAILABLE)
+    class UpdateAvailable(val manifest: JSONObject) : RemoteCheckResult(Status.UPDATE_AVAILABLE)
+    class RollBackToEmbedded : RemoteCheckResult(Status.ROLL_BACK_TO_EMBEDDED)
+  }
 
   interface LoaderTaskCallback {
     fun onFailure(e: Exception)
@@ -327,12 +335,12 @@ class LoaderTask(
               return when (updateDirective) {
                 is UpdateDirective.RollBackToEmbeddedUpdateDirective -> {
                   isUpToDate = true
-                  callback.onRemoteCheckForUpdateFinished(RemoteCheckResult(true, null))
+                  callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.RollBackToEmbedded())
                   Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = false)
                 }
                 is UpdateDirective.NoUpdateAvailableUpdateDirective -> {
                   isUpToDate = true
-                  callback.onRemoteCheckForUpdateFinished(RemoteCheckResult())
+                  callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.NoUpdateAvailable())
                   Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = false)
                 }
               }
@@ -341,7 +349,7 @@ class LoaderTask(
             val updateManifest = updateResponse.manifestUpdateResponsePart?.updateManifest
             if (updateManifest == null) {
               isUpToDate = true
-              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult())
+              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.NoUpdateAvailable())
               return Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = false)
             }
 
@@ -353,12 +361,12 @@ class LoaderTask(
             ) {
               isUpToDate = false
               callback.onRemoteUpdateManifestResponseManifestLoaded(updateManifest)
-              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult(null, updateManifest.manifest.getRawJson()))
+              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.UpdateAvailable(updateManifest.manifest.getRawJson()))
               callback.onRemoteUpdateLoadStarted()
               Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = true)
             } else {
               isUpToDate = true
-              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult())
+              callback.onRemoteCheckForUpdateFinished(RemoteCheckResult.NoUpdateAvailable())
               Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = false)
             }
           }

package/ios/EXUpdates/DevLauncherController.swift

@@ -147,7 +147,7 @@ public final class DevLauncherController: NSObject, UpdatesExternalInterface {
     let controller = AppController.sharedInstance
     var updatesConfiguration: UpdatesConfig
     do {
-      updatesConfiguration = try UpdatesConfig.configWithExpoPlist(mergingOtherDictionary: nil)
+      updatesConfiguration = try UpdatesConfig.configWithExpoPlist(mergingOtherDictionary: configuration as? [String: Any] ?? [:])
     } catch {
       errorBlock(NSError(
         domain: DevLauncherController.ErrorDomain,
@@ -239,3 +239,5 @@ public final class DevLauncherController: NSObject, UpdatesExternalInterface {
     }
   }
 }
+
+// swiftlint:enable force_unwrapping

package/ios/EXUpdates/Update/LegacyUpdate.swift

@@ -46,10 +46,10 @@ internal final class LegacyUpdate: Update {
 
     var runtimeVersion: String
     let manifestRuntimeVersion = manifest.runtimeVersion()
-    if let manifestRuntimeVersion = manifestRuntimeVersion {
-      runtimeVersion = assertType(value: manifestRuntimeVersion, description: "Manifest JSON runtime version must be string")
+    if let manifestRuntimeVersion = manifestRuntimeVersion as? String {
+      runtimeVersion = manifestRuntimeVersion
     } else {
-      runtimeVersion = manifest.expoGoSDKVersion().require("Manifest JSON must have a valid sdkVersion property defined")
+      runtimeVersion = manifest.expoGoSDKVersion().require("Manifest JSON must have either a valid runtimeVersion property or a valid sdkVersion property")
     }
 
     let bundleUrl = URL(string: bundleUrlString).require("Manifest JSON must have a valid URL as the bundleUrl property")
@@ -135,13 +135,13 @@ internal final class LegacyUpdate: Update {
       // The URL is valid and constant, so it'll never throw
       // swiftlint:disable:next force_unwrapping
       return URL(string: EXUpdatesExpoAssetBaseUrl)!
-    } else {
-      let assetsPathOrUrl = withManifest.assetUrlOverride() ?? "assets"
-      // assetUrlOverride may be an absolute or relative URL
-      // if relative, we should resolve with respect to the manifest URL
-      return URL(string: assetsPathOrUrl, relativeTo: manifestUrl).require(
-        "Invalid assetUrlOverride"
-      ).absoluteURL.standardized
     }
+
+    let assetsPathOrUrl = withManifest.assetUrlOverride() ?? "assets"
+    // assetUrlOverride may be an absolute or relative URL
+    // if relative, we should resolve with respect to the manifest URL
+    return URL(string: assetsPathOrUrl, relativeTo: manifestUrl).require(
+      "Invalid assetUrlOverride"
+    ).absoluteURL.standardized
   }
 }

package/ios/EXUpdates/UpdatesStateMachine.swift

@@ -259,7 +259,7 @@ internal class UpdatesStateMachine {
   /**
    In production, this is the AppController instance.
    */
-  internal let changeEventDelegate: (any UpdatesStateChangeDelegate)
+  private weak var changeEventDelegate: (any UpdatesStateChangeDelegate)?
 
   /**
    The current state
@@ -377,7 +377,7 @@ internal class UpdatesStateMachine {
    On each state change, all context properties are sent to JS
    */
   private func sendChangeEventToJS(_ event: UpdatesStateEvent? = nil) {
-    changeEventDelegate.sendUpdateStateChangeEventToBridge(event?.type ?? .restart, body: [
+    changeEventDelegate?.sendUpdateStateChangeEventToBridge(event?.type ?? .restart, body: [
       "context": context.json
     ])
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.18.2",
+  "version": "0.18.4",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -65,5 +65,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "a72ae33519fe54eaf195dc3e61a49db8345103db"
+  "gitHead": "aa6bda733cef821234c77a19bbe6008b72c1c594"
 }