react-native-tvos 0.86.0-2 → 0.87.0-0

package/ReactAndroid/build.gradle.kts

@@ -18,7 +18,6 @@ plugins {
   id("com.facebook.react")
   alias(libs.plugins.android.library)
   alias(libs.plugins.download)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.ktfmt)
 }
 
@@ -41,9 +40,6 @@ val downloadsDir =
 val thirdPartyNdkDir = File("$buildDir/third-party-ndk")
 val reactNativeRootDir = projectDir.parent
 
-val hermesV1Enabled =
-    rootProject.extensions.getByType(PrivateReactExtension::class.java).hermesV1Enabled.get()
-
 // We put the publishing version from gradle.properties inside ext. so other
 // subprojects can access it as well.
 extra["publishing_version"] = project.findProperty("VERSION_NAME")?.toString()!!
@@ -248,6 +244,7 @@ val preparePrefab by
                       Pair("../ReactCommon/react/renderer/telemetry/", "react/renderer/telemetry/"),
                       Pair("../ReactCommon/react/renderer/uimanager/", "react/renderer/uimanager/"),
                       Pair("../ReactCommon/react/debug/", "react/debug/"),
+                      Pair("../ReactCommon/react/cxxstableapi/", "react/cxxstableapi/"),
                       Pair("../ReactCommon/react/utils/", "react/utils/"),
                       Pair("src/main/jni/react/jni", "react/jni/"),
                       // react_cxxreactpackage
@@ -559,6 +556,15 @@ android {
   defaultConfig {
     minSdk = libs.versions.minSdk.get().toInt()
 
+    aarMetadata {
+      // RN's public ABI exposes no android API newer than 34, and the source is written to
+      // compile against SDK 34 (see util/AndroidVersion.kt). compileSdk is 36 only to build
+      // against the latest platform — it is not an API requirement. Without this, AGP 9
+      // defaults minCompileSdk to compileSdk (36), needlessly forcing every consuming
+      // library/app to compileSdk 36.
+      minCompileSdk = 34
+    }
+
     consumerProguardFiles("proguard-rules.pro")
 
     buildConfigField("boolean", "IS_INTERNAL_BUILD", "false")
@@ -566,6 +572,7 @@ android {
     buildConfigField("boolean", "UNSTABLE_ENABLE_FUSEBOX_RELEASE", "false")
     buildConfigField("boolean", "ENABLE_PERFETTO", "false")
     buildConfigField("boolean", "UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE", "false")
+    buildConfigField("boolean", "UNSTABLE_REMOVE_LEGACY_COMPONENT_INTEROP", "false")
 
     resValue("integer", "react_native_dev_server_port", reactNativeDevServerPort())
     resValue("string", "react_native_dev_server_ip", "localhost")
@@ -585,10 +592,6 @@ android {
             "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW",
         )
 
-        if (hermesV1Enabled) {
-          arguments("-DHERMES_V1_ENABLED=1")
-        }
-
         targets(
             "reactnative",
             "jsi",
@@ -620,19 +623,19 @@ android {
       ":packages:react-native:ReactAndroid:hermes-engine:preBuild"
   )
 
-  sourceSets.getByName("main") {
-    res.setSrcDirs(
-        listOf(
-            "src/main/res/devsupport",
-            "src/main/res/shell",
-            "src/main/res/views/alert",
-            "src/main/res/views/modal",
-            "src/main/res/views/uimanager",
-            "src/main/res/views/view",
-        )
-    )
-    java.exclude("com/facebook/react/processing")
-    java.exclude("com/facebook/react/module/processing")
+  sourceSets {
+    named("main") {
+      res.directories.addAll(
+          listOf(
+              "src/main/res/devsupport",
+              "src/main/res/shell",
+              "src/main/res/views/alert",
+              "src/main/res/views/modal",
+              "src/main/res/views/uimanager",
+              "src/main/res/views/view",
+          )
+      )
+    }
   }
 
   lint {
@@ -723,6 +726,8 @@ dependencies {
   // Therefore hermes-engine is a compileOnly dependencies.
   compileOnly(project(":packages:react-native:ReactAndroid:hermes-engine"))
 
+  implementation(libs.androidx.collection)
+
   testImplementation(libs.junit)
   testImplementation(libs.assertj)
   testImplementation(libs.mockito)

package/ReactAndroid/external-artifacts/build.gradle.kts

@@ -59,6 +59,30 @@ val reactNativeDependenciesReleaseDSYMArtifact: PublishArtifact =
     }
  */
 
+// [iOS] React Native Dependencies Headers — the headers-only LIBRARY-type
+// sidecar (per-slice Headers/ + HeadersPath) that SwiftPM auto-serves; the
+// binary xcframework above is framework-type and cannot expose headers to
+// SwiftPM binaryTargets. Also shipped INSIDE the deps tarball for CocoaPods.
+val reactNativeDependenciesHeadersDebugArtifactFile: RegularFile =
+    layout.projectDirectory.file("artifacts/ReactNativeDependenciesHeadersDebug.xcframework.tar.gz")
+val reactNativeDependenciesHeadersDebugArtifact: PublishArtifact =
+    artifacts.add("externalArtifacts", reactNativeDependenciesHeadersDebugArtifactFile) {
+      type = "tgz"
+      extension = "tar.gz"
+      classifier = "reactnative-dependencies-headers-debug"
+    }
+
+val reactNativeDependenciesHeadersReleaseArtifactFile: RegularFile =
+    layout.projectDirectory.file(
+        "artifacts/ReactNativeDependenciesHeadersRelease.xcframework.tar.gz"
+    )
+val reactNativeDependenciesHeadersReleaseArtifact: PublishArtifact =
+    artifacts.add("externalArtifacts", reactNativeDependenciesHeadersReleaseArtifactFile) {
+      type = "tgz"
+      extension = "tar.gz"
+      classifier = "reactnative-dependencies-headers-release"
+    }
+
 // [iOS] React Native Core
 val reactCoreDebugArtifactFile: RegularFile =
     layout.projectDirectory.file("artifacts/ReactCoreDebug.xcframework.tar.gz")
@@ -95,6 +119,27 @@ val reactCoreReleaseDSYMArtifact: PublishArtifact =
       classifier = "reactnative-core-dSYM-release"
     }
 
+// [iOS] React Native Headers — the pure-RN headers-only xcframework, published
+// standalone (it also ships inside the ReactCore tarball for CocoaPods) so
+// SwiftPM consumers can wire it as its own binaryTarget.
+val reactNativeHeadersDebugArtifactFile: RegularFile =
+    layout.projectDirectory.file("artifacts/ReactNativeHeadersDebug.xcframework.tar.gz")
+val reactNativeHeadersDebugArtifact: PublishArtifact =
+    artifacts.add("externalArtifacts", reactNativeHeadersDebugArtifactFile) {
+      type = "tgz"
+      extension = "tar.gz"
+      classifier = "reactnative-headers-debug"
+    }
+
+val reactNativeHeadersReleaseArtifactFile: RegularFile =
+    layout.projectDirectory.file("artifacts/ReactNativeHeadersRelease.xcframework.tar.gz")
+val reactNativeHeadersReleaseArtifact: PublishArtifact =
+    artifacts.add("externalArtifacts", reactNativeHeadersReleaseArtifactFile) {
+      type = "tgz"
+      extension = "tar.gz"
+      classifier = "reactnative-headers-release"
+    }
+
 apply(from = "../publish.gradle")
 
 publishing {
@@ -106,11 +151,15 @@ publishing {
       artifact(reactNativeDependenciesReleaseArtifact)
       artifact(reactNativeDependenciesDebugDSYMArtifact)
       artifact(reactNativeDependenciesReleaseDSYMArtifact)
+      artifact(reactNativeDependenciesHeadersDebugArtifact)
+      artifact(reactNativeDependenciesHeadersReleaseArtifact)
        */
       artifact(reactCoreDebugArtifact)
       artifact(reactCoreReleaseArtifact)
       artifact(reactCoreDebugDSYMArtifact)
       artifact(reactCoreReleaseDSYMArtifact)
+      artifact(reactNativeHeadersDebugArtifact)
+      artifact(reactNativeHeadersReleaseArtifact)
     }
   }
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.86.0-2
+VERSION_NAME=0.87.0-0
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/hermes-engine/build.gradle.kts

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import com.facebook.react.internal.PrivateReactExtension
 import com.facebook.react.tasks.internal.*
 import de.undercouch.gradle.tasks.download.Download
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -52,8 +51,6 @@ fun getSDKManagerPath(): String {
   }
 }
 
-val hermesV1Enabled =
-    rootProject.extensions.getByType(PrivateReactExtension::class.java).hermesV1Enabled.get()
 val reactNativeRootDir = project(":packages:react-native:ReactAndroid").projectDir.parent
 val customDownloadDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
 val downloadsDir =
@@ -83,14 +80,13 @@ val hermesBuildOutputFileTree =
     fileTree(hermesBuildDir.toString())
         .include("**/*.cmake", "**/*.marks", "**/compiler_depends.ts", "**/Makefile", "**/link.txt")
 
-val hermesVersionProvider: Provider<String> =
-    providers.provider {
-      var hermesVersion = if (hermesV1Enabled) "250829098.0.0-stable" else "main"
-      val hermesVersionFile =
-          File(
-              reactNativeRootDir,
-              if (hermesV1Enabled) "sdks/.hermesv1version" else "sdks/.hermesversion",
-          )
+val hermesVersionProvider: Provider<String> = providers.provider {
+  var hermesVersion = "250829098.0.0-stable"
+  val hermesVersionFile =
+      File(
+          reactNativeRootDir,
+          "sdks/.hermesv1version",
+      )
 
       if (hermesVersionFile.exists()) {
         hermesVersion = hermesVersionFile.readText()
@@ -175,9 +171,7 @@ fun configureBuildForHermesCommandLineArgs(
   if (Os.isFamily(Os.FAMILY_WINDOWS)) {
     cmakeCommandLine = cmakeCommandLine + "-GNMake Makefiles"
   }
-  if (hermesV1Enabled) {
-    cmakeCommandLine = cmakeCommandLine + "-DHERMESVM_HEAP_HV_MODE=HEAP_HV_PREFER32"
-  }
+  cmakeCommandLine = cmakeCommandLine + "-DHERMESVM_HEAP_HV_MODE=HEAP_HV_PREFER32"
 
   return cmakeCommandLine
 }
@@ -361,9 +355,7 @@ android {
             "-DHERMES_ENABLE_INTL=True",
         )
 
-        if (hermesV1Enabled) {
-          arguments("-DHERMESVM_HEAP_HV_MODE=HEAP_HV_PREFER32")
-        }
+        arguments("-DHERMESVM_HEAP_HV_MODE=HEAP_HV_PREFER32")
 
         targets("hermesvm")
       }
@@ -418,9 +410,16 @@ android {
     }
   }
 
-  sourceSets.getByName("main") {
-    manifest.srcFile("$hermesDir/android/hermes/src/main/AndroidManifest.xml")
-    java.srcDirs("$hermesDir/lib/Platform/Intl/java", "$hermesDir/lib/Platform/Unicode/java")
+  sourceSets {
+    named("main") {
+      manifest.srcFile("$hermesDir/android/hermes/src/main/AndroidManifest.xml")
+      java.directories.addAll(
+          listOf(
+              "$hermesDir/lib/Platform/Intl/java",
+              "$hermesDir/lib/Platform/Unicode/java",
+          )
+      )
+    }
   }
 
   buildFeatures {

package/ReactAndroid/src/debug/AndroidManifest.xml

@@ -7,6 +7,12 @@
    -->
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
+  <!--
+    On Android 17 (SDK 37) devices, apps that declare this must hold ACCESS_LOCAL_NETWORK
+    to reach the dev server over the local network. Loopback via `adb reverse` is exempt.
+   -->
+  <uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK"/>
+
   <application>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"
               android:exported="false" />

package/ReactAndroid/src/debugOptimized/AndroidManifest.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <!--
+    debugOptimized keeps JS debugging and DevSupport enabled while using
+    optimized native code. Keep this manifest in sync with the debug
+    DevSupport manifest so debug-only DevSupport components remain available.
+   -->
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+  <!--
+    On Android 17 (SDK 37) devices, apps that declare this must hold ACCESS_LOCAL_NETWORK
+    to reach the dev server over the local network. Loopback via `adb reverse` is exempt.
+   -->
+  <uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK"/>
+
+  <application>
+    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"
+              android:exported="false" />
+  </application>
+
+</manifest>

package/ReactAndroid/src/main/java/com/facebook/react/BaseReactPackage.kt

@@ -11,7 +11,6 @@ import com.facebook.react.bridge.ModuleHolder
 import com.facebook.react.bridge.ModuleSpec
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
@@ -65,12 +64,9 @@ public abstract class BaseReactPackage : ReactPackage {
             val reactModuleInfo = entry.value
 
             // This Iterator is used to create the NativeModule registry. The NativeModule
-            // registry must not have TurboModules. Therefore, if TurboModules are enabled, and
-            // the current NativeModule is a TurboModule, we need to skip iterating over it.
-            if (
-                ReactNativeNewArchitectureFeatureFlags.useTurboModules() &&
-                    reactModuleInfo.isTurboModule
-            ) {
+            // registry must not have TurboModules. Therefore, if the current NativeModule is
+            // a TurboModule, we need to skip iterating over it.
+            if (reactModuleInfo.isTurboModule) {
               continue
             }
 

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java

@@ -22,6 +22,7 @@ import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.LifecycleState;
+import com.facebook.react.devsupport.LocalNetworkPermissionUtil;
 import com.facebook.react.interfaces.fabric.ReactSurface;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.core.PermissionListener;
@@ -168,7 +169,8 @@ public class ReactActivityDelegate {
                 };
           }
           if (mainComponentName != null) {
-            loadApp(mainComponentName);
+            LocalNetworkPermissionUtil.requestLocalNetworkAccessIfNeeded(
+                getPlainActivity(), () -> loadApp(mainComponentName));
           }
         });
   }
@@ -317,7 +319,7 @@ public class ReactActivityDelegate {
    * @return true if Fabric is enabled for this Activity, false otherwise.
    */
   protected boolean isFabricEnabled() {
-    return ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer();
+    return true;
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt

@@ -49,9 +49,7 @@ public open class ReactDelegate {
    *
    * @return true if Fabric is enabled for this Activity, false otherwise.
    */
-  protected var isFabricEnabled: Boolean =
-      ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer()
-    private set
+  protected val isFabricEnabled: Boolean = true
 
   /**
    * Do not use this constructor as it's not accounting for New Architecture at all. You should use
@@ -95,7 +93,6 @@ public open class ReactDelegate {
       launchOptions: Bundle?,
       fabricEnabled: Boolean,
   ) {
-    this.isFabricEnabled = fabricEnabled
     this.activity = activity
     this.mainComponentName = appKey
     this.launchOptions = launchOptions
@@ -252,7 +249,7 @@ public open class ReactDelegate {
             ((ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture() &&
                 reactHost?.devSupportManager != null) ||
                 (reactNativeHost?.hasInstance() == true &&
-                    reactNativeHost?.useDeveloperSupport == true))
+                    reactNativeHost?.getUseDeveloperSupport() == true))
     ) {
       event.startTracking()
       return true
@@ -273,7 +270,8 @@ public open class ReactDelegate {
         }
       } else {
         if (
-            reactNativeHost?.hasInstance() == true && reactNativeHost?.useDeveloperSupport == true
+            reactNativeHost?.hasInstance() == true &&
+                reactNativeHost?.getUseDeveloperSupport() == true
         ) {
           reactNativeHost?.reactInstanceManager?.showDevOptionsDialog()
           return true

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -75,7 +75,6 @@ import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.interfaces.TaskInterface;
 import com.facebook.react.internal.AndroidChoreographerProvider;
 import com.facebook.react.internal.ChoreographerProvider;
-import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.appearance.AppearanceModule;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -171,6 +170,7 @@ public class ReactInstanceManager {
   // Identifies whether the instance manager destroy function is in process,
   // while true any spawned create thread should wait for proper clean up before initializing
   private volatile Boolean mHasStartedDestroying = false;
+  private final Object mHasStartedDestroyingLock = new Object();
   private final MemoryPressureRouter mMemoryPressureRouter;
   private final @Nullable JSExceptionHandler mJSExceptionHandler;
   private final @Nullable UIManagerProvider mUIManagerProvider;
@@ -320,8 +320,6 @@ public class ReactInstanceManager {
         Activity currentActivity = getCurrentActivity();
         if (currentActivity != null) {
           ReactRootView rootView = new ReactRootView(currentActivity);
-          boolean isFabric = ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer();
-          rootView.setIsFabric(isFabric);
           rootView.startReactApplication(ReactInstanceManager.this, appKey, new Bundle());
           return rootView;
         }
@@ -782,8 +780,8 @@ public class ReactInstanceManager {
     ResourceDrawableIdHelper.getInstance().clear();
 
     mHasStartedDestroying = false;
-    synchronized (mHasStartedDestroying) {
-      mHasStartedDestroying.notifyAll();
+    synchronized (mHasStartedDestroyingLock) {
+      mHasStartedDestroyingLock.notifyAll();
     }
     synchronized (mPackages) {
       mViewManagerNames = null;
@@ -1139,10 +1137,10 @@ public class ReactInstanceManager {
             null,
             () -> {
               ReactMarker.logMarker(REACT_CONTEXT_THREAD_END);
-              synchronized (ReactInstanceManager.this.mHasStartedDestroying) {
+              synchronized (ReactInstanceManager.this.mHasStartedDestroyingLock) {
                 while (ReactInstanceManager.this.mHasStartedDestroying) {
                   try {
-                    ReactInstanceManager.this.mHasStartedDestroying.wait();
+                    ReactInstanceManager.this.mHasStartedDestroyingLock.wait();
                   } catch (InterruptedException e) {
                     // Interrupted while waiting for destruction to complete, just retry
                     continue;

package/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.kt

@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+@file:Suppress("DEPRECATION")
+
+package com.facebook.react
+
+import android.annotation.SuppressLint
+import android.app.Application
+import com.facebook.react.bridge.JSExceptionHandler
+import com.facebook.react.bridge.JavaScriptExecutorFactory
+import com.facebook.react.bridge.ReactMarker
+import com.facebook.react.bridge.ReactMarkerConstants
+import com.facebook.react.bridge.UIManagerProvider
+import com.facebook.react.common.LifecycleState
+import com.facebook.react.common.SurfaceDelegateFactory
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
+import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
+import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
+import com.facebook.react.devsupport.DevSupportManagerFactory
+import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
+import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
+import com.facebook.react.devsupport.interfaces.RedBoxHandler
+import com.facebook.react.internal.ChoreographerProvider
+
+/**
+ * Simple class that holds an instance of [ReactInstanceManager]. This can be used in your
+ * [Application] class (see [ReactApplication]), or as a static field.
+ *
+ * @deprecated This class will be replaced by com.facebook.react.ReactHost in the New Architecture.
+ */
+@Deprecated("This class is part of Legacy Architecture and will be removed in a future release")
+@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
+@SuppressLint("DeprecatedClass", "DeprecatedInterface")
+public abstract class ReactNativeHost protected constructor(private val mApplication: Application) {
+
+  private var mReactInstanceManager: ReactInstanceManager? = null
+
+  /**
+   * Get the current [ReactInstanceManager] instance, or create one.
+   *
+   * NOTE: Care must be taken when storing this reference outside of the ReactNativeHost lifecycle.
+   * The ReactInstanceManager will be invalidated during [clear], and may not be used again
+   * afterwards.
+   */
+  public open val reactInstanceManager: ReactInstanceManager
+    @Synchronized
+    get() {
+      if (mReactInstanceManager == null) {
+        ReactMarker.logMarker(ReactMarkerConstants.INIT_REACT_RUNTIME_START)
+        ReactMarker.logMarker(ReactMarkerConstants.GET_REACT_INSTANCE_MANAGER_START)
+        mReactInstanceManager = createReactInstanceManager()
+        ReactMarker.logMarker(ReactMarkerConstants.GET_REACT_INSTANCE_MANAGER_END)
+      }
+      return mReactInstanceManager!!
+    }
+
+  /**
+   * Get whether this holder contains a [ReactInstanceManager] instance, or not. I.e. if
+   * [getReactInstanceManager] has been called at least once since this object was created or
+   * [clear] was called.
+   */
+  @Synchronized public open fun hasInstance(): Boolean = mReactInstanceManager != null
+
+  /**
+   * Destroy the current instance and invalidate the internal ReactInstanceManager, reclaiming its
+   * resources and preventing it from being reused.
+   */
+  @Synchronized
+  public open fun clear() {
+    mReactInstanceManager?.invalidate()
+    mReactInstanceManager = null
+  }
+
+  protected open fun createReactInstanceManager(): ReactInstanceManager {
+    ReactMarker.logMarker(ReactMarkerConstants.BUILD_REACT_INSTANCE_MANAGER_START)
+    val builder = getBaseReactInstanceManagerBuilder()
+    ReactMarker.logMarker(ReactMarkerConstants.BUILD_REACT_INSTANCE_MANAGER_END)
+    return builder.build()
+  }
+
+  protected open fun getBaseReactInstanceManagerBuilder(): ReactInstanceManagerBuilder {
+    val builder =
+        ReactInstanceManager.builder()
+            .setApplication(mApplication)
+            .setJSMainModulePath(getJSMainModuleName())
+            .setUseDeveloperSupport(getUseDeveloperSupport())
+            .setDevSupportManagerFactory(getDevSupportManagerFactory())
+            .setDevLoadingViewManager(getDevLoadingViewManager())
+            .setRequireActivity(getShouldRequireActivity())
+            .setSurfaceDelegateFactory(getSurfaceDelegateFactory())
+            .setJSExceptionHandler(getJSExceptionHandler())
+            .setLazyViewManagersEnabled(getLazyViewManagersEnabled())
+            .setRedBoxHandler(getRedBoxHandler())
+            .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
+            .setUIManagerProvider(getUIManagerProvider())
+            .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
+            .setReactPackageTurboModuleManagerDelegateBuilder(
+                getReactPackageTurboModuleManagerDelegateBuilder()
+            )
+            .setChoreographerProvider(getChoreographerProvider())
+            .setPausedInDebuggerOverlayManager(getPausedInDebuggerOverlayManager())
+
+    for (reactPackage in getPackages()) {
+      builder.addPackage(reactPackage)
+    }
+
+    val jsBundleFile = getJSBundleFile()
+    if (jsBundleFile != null) {
+      builder.setJSBundleFile(jsBundleFile)
+    } else {
+      builder.setBundleAssetName(
+          com.facebook.infer.annotation.Assertions.assertNotNull(getBundleAssetName())
+      )
+    }
+    return builder
+  }
+
+  /** Get the [RedBoxHandler] to send RedBox-related callbacks to. */
+  protected open fun getRedBoxHandler(): RedBoxHandler? = null
+
+  protected open fun getJSExceptionHandler(): JSExceptionHandler? = null
+
+  /** Get the [JavaScriptExecutorFactory]. Override this to use a custom Executor. */
+  protected open fun getJavaScriptExecutorFactory(): JavaScriptExecutorFactory? = null
+
+  protected open fun getReactPackageTurboModuleManagerDelegateBuilder():
+      ReactPackageTurboModuleManagerDelegate.Builder? = null
+
+  protected fun getApplication(): Application = mApplication
+
+  protected open fun getUIManagerProvider(): UIManagerProvider? = UIManagerProvider { null }
+
+  /** Returns whether or not to treat it as normal if Activity is null. */
+  public open fun getShouldRequireActivity(): Boolean = true
+
+  /**
+   * Returns whether view managers should be created lazily. See [ViewManagerOnDemandReactPackage]
+   * for details.
+   *
+   * @experimental
+   */
+  public open fun getLazyViewManagersEnabled(): Boolean = false
+
+  /**
+   * Return the [SurfaceDelegateFactory] used by NativeModules to get access to a SurfaceDelegate to
+   * interact with a surface. By default in the mobile platform the SurfaceDelegate it returns is
+   * null, and the NativeModule needs to implement its own SurfaceDelegate to decide how it would
+   * interact with its own container surface.
+   */
+  public open fun getSurfaceDelegateFactory(): SurfaceDelegateFactory = SurfaceDelegateFactory {
+    null
+  }
+
+  /** Get the [DevLoadingViewManager]. Override this to use a custom dev loading view manager. */
+  protected open fun getDevLoadingViewManager(): DevLoadingViewManager? = null
+
+  protected open fun getPausedInDebuggerOverlayManager(): PausedInDebuggerOverlayManager? = null
+
+  /**
+   * Returns the name of the main module. Determines the URL used to fetch the JS bundle from Metro.
+   * It is only used when dev support is enabled. This is the first file to be executed once the
+   * [ReactInstanceManager] is created. e.g. "index.android"
+   */
+  protected open fun getJSMainModuleName(): String = "index.android"
+
+  /**
+   * Returns a custom path of the bundle file. This is used in cases the bundle should be loaded
+   * from a custom path. By default it is loaded from Android assets, from a path specified by
+   * [getBundleAssetName]. e.g. "file://sdcard/myapp_cache/index.android.bundle"
+   */
+  protected open fun getJSBundleFile(): String? = null
+
+  /**
+   * Returns the name of the bundle in assets. If this is null, and no file path is specified for
+   * the bundle, the app will only work with [getUseDeveloperSupport] enabled and will always try to
+   * load the JS bundle from Metro. e.g. "index.android.bundle"
+   */
+  protected open fun getBundleAssetName(): String? = "index.android.bundle"
+
+  /** Returns whether dev mode should be enabled. This enables e.g. the dev menu. */
+  public abstract fun getUseDeveloperSupport(): Boolean
+
+  /** Get the [DevSupportManagerFactory]. Override this to use a custom dev support manager. */
+  protected open fun getDevSupportManagerFactory(): DevSupportManagerFactory? = null
+
+  /**
+   * Returns a list of [ReactPackage] used by the app. You'll most likely want to return at least
+   * the `MainReactPackage`. If your app uses additional views or modules besides the default ones,
+   * you'll want to include more packages here.
+   */
+  protected abstract fun getPackages(): List<ReactPackage>
+
+  /**
+   * Returns a custom implementation of ChoreographerProvider to be used this host. If null - React
+   * will use default direct android.view.Choreographer-based provider.
+   */
+  protected open fun getChoreographerProvider(): ChoreographerProvider? = null
+
+  private companion object {
+    init {
+      LegacyArchitectureLogger.assertLegacyArchitecture(
+          "ReactNativeHost",
+          LegacyArchitectureLogLevel.ERROR,
+      )
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -729,22 +729,6 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     }
   }
 
-  /**
-   * Is used by unit test to setup mIsAttachedToWindow flags, that will let this view to be properly
-   * attached to catalyst instance by startReactApplication call
-   */
-  @VisibleForTesting
-  /* package */ void simulateAttachForTesting() {
-    mIsAttachedToInstance = true;
-    mJSTouchDispatcher = new JSTouchDispatcher(this);
-    if (ReactFeatureFlags.dispatchPointerEvents) {
-      mJSPointerDispatcher = new JSPointerDispatcher(this);
-    }
-    if (ReactNativeFeatureFlags.enableKeyEvents()) {
-      mJSKeyDispatcher = new JSKeyDispatcher();
-    }
-  }
-
   @VisibleForTesting
   /* package */ void simulateCheckForKeyboardForTesting() {
     getCustomGlobalLayoutListener().checkForKeyboardEvents();