expo-dev-launcher 6.0.12 → 6.1.0-canary-20250919-7a31b96

package/CHANGELOG.md

@@ -6,19 +6,13 @@
 
 ### 🎉 New features
 
+- Remove `ExpoAppDelegate` inheritance requirement ([#39417](https://github.com/expo/expo/pull/39417) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ### 🐛 Bug fixes
 
 ### 💡 Others
 
-## 6.0.12 — 2025-09-22
-
-### 🎉 New features
-
-- [Android] Adds loading state when connecting to a development server. ([#39873](https://github.com/expo/expo/pull/39873) by [@lukmccall](https://github.com/lukmccall))
-
-### 🐛 Bug fixes
-
-- [expo-dev-launcher] Fix manual URL entry: decode percent-encoded URLs, enable return key submit, and support dark mode text. ([#39840](https://github.com/expo/expo/pull/39840) by [@blazejkustra](https://github.com/blazejkustra))
+- [Android] Migrated from `kotlinOptions` to `compilerOptions` DSL. ([#39794](https://github.com/expo/expo/pull/39794) by [@huextrat](https://github.com/huextrat))
 
 ## 6.0.11 — 2025-09-11
 

package/android/build.gradle

@@ -20,13 +20,13 @@ expoModule {
 }
 
 group = "host.exp.exponent"
-version = "6.0.12"
+version = "6.1.0-canary-20250919-7a31b96"
 
 android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "6.0.12"
+    versionName "6.1.0-canary-20250919-7a31b96"
   }
 
   buildTypes {

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

@@ -7,8 +7,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import androidx.annotation.UiThread
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
@@ -109,10 +107,6 @@ class DevLauncherController private constructor() :
 
   private var appIsLoading = false
 
-  private val _isLoadingToBundler = mutableStateOf(false)
-  val isLoadingToBundler: State<Boolean>
-    get() = _isLoadingToBundler
-
   private var networkInterceptor: DevLauncherNetworkInterceptor? = null
   private var pendingIntentExtras: Bundle? = null
 
@@ -136,7 +130,6 @@ class DevLauncherController private constructor() :
         return
       }
       appIsLoading = true
-      _isLoadingToBundler.value = true
     }
 
     try {
@@ -170,7 +163,6 @@ class DevLauncherController private constructor() :
       lifecycle.addListener(appLoaderListener)
       mode = Mode.APP
 
-      _isLoadingToBundler.value = false
       // Note that `launch` method is a suspend one. So the execution will be stopped here until the method doesn't finish.
       if (appLoader.launch(appIntent)) {
         recentlyOpedAppsRegistry.appWasOpened(parsedUrl.toString(), devLauncherUrl.queryParams, manifest)
@@ -187,7 +179,6 @@ class DevLauncherController private constructor() :
     } catch (e: Exception) {
       synchronized(this) {
         appIsLoading = false
-        _isLoadingToBundler.value = false
       }
       throw e
     }
@@ -243,7 +234,7 @@ class DevLauncherController private constructor() :
         // used by appetize for snack
         if (intent.getBooleanExtra("EXDevMenuDisableAutoLaunch", false)) {
           canLaunchDevMenuOnStart = false
-          this.devMenuManager.setCanLaunchDevMenuOnStart(false)
+          this.devMenuManager.setCanLaunchDevMenuOnStart(canLaunchDevMenuOnStart)
         }
 
         if (!isDevLauncherUrl(uri)) {

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

@@ -1,40 +1,14 @@
 package expo.modules.devlauncher.compose
 
 import androidx.compose.animation.AnimatedContentTransitionScope
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideIn
-import androidx.compose.animation.slideOut
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import expo.modules.devlauncher.DevLauncherController
-import expo.modules.devlauncher.compose.primitives.CircularProgressBar
 import expo.modules.devlauncher.compose.primitives.DefaultScaffold
 import expo.modules.devlauncher.compose.routes.CrashReport
 import expo.modules.devlauncher.compose.routes.CrashReportRoute
@@ -47,8 +21,6 @@ import expo.modules.devlauncher.compose.routes.UpdatesRoute
 import expo.modules.devlauncher.compose.ui.BottomTabBar
 import expo.modules.devlauncher.compose.ui.Full
 import expo.modules.devlauncher.compose.ui.rememberBottomSheetState
-import expo.modules.devmenu.compose.newtheme.NewAppTheme
-import expo.modules.devmenu.compose.primitives.NewText
 
 @Composable
 fun DevLauncherBottomTabsNavigator() {
@@ -134,59 +106,4 @@ fun DevLauncherBottomTabsNavigator() {
   ProfileRoute(profileBottomSheetState)
 
   DevelopmentServersRoute(developmentServersBottomSheetState)
-
-  val isVisible by (DevLauncherController.instance as DevLauncherController).isLoadingToBundler
-
-  AnimatedVisibility(
-    visible = isVisible,
-    enter = fadeIn(animationSpec = tween(durationMillis = 300)),
-    exit = fadeOut(animationSpec = tween(durationMillis = 300))
-  ) {
-    Box(
-      modifier = Modifier
-        .fillMaxSize()
-        .background(Color.Black.copy(alpha = 0.6f))
-        .clickable(
-          interactionSource = remember { MutableInteractionSource() },
-          indication = null,
-          onClick = {
-            // Captures all clicks to block interaction with the underlying screen
-          }
-        )
-    ) {
-      Row(
-        horizontalArrangement = Arrangement.SpaceBetween,
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier
-          .align(Alignment.BottomStart)
-          .animateEnterExit(
-            enter = slideIn(
-              animationSpec = tween(durationMillis = 300),
-              initialOffset = { fullSize -> IntOffset(-fullSize.height, fullSize.width) }
-            ),
-            exit = slideOut(
-              animationSpec = tween(durationMillis = 300),
-              targetOffset = { fullSize -> IntOffset(fullSize.height, fullSize.width) }
-            )
-          )
-          .clip(RoundedCornerShape(topStart = 8.dp, topEnd = 8.dp))
-          .background(NewAppTheme.colors.background.element)
-          .fillMaxWidth()
-          .navigationBarsPadding()
-          .padding(NewAppTheme.spacing.`3`)
-          .padding(top = NewAppTheme.spacing.`1`)
-      ) {
-        NewText(
-          "Connecting to the development server...",
-          style = NewAppTheme.font.md.copy(
-            fontWeight = FontWeight.SemiBold
-          )
-        )
-
-        CircularProgressBar(
-          size = 20.dp
-        )
-      }
-    }
-  }
 }

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

@@ -25,14 +25,13 @@ import kotlin.time.Duration.Companion.seconds
 
 @Composable
 fun CircularProgressBar(
-  modifier: Modifier = Modifier,
   startAngle: Float = 270f,
   size: Dp = 96.dp,
   strokeWidth: Dp = size / 8,
   duration: Duration = 1.seconds
 ) {
   val backgroundColor = NewAppTheme.pallet.gray.`3`
-  val progressColor = NewAppTheme.pallet.blue.`8`
+  val progressColor = NewAppTheme.pallet.blue.`5`
 
   val transition = rememberInfiniteTransition(label = "infiniteSpinningTransition")
 
@@ -45,7 +44,7 @@ fun CircularProgressBar(
     label = "Progress Animation"
   )
 
-  Canvas(modifier = Modifier.size(size).then(modifier)) {
+  Canvas(modifier = Modifier.size(size)) {
     val strokeWidthPx = strokeWidth.toPx()
     val arcSize = size.toPx() - strokeWidthPx
     drawArc(

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

@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -27,7 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.composeunstyled.TextField
 import com.composeunstyled.TextInput
-import expo.modules.devlauncher.compose.utils.sanitizeUrlString
+import expo.modules.devlauncher.compose.utils.validateUrl
 import expo.modules.devmenu.compose.newtheme.NewAppTheme
 import expo.modules.devmenu.compose.primitives.NewText
 
@@ -38,18 +37,6 @@ fun ServerUrlInput(
   var url by remember { mutableStateOf("") }
   val context = LocalContext.current
 
-  fun connectToURL() {
-    val sanitizedURL = sanitizeUrlString(url)
-    if (sanitizedURL != null) {
-      openApp(sanitizedURL)
-      url = ""
-    } else {
-      Toast
-        .makeText(context, "Invalid URL", Toast.LENGTH_SHORT)
-        .show()
-    }
-  }
-
   Column(
     verticalArrangement = Arrangement.spacedBy(NewAppTheme.spacing.`2`)
   ) {
@@ -76,9 +63,6 @@ fun ServerUrlInput(
         autoCorrectEnabled = false,
         keyboardType = KeyboardType.Uri
       ),
-      keyboardActions = KeyboardActions(
-        onDone = { connectToURL() }
-      ),
       cursorBrush = SolidColor(NewAppTheme.colors.text.default.copy(alpha = 0.9f))
     ) {
       TextInput(
@@ -101,7 +85,15 @@ fun ServerUrlInput(
       textStyle = NewAppTheme.font.md.merge(
         fontWeight = FontWeight.SemiBold
       ),
-      onClick = { connectToURL() }
+      onClick = {
+        if (validateUrl(url)) {
+          openApp(url)
+        } else {
+          Toast
+            .makeText(context, "Invalid URL", Toast.LENGTH_SHORT)
+            .show()
+        }
+      }
     )
   }
 }

package/android/src/debug/java/expo/modules/devlauncher/compose/utils/UrlUtils.kt

@@ -1,31 +1,12 @@
 package expo.modules.devlauncher.compose.utils
 
 import androidx.core.net.toUri
-import java.net.URLDecoder
-import java.nio.charset.StandardCharsets
-
-fun sanitizeUrlString(urlString: String): String? {
-  var sanitizedUrl = urlString.trim()
-
-  val decodedUrl = try {
-    URLDecoder.decode(sanitizedUrl, StandardCharsets.UTF_8.toString())
-  } catch (_: Exception) {
-    sanitizedUrl
-  }
-  sanitizedUrl = decodedUrl
-
-  if (!sanitizedUrl.contains("://")) {
-    sanitizedUrl = "http://$sanitizedUrl"
-  }
 
+fun validateUrl(url: String): Boolean {
   return try {
-    val uri = sanitizedUrl.toUri()
-    if (uri.scheme != null && uri.host != null) {
-      sanitizedUrl
-    } else {
-      null
-    }
+    val uri = url.toUri()
+    uri.scheme != null && uri.host != null
   } catch (_: Throwable) {
-    null
+    false
   }
 }

package/expo-dev-launcher-gradle-plugin/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -22,8 +23,8 @@ java {
 }
 
 tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_11)
   }
 }
 

package/ios/ReactDelegateHandler/ExpoDevLauncherReactDelegateHandler.swift

@@ -50,21 +50,21 @@ public class ExpoDevLauncherReactDelegateHandler: ExpoReactDelegateHandler, EXDe
   // MARK: EXDevelopmentClientControllerDelegate implementations
 
   public func devLauncherController(_ developmentClientController: EXDevLauncherController, didStartWithSuccess success: Bool) {
-    guard let appDelegate = (UIApplication.shared.delegate as? (any ReactNativeFactoryProvider)) ??
-      ((UIApplication.shared.delegate as? NSObject)?.value(forKey: "_expoAppDelegate") as? (any ReactNativeFactoryProvider)) else {
-      fatalError("`UIApplication.shared.delegate` must be an `ExpoAppDelegate` or `EXAppDelegateWrapper`")
+    guard let reactDelegate = self.reactDelegate else {
+      fatalError("`reactDelegate` should not be nil")
     }
-    self.reactNativeFactory = appDelegate.factory as? RCTReactNativeFactory
+
+    self.reactNativeFactory = reactDelegate.reactNativeFactory as? RCTReactNativeFactory
 
     // Reset rctAppDelegate so we can relaunch the app
-    if self.reactNativeFactory?.delegate?.newArchEnabled() ?? false {
+    if RCTIsNewArchEnabled() {
       self.reactNativeFactory?.rootViewFactory.setValue(nil, forKey: "_reactHost")
     } else {
       self.reactNativeFactory?.bridge = nil
       self.reactNativeFactory?.rootViewFactory.bridge = nil
     }
 
-    let rootView = appDelegate.recreateRootView(
+    let rootView = reactDelegate.reactNativeFactory.recreateRootView(
       withBundleURL: developmentClientController.sourceUrl(),
       moduleName: self.rootViewModuleName,
       initialProps: self.rootViewInitialProperties,

package/ios/SwiftUI/DevServersView.swift

@@ -8,10 +8,6 @@ import Combine
 private func sanitizeUrlString(_ urlString: String) -> String? {
   var sanitizedUrl = urlString.trimmingCharacters(in: .whitespacesAndNewlines)
 
-  if let decodedUrl = sanitizedUrl.removingPercentEncoding {
-    sanitizedUrl = decodedUrl
-  }
-
   if !sanitizedUrl.contains("://") {
     sanitizedUrl = "http://" + sanitizedUrl
   }
@@ -30,19 +26,6 @@ struct DevServersView: View {
   @State private var urlText = ""
   @State private var cancellables = Set<AnyCancellable>()
 
-  private func connectToURL() {
-    if !urlText.isEmpty {
-      let sanitizedURL = sanitizeUrlString(urlText)
-      if let validURL = sanitizedURL {
-        viewModel.openApp(url: validURL)
-        withAnimation(.easeInOut(duration: 0.3)) {
-          showingURLInput = false
-        }
-        urlText = ""
-      }
-    }
-  }
-
   var body: some View {
     VStack(alignment: .leading, spacing: 12) {
       header
@@ -98,8 +81,7 @@ struct DevServersView: View {
           .disableAutocorrection(true)
           .padding(.horizontal, 16)
           .padding(.vertical, 12)
-          .foregroundColor(.primary)
-          .onSubmit(connectToURL)
+          .foregroundColor(.black)
         #if !os(tvOS)
           .overlay(
             RoundedRectangle(cornerRadius: 5)
@@ -142,7 +124,18 @@ struct DevServersView: View {
   }
 
   private var connectButton: some View {
-    Button(action: connectToURL) {
+    Button {
+      if !urlText.isEmpty {
+        let sanitizedURL = sanitizeUrlString(urlText)
+        if let validURL = sanitizedURL {
+          viewModel.openApp(url: validURL)
+          withAnimation(.easeInOut(duration: 0.3)) {
+            showingURLInput = false
+          }
+          urlText = ""
+        }
+      }
+    } label: {
       Text("Connect")
         .font(.headline)
         .foregroundColor(.white)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "6.0.12",
+  "version": "6.1.0-canary-20250919-7a31b96",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "repository": {
     "type": "git",
@@ -15,11 +15,10 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev",
   "dependencies": {
-    "expo-dev-menu": "7.0.12",
-    "expo-manifests": "~1.0.8"
+    "expo-dev-menu": "7.0.12-canary-20250919-7a31b96",
+    "expo-manifests": "1.0.9-canary-20250919-7a31b96"
   },
   "peerDependencies": {
-    "expo": "*"
-  },
-  "gitHead": "6523053d0d997d2a21f580d2752b2f873c122038"
+    "expo": "55.0.0-canary-20250919-7a31b96"
+  }
 }