react-native-tvos 0.79.2-0 → 0.80.0-0

package/ReactAndroid/build.gradle.kts

@@ -47,7 +47,7 @@ extra["publishing_version"] = project.findProperty("VERSION_NAME")?.toString()!!
 // This is the version of CMake we're requesting to the Android SDK to use.
 // If missing it will be downloaded automatically. Only CMake versions shipped with the
 // Android SDK are supported (you can find them listed in the SDK Manager of Android Studio).
-val cmakeVersion = System.getenv("CMAKE_VERSION") ?: "3.22.1"
+val cmakeVersion = System.getenv("CMAKE_VERSION") ?: "3.30.5"
 
 extra["cmake_version"] = cmakeVersion
 
@@ -524,6 +524,7 @@ android {
     buildConfigField("boolean", "UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE", "false")
 
     resValue("integer", "react_native_dev_server_port", reactNativeDevServerPort())
+    resValue("string", "react_native_dev_server_ip", "localhost")
 
     testApplicationId = "com.facebook.react.tests.gradle"
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -536,7 +537,8 @@ android {
             "-DREACT_BUILD_DIR=$buildDir",
             "-DANDROID_STL=c++_shared",
             "-DANDROID_TOOLCHAIN=clang",
-            "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
+            "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
+            "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW")
 
         targets(
             "reactnative",

package/ReactAndroid/cmake-utils/ReactNative-application.cmake

@@ -22,6 +22,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/folly-flags.cmake)
 # We configured the REACT_COMMON_DIR variable as it's commonly used to reference
 # shared C++ code in other targets.
 set(REACT_COMMON_DIR ${REACT_ANDROID_DIR}/../ReactCommon)
+include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
 
 # If you have ccache installed, we're going to honor it.
 find_program(CCACHE_FOUND ccache)
@@ -30,6 +31,13 @@ if(CCACHE_FOUND)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 endif(CCACHE_FOUND)
 
+# If the user toolchain supports IPO, we enable it for the app build
+include(CheckIPOSupported)
+check_ipo_supported(RESULT IPO_SUPPORT)
+if (IPO_SUPPORT)
+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+endif()
+
 set(BUILD_DIR ${PROJECT_BUILD_DIR})
 file(TO_CMAKE_PATH "${BUILD_DIR}" BUILD_DIR)
 file(TO_CMAKE_PATH "${REACT_ANDROID_DIR}" REACT_ANDROID_DIR)
@@ -60,21 +68,7 @@ target_include_directories(${CMAKE_PROJECT_NAME}
                 ${CMAKE_CURRENT_SOURCE_DIR}
                 ${PROJECT_BUILD_DIR}/generated/autolinking/src/main/jni)
 
-target_compile_options(${CMAKE_PROJECT_NAME}
-        PRIVATE
-                -Wall
-                -Werror
-                # We suppress cpp #error and #warning to don't fail the build
-                # due to use migrating away from
-                # #include <react/renderer/graphics/conversions.h>
-                # This can be removed for React Native 0.73
-                -Wno-error=cpp
-                -fexceptions
-                -frtti
-                -std=c++20
-                -DLOG_TAG=\"ReactNative\"
-                -DFOLLY_NO_CONFIG=1
-)
+target_compile_reactnative_options(${CMAKE_PROJECT_NAME} PRIVATE "ReactNative")
 
 # Prefab packages from React Native
 find_package(ReactAndroid REQUIRED CONFIG)

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

@@ -75,19 +75,19 @@ val reactNativeDependenciesReleaseArtifact: PublishArtifact =
 val reactNativeDependenciesDebugDSYMArtifactFile: RegularFile =
     layout.projectDirectory.file("artifacts/ReactNativeDependenciesDebug.framework.dSYM.tar.gz")
 val reactNativeDependenciesDebugDSYMArtifact: PublishArtifact =
-    artifacts.add("externalArtifacts", reactNativeDependenciesDebugArtifactFile) {
+    artifacts.add("externalArtifacts", reactNativeDependenciesDebugDSYMArtifactFile) {
       type = "tgz"
       extension = "tar.gz"
-      classifier = "reactnative-dependencies-debug-dSYM"
+      classifier = "reactnative-dependencies-dSYM-debug"
     }
 
 val reactNativeDependenciesReleaseDSYMArtifactFile: RegularFile =
     layout.projectDirectory.file("artifacts/ReactNativeDependenciesRelease.framework.dSYM.tar.gz")
 val reactNativeDependenciesReleaseDSYMArtifact: PublishArtifact =
-    artifacts.add("externalArtifacts", reactNativeDependenciesReleaseArtifactFile) {
+    artifacts.add("externalArtifacts", reactNativeDependenciesReleaseDSYMArtifactFile) {
       type = "tgz"
       extension = "tar.gz"
-      classifier = "reactnative-dependencies-release-dSYM"
+      classifier = "reactnative-dependencies-dSYM-release"
     }
 
 apply(from = "../publish.gradle")
@@ -102,6 +102,8 @@ publishing {
       artifact(hermesDSYMReleaseArtifact)
       artifact(reactNativeDependenciesDebugArtifact)
       artifact(reactNativeDependenciesReleaseArtifact)
+      artifact(reactNativeDependenciesDebugDSYMArtifact)
+      artifact(reactNativeDependenciesReleaseDSYMArtifact)
     }
   }
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.79.2-0
+VERSION_NAME=0.80.0-0
 react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true
@@ -28,10 +28,12 @@ binaryCompatibilityValidator.ignoredPackages=com.facebook.debug,\
   com.facebook.react.module.processing,\
   com.facebook.react.processing,\
   com.facebook.react.runtime.internal,\
+  com.facebook.react.uimanager.internal,\
   com.facebook.react.views.text.internal,\
   com.facebook.systrace,\
   com.facebook.yoga
 binaryCompatibilityValidator.nonPublicMarkers=com.facebook.react.common.annotations.VisibleForTesting,\
-  com.facebook.react.common.annotations.UnstableReactNativeAPI
+  com.facebook.react.common.annotations.UnstableReactNativeAPI,\
+  com.facebook.react.common.annotations.FrameworkAPI
 binaryCompatibilityValidator.validationDisabled=true
 binaryCompatibilityValidator.outputApiFileName=ReactAndroid

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

@@ -138,19 +138,22 @@ val configureBuildForHermes by
       workingDir(hermesDir)
       inputs.dir(hermesDir)
       outputs.files(hermesBuildOutputFileTree)
-      commandLine(
+      var cmakeCommandLine =
           windowsAwareCommandLine(
               cmakeBinaryPath,
               // Suppress all warnings as this is the Hermes build and we can't fix them.
               "--log-level=ERROR",
               "-Wno-dev",
-              if (Os.isFamily(Os.FAMILY_WINDOWS)) "-GNMake Makefiles" else "",
               "-S",
               ".",
               "-B",
               hermesBuildDir.toString(),
               "-DJSI_DIR=" + jsiDir.absolutePath,
-          ))
+          )
+      if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        cmakeCommandLine = cmakeCommandLine + "-GNMake Makefiles"
+      }
+      commandLine(cmakeCommandLine)
       standardOutputFile.set(project.file("$buildDir/configure-hermesc.log"))
     }
 
@@ -238,9 +241,9 @@ android {
             "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
             "-DIMPORT_HERMESC=${File(hermesBuildDir, "ImportHermesc.cmake").toString()}",
             "-DJSI_DIR=${jsiDir}",
-            "-DHERMES_SLOW_DEBUG=False",
             "-DHERMES_BUILD_SHARED_JSI=True",
             "-DHERMES_RELEASE_VERSION=for RNTV ${version}",
+            "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True",
             // We intentionally build Hermes with Intl support only. This is to simplify
             // the build setup and to avoid overcomplicating the build-type matrix.
             "-DHERMES_ENABLE_INTL=True")

package/ReactAndroid/proguard-rules.pro

@@ -23,7 +23,6 @@
 # Keep our interfaces so they can be used by other ProGuard rules.
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
--keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
 
 # Do not strip any method/class that is annotated with @DoNotStrip
 -keep @com.facebook.proguard.annotations.DoNotStrip class *
@@ -41,11 +40,6 @@
     *;
 }
 
--keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
-  void set*(***);
-  *** get*();
-}
-
 -keep class * implements com.facebook.react.bridge.JavaScriptModule { *; }
 -keep class * implements com.facebook.react.bridge.NativeModule { *; }
 -keepclassmembers,includedescriptorclasses class * { native <methods>; }

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.kt

@@ -42,7 +42,7 @@ public class HermesExecutor internal constructor(enableDebugger: Boolean, debugg
     private external fun initHybridDefaultConfig(
         enableDebugger: Boolean,
         debuggerName: String
-    ): HybridData?
+    ): HybridData
 
     @DoNotStrip
     @JvmStatic
@@ -50,6 +50,6 @@ public class HermesExecutor internal constructor(enableDebugger: Boolean, debugg
         enableDebugger: Boolean,
         debuggerName: String,
         heapSizeMB: Long
-    ): HybridData?
+    ): HybridData
   }
 }

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

@@ -11,7 +11,7 @@ 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.ReactNativeFeatureFlags
+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,7 +65,8 @@ public abstract class BaseReactPackage : ReactPackage {
             // 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 (ReactNativeFeatureFlags.useTurboModules() && reactModuleInfo.isTurboModule) {
+            if (ReactNativeNewArchitectureFeatureFlags.useTurboModules() &&
+                reactModuleInfo.isTurboModule) {
               continue
             }
 

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

@@ -17,6 +17,9 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.common.ClassFinder;
+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.LogBoxModule;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.module.annotations.ReactModuleList;
@@ -59,8 +62,14 @@ import java.util.Map;
       TimingModule.class,
       UIManagerModule.class,
     })
+@LegacyArchitecture
 class CoreModulesPackage extends BaseReactPackage implements ReactPackageLogger {
 
+  static {
+    LegacyArchitectureLogger.assertLegacyArchitecture(
+        "CoreModulesPackage", LegacyArchitectureLogLevel.WARNING);
+  }
+
   private final ReactInstanceManager mReactInstanceManager;
   private final DefaultHardwareBackBtnHandler mHardwareBackBtnHandler;
   private final boolean mLazyViewManagersEnabled;
@@ -171,7 +180,7 @@ class CoreModulesPackage extends BaseReactPackage implements ReactPackageLogger
 
   private UIManagerModule createUIManager(final ReactApplicationContext reactContext) {
     ReactMarker.logMarker(CREATE_UI_MANAGER_MODULE_START);
-    Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "createUIManagerModule");
+    Systrace.beginSection(Systrace.TRACE_TAG_REACT, "createUIManagerModule");
     try {
       if (mLazyViewManagersEnabled) {
         ViewManagerResolver resolver =
@@ -196,7 +205,7 @@ class CoreModulesPackage extends BaseReactPackage implements ReactPackageLogger
             mMinTimeLeftInFrameForNonBatchedOperationMs);
       }
     } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+      Systrace.endSection(Systrace.TRACE_TAG_REACT);
       ReactMarker.logMarker(CREATE_UI_MANAGER_MODULE_END);
     }
   }

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

@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react
+
+import com.facebook.react.bridge.ModuleSpec
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.UIManager
+import com.facebook.react.module.annotations.ReactModuleList
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import com.facebook.react.uimanager.ViewManager
+import com.facebook.react.views.debuggingoverlay.DebuggingOverlayManager
+
+/**
+ * Package defining core framework modules (e.g. [UIManager]). It should be used for modules that
+ * require special integration with other framework parts (e.g. with the list of packages to load
+ * view managers from).
+ */
+@ReactModuleList(nativeModules = [])
+public class DebugCorePackage public constructor() :
+    BaseReactPackage(), ViewManagerOnDemandReactPackage {
+
+  /** A map of view managers that should be registered with [UIManager] */
+  private val viewManagersMap: Map<String, ModuleSpec> by
+      lazy(LazyThreadSafetyMode.NONE) {
+        mapOf(
+            DebuggingOverlayManager.REACT_CLASS to
+                ModuleSpec.viewManagerSpec { DebuggingOverlayManager() })
+      }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider = ReactModuleInfoProvider {
+    emptyMap()
+  }
+
+  public override fun getModule(
+      name: String,
+      reactContext: ReactApplicationContext
+  ): NativeModule? = null
+
+  public override fun getViewManagers(reactContext: ReactApplicationContext): List<ModuleSpec> =
+      viewManagersMap.values.toList()
+
+  override fun getViewManagerNames(reactContext: ReactApplicationContext): Collection<String> =
+      viewManagersMap.keys
+
+  override fun createViewManager(
+      reactContext: ReactApplicationContext,
+      viewManagerName: String
+  ): ViewManager<*, *>? =
+      viewManagersMap.getOrDefault(viewManagerName, null)?.provider?.get() as? ViewManager<*, *>
+}

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

@@ -17,7 +17,7 @@ import android.os.PowerManager
 import android.os.PowerManager.WakeLock
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags
 import com.facebook.react.jstasks.HeadlessJsTaskConfig
 import com.facebook.react.jstasks.HeadlessJsTaskContext.Companion.getInstance
 import com.facebook.react.jstasks.HeadlessJsTaskEventListener
@@ -117,15 +117,15 @@ public abstract class HeadlessJsTaskService : Service(), HeadlessJsTaskEventList
 
   /**
    * Get the [ReactHost] used by this app. By default, assumes [.getApplication] is an instance of
-   * [ReactApplication] and calls [ReactApplication.getReactHost]. This method assumes it is called
-   * in new architecture and returns null if not.
+   * [ReactApplication] and calls [ReactApplication.reactHost]. This method assumes it is called in
+   * new architecture and returns null if not.
    */
   protected val reactHost: ReactHost?
     get() = (application as ReactApplication).reactHost
 
   protected val reactContext: ReactContext?
     get() {
-      if (ReactNativeFeatureFlags.enableBridgelessArchitecture()) {
+      if (ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture()) {
         val reactHost =
             checkNotNull(reactHost) { "ReactHost is not initialized in New Architecture" }
         return reactHost.currentReactContext
@@ -136,7 +136,7 @@ public abstract class HeadlessJsTaskService : Service(), HeadlessJsTaskEventList
     }
 
   private fun createReactContextAndScheduleTask(taskConfig: HeadlessJsTaskConfig) {
-    if (ReactNativeFeatureFlags.enableBridgelessArchitecture()) {
+    if (ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture()) {
       val reactHost = checkNotNull(reactHost)
       reactHost.addReactInstanceEventListener(
           object : ReactInstanceEventListener {

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

@@ -6,11 +6,15 @@
  */
 
 package com.facebook.react
+
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
+
 /**
  * An enum that specifies the algorithm to use when loading theJS Engine. [.JSC] will load
  * JavaScriptCore first and fail if it is not available. [.HERMES] will load Hermes first and fail
  * if it is not available.
  */
+@LegacyArchitecture
 public enum class JSEngineResolutionAlgorithm {
   JSC,
   HERMES

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

@@ -7,14 +7,18 @@
 
 package com.facebook.react;
 
-import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
+import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
 
+import com.facebook.infer.annotation.Nullsafe;
 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.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
+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.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
@@ -26,9 +30,16 @@ import java.util.List;
 import java.util.Map;
 
 /** React package supporting lazy creation of native modules. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 @Deprecated(since = "This class is deprecated, please use BaseReactPackage instead.")
+@LegacyArchitecture
 public abstract class LazyReactPackage implements ReactPackage {
 
+  static {
+    LegacyArchitectureLogger.assertLegacyArchitecture(
+        "LazyReactPackage", LegacyArchitectureLogLevel.WARNING);
+  }
+
   /**
    * We return an iterable
    *
@@ -94,13 +105,13 @@ public abstract class LazyReactPackage implements ReactPackage {
     List<NativeModule> modules = new ArrayList<>();
     for (ModuleSpec holder : getNativeModules(reactContext)) {
       NativeModule nativeModule;
-      SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createNativeModule").flush();
+      SystraceMessage.beginSection(TRACE_TAG_REACT, "createNativeModule").flush();
       ReactMarker.logMarker(ReactMarkerConstants.CREATE_MODULE_START, holder.getName());
       try {
         nativeModule = holder.getProvider().get();
       } finally {
         ReactMarker.logMarker(ReactMarkerConstants.CREATE_MODULE_END);
-        SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
+        SystraceMessage.endSection(TRACE_TAG_REACT).flush();
       }
       modules.add(nativeModule);
     }

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

@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react
+
+import android.content.ComponentCallbacks2
+import android.content.Context
+import android.content.res.Configuration
+import com.facebook.react.bridge.MemoryPressureListener
+import java.util.concurrent.CopyOnWriteArrayList
+
+/** Translates and routes memory pressure events. */
+public class MemoryPressureRouter(context: Context) : ComponentCallbacks2 {
+  private val listeners = CopyOnWriteArrayList<MemoryPressureListener>()
+
+  init {
+    context.applicationContext.registerComponentCallbacks(this)
+  }
+
+  public fun destroy(context: Context): Unit {
+    context.applicationContext.unregisterComponentCallbacks(this)
+  }
+
+  /** Add a listener to be notified of memory pressure events. */
+  public fun addMemoryPressureListener(listener: MemoryPressureListener) {
+    if (!listeners.contains(listener)) {
+      listeners.add(listener)
+    }
+  }
+
+  /** Remove a listener previously added with [.addMemoryPressureListener]. */
+  public fun removeMemoryPressureListener(listener: MemoryPressureListener) {
+    listeners.remove(listener)
+  }
+
+  override public fun onTrimMemory(level: Int) {
+    dispatchMemoryPressure(level)
+  }
+
+  override public fun onConfigurationChanged(newConfig: Configuration): Unit = Unit
+
+  @Deprecated("onLowMemory is deprecated in the underlying API")
+  override public fun onLowMemory(): Unit = Unit
+
+  private fun dispatchMemoryPressure(level: Int) {
+    for (listener in listeners) {
+      listener.handleMemoryPressure(level)
+    }
+  }
+}

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

@@ -10,8 +10,12 @@ package com.facebook.react
 import com.facebook.react.bridge.ModuleHolder
 import com.facebook.react.bridge.NativeModuleRegistry
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
+import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
+import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
 
 /** Helper class to build NativeModuleRegistry. */
+@LegacyArchitecture
 public class NativeModuleRegistryBuilder(
     private val reactApplicationContext: ReactApplicationContext,
 ) {
@@ -24,7 +28,7 @@ public class NativeModuleRegistryBuilder(
   public constructor(
       reactApplicationContext: ReactApplicationContext,
       @Suppress("UNUSED_PARAMETER") reactInstanceManager: ReactInstanceManager
-  ) : this(reactApplicationContext) {}
+  ) : this(reactApplicationContext)
 
   public fun processPackage(reactPackage: ReactPackage) {
     // We use an iterable instead of an iterator here to ensure thread safety, and that this list
@@ -46,9 +50,9 @@ public class NativeModuleRegistryBuilder(
           """
 Native module $name tried to override ${existingNativeModule.className}.
 
-Check the getPackages() method in MainApplication.java, it might be that module is being created twice. 
-If this was your intention, set canOverrideExistingModule=true. This error may also be present if the 
-package is present only once in getPackages() but is also automatically added later during build time 
+Check the getPackages() method in MainApplication.java, it might be that module is being created twice.
+If this was your intention, set canOverrideExistingModule=true. This error may also be present if the
+package is present only once in getPackages() but is also automatically added later during build time
 by autolinking. Try removing the existing entry and rebuild.
 """
         }
@@ -58,4 +62,11 @@ by autolinking. Try removing the existing entry and rebuild.
   }
 
   public fun build(): NativeModuleRegistry = NativeModuleRegistry(reactApplicationContext, modules)
+
+  private companion object {
+    init {
+      LegacyArchitectureLogger.assertLegacyArchitecture(
+          "NativeModuleRegistryBuilder", LegacyArchitectureLogLevel.WARNING)
+    }
+  }
 }

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

@@ -11,11 +11,13 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.KeyEvent;
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
+import com.facebook.react.util.AndroidVersion;
 import org.jetbrains.annotations.NotNull;
 
 /** Base Activity for React Native applications. */
@@ -24,6 +26,18 @@ public abstract class ReactActivity extends AppCompatActivity
 
   private final ReactActivityDelegate mDelegate;
 
+  // Due to enforced predictive back on targetSdk 36, 'onBackPressed()' is disabled by default.
+  // Using a workaround to trigger it manually.
+  private final OnBackPressedCallback mBackPressedCallback =
+      new OnBackPressedCallback(true) {
+        @Override
+        public void handleOnBackPressed() {
+          setEnabled(false);
+          onBackPressed();
+          setEnabled(true);
+        }
+      };
+
   protected ReactActivity() {
     mDelegate = createReactActivityDelegate();
   }
@@ -45,6 +59,9 @@ public abstract class ReactActivity extends AppCompatActivity
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     mDelegate.onCreate(savedInstanceState);
+    if (AndroidVersion.isAtLeastTargetSdk36(this)) {
+      getOnBackPressedDispatcher().addCallback(this, mBackPressedCallback);
+    }
   }
 
   @Override
@@ -103,6 +120,9 @@ public abstract class ReactActivity extends AppCompatActivity
 
   @Override
   public void invokeDefaultOnBackPressed() {
+    // Disabling callback so the fallback logic (finish activity) can run
+    // as super.onBackPressed() will call all enabled callbacks in the dispatcher.
+    mBackPressedCallback.setEnabled(false);
     super.onBackPressed();
   }
 
@@ -144,14 +164,6 @@ public abstract class ReactActivity extends AppCompatActivity
     mDelegate.onConfigurationChanged(newConfig);
   }
 
-  public boolean onDialogKeyUp(int keyCode, KeyEvent event) {
-    return mDelegate != null && mDelegate.onDialogKeyUp(keyCode, event);
-  }
-
-  public boolean onDialogKeyDown(int keyCode, KeyEvent event) {
-    return mDelegate != null && mDelegate.onDialogKeyDown(keyCode, event);
-  }
-
   protected final ReactNativeHost getReactNativeHost() {
     return mDelegate.getReactNativeHost();
   }

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

@@ -21,7 +21,7 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.interfaces.fabric.ReactSurface;
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
+import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.core.PermissionListener;
 import com.facebook.systrace.Systrace;
 
@@ -116,7 +116,7 @@ public class ReactActivityDelegate {
 
   public void onCreate(Bundle savedInstanceState) {
     Systrace.traceSection(
-        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+        Systrace.TRACE_TAG_REACT,
         "ReactActivityDelegate.onCreate::init",
         () -> {
           String mainComponentName = getMainComponentName();
@@ -124,7 +124,7 @@ public class ReactActivityDelegate {
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isWideColorGamutEnabled()) {
             mActivity.getWindow().setColorMode(ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT);
           }
-          if (ReactNativeFeatureFlags.enableBridgelessArchitecture()) {
+          if (ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture()) {
             mReactDelegate =
                 new ReactDelegate(
                     getPlainActivity(), getReactHost(), mainComponentName, launchOptions);
@@ -208,14 +208,6 @@ public class ReactActivityDelegate {
     return mReactDelegate.onBackPressed();
   }
 
-  public boolean onDialogKeyUp(int keyCode, KeyEvent event) {
-    return mReactDelegate != null && mReactDelegate.onDialogKeyUp(keyCode, event);
-  }
-
-  public boolean onDialogKeyDown(int keyCode, KeyEvent event) {
-    return mReactDelegate != null && mReactDelegate.onDialogKeyDown(keyCode, event);
-  }
-
   public boolean onNewIntent(Intent intent) {
     return mReactDelegate.onNewIntent(intent);
   }
@@ -275,7 +267,7 @@ public class ReactActivityDelegate {
    * @return true if Fabric is enabled for this Activity, false otherwise.
    */
   protected boolean isFabricEnabled() {
-    return ReactNativeFeatureFlags.enableFabricRenderer();
+    return ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer();
   }
 
   /**