expo-dev-launcher 5.0.28 → 5.0.29

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 5.0.29 — 2025-02-10
+
+_This version does not introduce any user-facing changes._
+
 ## 5.0.28 — 2025-02-06
 
 _This version does not introduce any user-facing changes._
@@ -38,6 +42,7 @@ _This version does not introduce any user-facing changes._
 
 ### 🐛 Bug fixes
 
+- [Android] Fixed issue with initialization of the dev client being wrong on the old architecture ([#34398](https://github.com/expo/expo/pull/34398) by [@chrfalch](https://github.com/chrfalch))
 - [iOS] Fixed black stuck screen when loading an unreachable server from last opened url. ([#34067](https://github.com/expo/expo/pull/34067) by [@kudo](https://github.com/kudo))
 - [iOS] Read EAS project id and url from manifest instead of updates interface. ([#34342](https://github.com/expo/expo/pull/34342) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 - [Android] Read EAS project id and url from AndroidManifest instead of updates interface. ([#34342](https://github.com/expo/expo/pull/34342) by [@gabrieldonadel](https://github.com/gabrieldonadel))

package/android/build.gradle

@@ -17,7 +17,7 @@ android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "5.0.28"
+    versionName "5.0.29"
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt

@@ -148,7 +148,7 @@ class DevLauncherController private constructor() :
       val manifestParser = DevLauncherManifestParser(httpClient, parsedUrl, installationIDHelper.getOrCreateInstallationID(context))
       val appIntent = createAppIntent()
 
-      internalUpdatesInterface?.reset()
+      DevLauncherKoinContext.app.koin.getOrNull<UpdatesInterface>()?.reset()
 
       val appLoaderFactory = get<DevLauncherAppLoaderFactoryInterface>()
       val appLoader = appLoaderFactory.createAppLoader(parsedUrl, parsedProjectUrl, manifestParser)

package/android/src/debug/java/expo/modules/devlauncher/DevLauncherPackageDelegate.kt

@@ -18,8 +18,6 @@ import expo.modules.devlauncher.modules.DevLauncherAuth
 import expo.modules.core.interfaces.ReactNativeHostHandler
 import expo.modules.devlauncher.modules.DevLauncherDevMenuExtension
 import expo.modules.devlauncher.react.DevLauncherReactNativeHostHandler
-import expo.modules.updatesinterface.UpdatesControllerRegistry
-import java.lang.ref.WeakReference
 
 object DevLauncherPackageDelegate {
   fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
@@ -36,10 +34,6 @@ object DevLauncherPackageDelegate {
         override fun onCreate(application: Application?) {
           check(application is ReactApplication)
           DevLauncherController.initialize(application)
-          UpdatesControllerRegistry.controller?.get()?.let {
-            DevLauncherController.instance.updatesInterface = it
-            it.updatesInterfaceCallbacks = WeakReference(DevLauncherController.instance)
-          }
         }
       }
     )

package/android/src/debug/java/expo/modules/devlauncher/react/DevLauncherReactNativeHostHandler.kt

@@ -10,6 +10,10 @@ import com.facebook.soloader.SoLoader
 import expo.modules.core.interfaces.ReactNativeHostHandler
 import expo.modules.devlauncher.DevLauncherController
 import java.lang.ref.WeakReference
+import expo.modules.updatesinterface.UpdatesControllerRegistry
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 class DevLauncherReactNativeHostHandler(context: Context) : ReactNativeHostHandler {
   private val contextHolder = WeakReference(context)
@@ -36,4 +40,18 @@ class DevLauncherReactNativeHostHandler(context: Context) : ReactNativeHostHandl
     }
     return HermesExecutorFactory()
   }
+
+  override fun onWillCreateReactInstance(useDeveloperSupport: Boolean) {
+    super.onWillCreateReactInstance(useDeveloperSupport)
+    // On New Architecture mode, `onWillCreateReactInstance()` would be called
+    // inside `DevLauncherController.initialize()`.
+    // The `DevLauncherController.instance` is not available at this point.
+    // Posting the updates interface setup to next run loop.
+    CoroutineScope(Dispatchers.Main).launch {
+      UpdatesControllerRegistry.controller?.get()?.let {
+        DevLauncherController.instance.updatesInterface = it
+        it.updatesInterfaceCallbacks = WeakReference(DevLauncherController.instance)
+      }
+    }
+  }
 }

package/android/src/rn74/debug/expo/modules/devlauncher/react/DevLauncherDevSupportManagerSwapper.kt

@@ -16,8 +16,6 @@ import expo.modules.devlauncher.helpers.getProtectedFieldValue
 import expo.modules.devlauncher.helpers.setProtectedDeclaredField
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
-import expo.modules.devlauncher.react.DevLauncherBridgeDevSupportManager
-import expo.modules.devlauncher.react.DevLauncherBridgelessDevSupportManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.koin.core.component.inject

package/android/src/rn77/debug/expo/modules/devlauncher/react/DevLauncherBridgelessDevSupportManager.kt

@@ -36,7 +36,8 @@ class DevLauncherBridgelessDevSupportManager(
   null,
   null,
   null
-), DevLauncherKoinComponent {
+),
+  DevLauncherKoinComponent {
   private val controller: DevLauncherControllerInterface? by optInject()
 
   init {

package/android/src/rn77/debug/expo/modules/devlauncher/react/DevLauncherDevSupportManagerSwapper.kt

@@ -16,8 +16,6 @@ import expo.modules.devlauncher.helpers.getProtectedFieldValue
 import expo.modules.devlauncher.helpers.setProtectedDeclaredField
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
-import expo.modules.devlauncher.react.DevLauncherBridgeDevSupportManager
-import expo.modules.devlauncher.react.DevLauncherBridgelessDevSupportManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.koin.core.component.inject

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "5.0.28",
+  "version": "5.0.29",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -66,5 +66,5 @@
     ],
     "testTimeout": 15000
   },
-  "gitHead": "9442f00874e0cd738030abae80e5bdef184a2581"
+  "gitHead": "81941fa03383e748ba1b6345d9ca0d048bb5c4d1"
 }