expo-dev-launcher 5.2.0-canary-20250729-d8899ae → 5.2.0-canary-20250811-5c940c0

package/CHANGELOG.md

@@ -8,15 +8,19 @@
 
 - [iOS] Reimplement UI in SwiftUI. ([#37413](https://github.com/expo/expo/pull/37413) by [@alanjhughes](https://github.com/alanjhughes))
 - [Android] Add floating action button option in the settings menu. ([#38247](https://github.com/expo/expo/pull/38247) by [@behenate](https://github.com/behenate))
+- [iOS] Partial support for Apple TV. ([#38388](https://github.com/expo/expo/pull/38388) by [@douglowder](https://github.com/douglowder))
 
 ### 🐛 Bug fixes
 
 - [iOS] Fix missing CDP headers when using static frameworks. ([#37448](https://github.com/expo/expo/pull/37448) by [@alanjhughes](https://github.com/alanjhughes))
 - [Android] Use same strings in UI as iOS. ([#37786](https://github.com/expo/expo/pull/37786) by [@douglowder](https://github.com/douglowder))
+- [iOS] Fix an issue where the packager commands stop working after a reload. ([#38579](https://github.com/expo/expo/pull/38579) by [@alanjhughes](https://github.com/alanjhughes))
 
 ### 💡 Others
 
+- [Android] RN 0.81.0: patched some reflection issues after kotlin upgrade ([#38451](https://github.com/expo/expo/pull/38451) by [@chrfalch](https://github.com/chrfalch))
 - Fixed release build error on Android. ([#37579](https://github.com/expo/expo/pull/37579) by [@kudo](https://github.com/kudo))
+- Informational message for tvOS on signin page. ([#38518](https://github.com/expo/expo/pull/38518) by [@douglowder](https://github.com/douglowder))
 
 ### ⚠️ Notices
 

package/android/build.gradle

@@ -20,13 +20,13 @@ expoModule {
 }
 
 group = "host.exp.exponent"
-version = "5.2.0-canary-20250729-d8899ae"
+version = "5.2.0-canary-20250811-5c940c0"
 
 android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "5.2.0-canary-20250729-d8899ae"
+    versionName "5.2.0-canary-20250811-5c940c0"
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devlauncher/compose/models/HomeViewModel.kt

@@ -1,7 +1,6 @@
 package expo.modules.devlauncher.compose.models
 
 import android.content.Context
-import android.util.Log
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
@@ -26,13 +25,15 @@ sealed interface HomeAction {
   object ResetRecentlyOpenedApps : HomeAction
   class NavigateToCrashReport(val crashReport: DevLauncherErrorInstance) : HomeAction
   object ScanQRCode : HomeAction
+  object ClearLoadingError : HomeAction
 }
 
 data class HomeState(
   val runningPackagers: Set<PackagerInfo> = emptySet(),
   val isFetchingPackagers: Boolean = false,
   val recentlyOpenedApps: List<DevLauncherAppEntry> = emptyList(),
-  val crashReport: DevLauncherErrorInstance? = null
+  val crashReport: DevLauncherErrorInstance? = null,
+  val loadingError: String? = null
 )
 
 class HomeViewModel() : ViewModel() {
@@ -75,7 +76,9 @@ class HomeViewModel() : ViewModel() {
           try {
             devLauncherController.loadApp(action.url.toUri(), mainActivity = null)
           } catch (e: Exception) {
-            Log.e("DevLauncher", "Failed to open app: ${action.url}", e)
+            _state.value = _state.value.copy(
+              loadingError = e.message ?: "Unknown error"
+            )
           }
         }
 
@@ -86,6 +89,8 @@ class HomeViewModel() : ViewModel() {
         _state.value = _state.value.copy(recentlyOpenedApps = emptyList())
       }
 
+      is HomeAction.ClearLoadingError -> _state.value = _state.value.copy(loadingError = null)
+
       is HomeAction.NavigateToCrashReport -> IllegalStateException("Navigation action should be handled by the UI layer, not the ViewModel.")
 
       is HomeAction.ScanQRCode -> IllegalStateException("QR code scanning should be handled by the UI layer, not the ViewModel.")

package/android/src/debug/java/expo/modules/devlauncher/compose/primitives/Accordion.kt

@@ -57,6 +57,7 @@ fun Accordion(
             contentDescription = "Accordion Arrow",
             modifier = Modifier
               .rotate(arrowRotation)
+              .size(Theme.sizing.icon.extraSmall)
           )
           Spacer(Modifier.size(Theme.spacing.small))
           Text(

package/android/src/debug/java/expo/modules/devlauncher/compose/routes/Updates.kt

@@ -1,5 +1,7 @@
 package expo.modules.devlauncher.compose.routes
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -25,7 +27,19 @@ fun UpdatesRoute(
   DefaultScreenContainer {
     NavHost(
       navController = updatesNavController,
-      startDestination = Routes.Updates.Branches
+      startDestination = Routes.Updates.Branches,
+      enterTransition = {
+        slideIntoContainer(
+          AnimatedContentTransitionScope.SlideDirection.Up,
+          animationSpec = tween(400)
+        )
+      },
+      exitTransition = {
+        slideOutOfContainer(
+          AnimatedContentTransitionScope.SlideDirection.Down,
+          animationSpec = tween(400)
+        )
+      }
     ) {
       composable<Routes.Updates.Branches> {
         val viewModel = viewModel<BranchesViewModel>()

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/BranchScreen.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -18,6 +19,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
@@ -45,24 +47,28 @@ fun BranchScreen(
   goBack: () -> Unit = {},
   onAction: (BranchAction) -> Unit = {}
 ) {
-  Column {
+  Column(modifier = Modifier.fillMaxSize()) {
     ScreenHeaderContainer {
       Box(
         modifier = Modifier
           .fillMaxWidth()
           .padding(Theme.spacing.small)
       ) {
-        Button(
-          onClick = goBack,
+        RoundedSurface(
+          color = Color.Transparent,
           modifier = Modifier.align(Alignment.CenterStart)
         ) {
-          DayNighIcon(
-            R.drawable.chevron_right_icon,
-            contentDescription = "Back icon",
-            modifier = Modifier
-              .rotate(180f)
-              .size(Theme.sizing.icon.medium)
-          )
+          Button(
+            onClick = goBack
+          ) {
+            DayNighIcon(
+              R.drawable.chevron_right_icon,
+              contentDescription = "Back icon",
+              modifier = Modifier
+                .rotate(180f)
+                .size(Theme.sizing.icon.small)
+            )
+          }
         }
 
         Heading(branchName, modifier = Modifier.align(Alignment.Center))
@@ -126,7 +132,7 @@ fun BranchScreen(
                 DayNighIcon(
                   painter = painterResource(R.drawable.chevron_right_icon),
                   contentDescription = "Chevron Right Icon",
-                  modifier = Modifier.size(Theme.sizing.icon.medium)
+                  modifier = Modifier.size(Theme.sizing.icon.extraSmall)
                 )
               }
 

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/BranchesScreen.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -85,7 +86,7 @@ fun BranchesScreen(
   onProfileClick: () -> Unit = {},
   onAction: (BranchesAction) -> Unit = { _ -> }
 ) {
-  Column {
+  Column(modifier = Modifier.fillMaxSize()) {
     ScreenHeaderContainer(modifier = Modifier.padding(Theme.spacing.medium)) {
       AppHeader(
         onProfileClick = onProfileClick
@@ -134,7 +135,7 @@ fun BranchesScreen(
                   DayNighIcon(
                     painter = painterResource(R.drawable.chevron_right_icon),
                     contentDescription = "Chevron Right Icon",
-                    modifier = Modifier.size(Theme.sizing.icon.medium)
+                    modifier = Modifier.size(Theme.sizing.icon.extraSmall)
                   )
                 }
 

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/HomeScreen.kt

@@ -1,6 +1,5 @@
 package expo.modules.devlauncher.compose.screens
 
-import android.util.Log
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -22,6 +21,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
@@ -39,6 +39,7 @@ import expo.modules.devlauncher.compose.models.HomeAction
 import expo.modules.devlauncher.compose.models.HomeState
 import expo.modules.devlauncher.compose.primitives.Accordion
 import expo.modules.devlauncher.compose.ui.AppHeader
+import expo.modules.devlauncher.compose.ui.AppLoadingErrorDialog
 import expo.modules.devlauncher.compose.ui.DevelopmentSessionHelper
 import expo.modules.devlauncher.compose.ui.RunningAppCard
 import expo.modules.devlauncher.compose.ui.ScreenHeaderContainer
@@ -132,10 +133,27 @@ fun HomeScreen(
   onProfileClick: () -> Unit
 ) {
   val hasPackager = state.runningPackagers.isNotEmpty()
-  val dialogState = rememberDialogState(initiallyVisible = false)
+  val howToStartDevelopmentDialogState = rememberDialogState(initiallyVisible = false)
+  val errorDialogState = rememberDialogState(initiallyVisible = false)
   val scrollState = rememberScrollState()
 
-  HowToStartDevelopmentServerDialog(dialogState)
+  LaunchedEffect(state.loadingError) {
+    if (state.loadingError != null) {
+      errorDialogState.visible = true
+    }
+  }
+
+  LaunchedEffect(errorDialogState.visible) {
+    if (!errorDialogState.visible) {
+      onAction(HomeAction.ClearLoadingError)
+    }
+  }
+
+  HowToStartDevelopmentServerDialog(howToStartDevelopmentDialogState)
+  AppLoadingErrorDialog(
+    errorDialogState,
+    currentError = state.loadingError
+  )
 
   Column {
     ScreenHeaderContainer(modifier = Modifier.padding(Theme.spacing.medium)) {
@@ -174,7 +192,7 @@ fun HomeScreen(
             if (hasPackager) {
               Row {
                 Button(onClick = {
-                  dialogState.visible = true
+                  howToStartDevelopmentDialogState.visible = true
                 }) {
                   Theme.colors.icon
                   DayNighIcon(
@@ -218,7 +236,6 @@ fun HomeScreen(
           var fetchStartTime by remember { mutableStateOf<Instant?>(null) }
 
           LaunchedEffect(isFetching) {
-            Log.e("DevLauncher", "isFetchingPackagers changed: $isFetching")
             if (isFetching) {
               isFetchingUIState = true
               fetchStartTime = Clock.System.now()
@@ -301,7 +318,7 @@ fun HomeScreen(
                   Image(
                     painter = painterResource(R.drawable.qr_code),
                     contentDescription = "QR Code Icon",
-                    modifier = Modifier.size(24.dp)
+                    modifier = Modifier.size(Theme.spacing.medium)
                   )
                 }
               ) {
@@ -338,18 +355,24 @@ fun HomeScreen(
             "Recently",
             rightIcon = {
               Row {
-                Button(onClick = {
-                  onAction(HomeAction.ResetRecentlyOpenedApps)
-                }) {
-                  Text(
-                    "Reset",
-                    color = Theme.colors.text.secondary,
-                    fontSize = Theme.typography.small,
-                    fontWeight = FontWeight.Bold
-                  )
+                RoundedSurface(color = Color.Unspecified, borderRadius = Theme.sizing.borderRadius.extraSmall) {
+                  Button(
+                    onClick = {
+                      onAction(HomeAction.ResetRecentlyOpenedApps)
+                    }
+                  ) {
+                    Text(
+                      "Reset",
+                      color = Theme.colors.text.secondary,
+                      fontSize = Theme.typography.small,
+                      fontWeight = FontWeight.Bold,
+                      modifier = Modifier
+                        .padding(horizontal = Theme.spacing.tiny, vertical = Theme.spacing.micro)
+                    )
+                  }
                 }
 
-                Spacer(Theme.spacing.small)
+                Spacer(Theme.spacing.small - Theme.spacing.tiny)
               }
             }
           )

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/NoUpdatesScreen.kt

@@ -3,6 +3,7 @@ package expo.modules.devlauncher.compose.screens
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -26,7 +27,7 @@ import expo.modules.devmenu.compose.theme.Theme
 
 @Composable
 fun NoUpdatesScreen(onProfileClick: () -> Unit = {}) {
-  Column {
+  Column(modifier = Modifier.fillMaxSize()) {
     ScreenHeaderContainer(modifier = Modifier.padding(Theme.spacing.medium)) {
       AppHeader(
         onProfileClick = onProfileClick

package/android/src/debug/java/expo/modules/devlauncher/compose/screens/SettingsScreen.kt

@@ -99,9 +99,9 @@ fun SettingsScreen(
         )
         Divider()
         MenuButton(
-          "Floating Action Button",
+          "Developer Action Button",
           // TODO: @behenate Find a proper icon for this option
-          leftIcon = painterResource(R.drawable.show_menu_at_launch_icon),
+          leftIcon = painterResource(R.drawable.dev_menu_fab_icon),
           onClick = {
             onAction(SettingsAction.ToggleShowFabAtLaunch(!state.showFabAtLaunch))
           },

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/AppHeader.kt

@@ -1,6 +1,5 @@
 package expo.modules.devlauncher.compose.ui
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -8,6 +7,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.composeunstyled.Button
 import expo.modules.devlauncher.MeQuery
 import expo.modules.devlauncher.R
 import expo.modules.devlauncher.services.AppService
@@ -65,18 +65,24 @@ fun AppHeader(
     },
     rightComponent = {
       if (currentAccount != null) {
-        AccountAvatar(
-          url = currentAccount.ownerUserActor?.profilePhoto,
-          size = Theme.sizing.icon.medium,
-          modifier = Modifier.clickable(onClick = onProfileClick)
-        )
+        Surface(shape = RoundedCornerShape(Theme.sizing.borderRadius.full)) {
+          Button(onClick = onProfileClick) {
+            AccountAvatar(
+              url = currentAccount.ownerUserActor?.profilePhoto,
+              size = Theme.sizing.icon.medium
+            )
+          }
+        }
       } else {
-        Surface(shape = RoundedCornerShape(Theme.sizing.borderRadius.full), modifier = Modifier.clickable(onClick = onProfileClick)) {
-          DayNighIcon(
-            id = R.drawable.user_icon,
-            contentDescription = "Expo Logo",
-            modifier = Modifier.padding(Theme.spacing.tiny)
-          )
+        Surface(shape = RoundedCornerShape(Theme.sizing.borderRadius.full)) {
+          Button(onClick = onProfileClick) {
+            DayNighIcon(
+              id = R.drawable.user_icon,
+              contentDescription = "Expo Logo",
+              modifier = Modifier
+                .padding(Theme.spacing.tiny)
+            )
+          }
         }
       }
     }

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/AppLoadingErrorDialog.kt

@@ -0,0 +1,81 @@
+package expo.modules.devlauncher.compose.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.displayCutoutPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.composables.core.Dialog
+import com.composables.core.DialogPanel
+import com.composables.core.DialogState
+import com.composables.core.Scrim
+import com.composables.core.rememberDialogState
+import com.composeunstyled.Button
+import com.composeunstyled.Text
+import expo.modules.devlauncher.R
+import expo.modules.devmenu.compose.primitives.DayNighIcon
+import expo.modules.devmenu.compose.primitives.Divider
+import expo.modules.devmenu.compose.primitives.Heading
+import expo.modules.devmenu.compose.primitives.RowLayout
+import expo.modules.devmenu.compose.theme.Theme
+
+@Composable
+fun AppLoadingErrorDialog(
+  dialogState: DialogState,
+  currentError: String?
+) {
+  Dialog(state = dialogState) {
+    Scrim()
+
+    DialogPanel(
+      modifier = Modifier
+        .displayCutoutPadding()
+        .systemBarsPadding()
+        .padding(horizontal = Theme.spacing.medium)
+        .clip(RoundedCornerShape(12.dp))
+        .background(Theme.colors.background.default)
+    ) {
+      Column {
+        RowLayout(
+          rightComponent = {
+            Button(onClick = {
+              dialogState.visible = false
+            }) {
+              DayNighIcon(
+                id = R.drawable.x_icon,
+                contentDescription = "Close dialog"
+              )
+            }
+          },
+          modifier = Modifier.padding(Theme.spacing.medium)
+        ) {
+          Heading("Error loading app")
+        }
+
+        Divider()
+
+        Row(modifier = Modifier.padding(Theme.spacing.medium)) {
+          Text(currentError ?: "No error message available.")
+        }
+      }
+    }
+  }
+}
+
+@Preview
+@Composable
+fun AppLoadingErrorDialogPreview() {
+  val dialogState = rememberDialogState(initiallyVisible = true)
+
+  AppLoadingErrorDialog(
+    dialogState = dialogState,
+    currentError = "An error occurred while loading the app."
+  )
+}

package/android/src/debug/java/expo/modules/devlauncher/compose/ui/ProfileLayout.kt

@@ -5,14 +5,17 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.composeunstyled.Button
 import expo.modules.devlauncher.R
 import expo.modules.devmenu.compose.primitives.DayNighIcon
 import expo.modules.devmenu.compose.primitives.Heading
+import expo.modules.devmenu.compose.primitives.RoundedSurface
 import expo.modules.devmenu.compose.primitives.Spacer
 import expo.modules.devmenu.compose.theme.Theme
 
@@ -26,13 +29,20 @@ fun ProfileLayout(
       .padding(horizontal = 12.dp)
       .padding(top = 12.dp)
   ) {
-    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
-      Heading("Account", fontSize = Theme.typography.size25)
-      Button(onClick = onClose) {
-        DayNighIcon(
-          id = R.drawable.x_icon,
-          contentDescription = "Close"
-        )
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.SpaceBetween,
+      modifier = Modifier.fillMaxWidth()
+    ) {
+      Heading("Account", fontSize = Theme.typography.size22)
+      RoundedSurface(color = Color.Unspecified) {
+        Button(onClick = onClose) {
+          DayNighIcon(
+            id = R.drawable.x_icon,
+            contentDescription = "Close",
+            modifier = Modifier.size(Theme.sizing.icon.small)
+          )
+        }
       }
     }
 

package/android/src/debug/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt

@@ -185,14 +185,14 @@ private fun injectLocalBundleLoader(
     // [0] Disable `mAllowPackagerServerAccess`
     // so that ReactHost could use jsBundlerLoader from ReactHostDelegate
     val reactHostClass = ReactHostImpl::class.java
-    val mAllowPackagerServerAccessField = reactHostClass.getDeclaredField("mAllowPackagerServerAccess")
+    val mAllowPackagerServerAccessField = reactHostClass.getDeclaredField("allowPackagerServerAccess")
     mAllowPackagerServerAccessField.isAccessible = true
     mAllowPackagerServerAccessField[reactHost] = false
 
     val newJsBundleLoader = JSBundleLoader.createFileLoader(bundlePath)
 
     // [1] Replace the ReactHostDelegate.jsBundlerLoader with our new loader
-    val mReactHostDelegateField = reactHostClass.getDeclaredField("mReactHostDelegate")
+    val mReactHostDelegateField = reactHostClass.getDeclaredField("reactHostDelegate")
     mReactHostDelegateField.isAccessible = true
     val reactHostDelegate = mReactHostDelegateField[reactHost] as ReactHostDelegate
     if (reactHostDelegate.javaClass.canonicalName == EXPO_REACT_HOST_DELEGATE_CLASS) {

package/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherExpoAppLoader.kt

@@ -50,7 +50,7 @@ abstract class DevLauncherExpoAppLoader(
       try {
         appearanceModule::class.java.setProtectedDeclaredField(
           obj = appearanceModule,
-          filedName = "mOverrideColorScheme",
+          filedName = "overrideColorScheme",
           newValue = object : AppearanceModule.OverrideColorScheme {
             override fun getScheme(): String {
               return userInterfaceStyle
@@ -61,7 +61,7 @@ abstract class DevLauncherExpoAppLoader(
 
         appearanceModule::class.java.setProtectedDeclaredField(
           obj = appearanceModule,
-          filedName = "mColorScheme",
+          filedName = "colorScheme",
           newValue = userInterfaceStyle
         )
       } catch (e: Exception) {

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

@@ -47,7 +47,7 @@ internal class DevLauncherDevSupportManagerSwapper : DevLauncherKoinComponent {
       val devManagerClass = DevSupportManagerBase::class.java
       val newDevSupportManager = createDevLauncherBridgeDevSupportManager(devManagerClass, currentDevSupportManager)
 
-      ReactInstanceManager::class.java.setProtectedDeclaredField(reactInstanceManager, "mDevSupportManager", newDevSupportManager)
+      ReactInstanceManager::class.java.setProtectedDeclaredField(reactInstanceManager, "devSupportManager", newDevSupportManager)
 
       closeExistingConnection(devManagerClass, currentDevSupportManager)
     } catch (e: Exception) {
@@ -73,7 +73,7 @@ internal class DevLauncherDevSupportManagerSwapper : DevLauncherKoinComponent {
         currentDevSupportManager
       )
 
-      ReactHostImpl::class.java.setProtectedDeclaredField(reactHost, "mDevSupportManager", newDevSupportManager)
+      ReactHostImpl::class.java.setProtectedDeclaredField(reactHost, "devSupportManager", newDevSupportManager)
 
       closeExistingConnection(devManagerClass, currentDevSupportManager)
     } catch (e: Exception) {

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

@@ -4,8 +4,6 @@ import android.content.Context
 import com.facebook.hermes.reactexecutor.HermesExecutorFactory
 import com.facebook.react.bridge.JavaScriptExecutorFactory
 import com.facebook.react.devsupport.DevSupportManagerFactory
-import com.facebook.react.jscexecutor.JSCExecutorFactory
-import com.facebook.react.modules.systeminfo.AndroidInfoHelpers
 import com.facebook.soloader.SoLoader
 import expo.modules.core.interfaces.ReactNativeHostHandler
 import expo.modules.devlauncher.DevLauncherController
@@ -35,9 +33,6 @@ class DevLauncherReactNativeHostHandler(context: Context) : ReactNativeHostHandl
       // return null here to use the default value.
       return null
     }
-    if (SoLoader.getLibraryPath("libjsc.so") != null) {
-      return JSCExecutorFactory(applicationContext.packageName, AndroidInfoHelpers.getFriendlyDeviceName())
-    }
     return HermesExecutorFactory()
   }
 

package/android/src/main/java/expo/modules/devlauncher/react/activitydelegates/DevLauncherReactActivityNOPDelegate.kt

@@ -16,6 +16,6 @@ open class DevLauncherReactActivityNOPDelegate(activity: ReactActivity) :
   override fun onNewIntent(intent: Intent?): Boolean = true
   override fun onBackPressed(): Boolean = true
   override fun onWindowFocusChanged(hasFocus: Boolean) {}
-  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>?, grantResults: IntArray?) {}
-  override fun onConfigurationChanged(newConfig: Configuration?) {}
+  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {}
+  override fun onConfigurationChanged(newConfig: Configuration) {}
 }

package/expo-dev-launcher.podspec

@@ -20,7 +20,8 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platforms      = {
-    :ios => '15.1'
+    :ios => '15.1',
+    :tvos => '15.1'
   }
   s.swift_version  = '5.2'
   s.source         = { :git => 'https://github.com/github_account/expo-development-client.git', :tag => "#{s.version}" }

package/ios/Assets.xcassets/expo-go-logo.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "expo-go logo.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}