react-native 0.81.0-rc.0 → 0.81.0-rc.1

package/Libraries/AppDelegate/React-RCTAppDelegate.podspec

@@ -84,4 +84,5 @@ Pod::Spec.new do |s|
 
   depend_on_js_engine(s)
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/Libraries/Blob/React-RCTBlob.podspec

@@ -55,4 +55,5 @@ Pod::Spec.new do |s|
   end
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/Libraries/Core/ReactNativeVersion.js

@@ -18,5 +18,5 @@ export const version: $ReadOnly<{
   major: 0,
   minor: 81,
   patch: 0,
-  prerelease: 'rc.0',
+  prerelease: 'rc.1',
 };

package/Libraries/Image/React-RCTImage.podspec

@@ -53,4 +53,5 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-NativeModulesApple")
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/Libraries/NativeAnimation/React-RCTAnimation.podspec

@@ -50,4 +50,5 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-featureflags")
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/Libraries/Network/React-RCTNetwork.podspec

@@ -52,4 +52,5 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec

@@ -18,6 +18,7 @@ end
 
 header_search_paths = [
   "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
+  "\"${PODS_ROOT}/Headers/Public/React-RCTFBReactNativeSpec/FBReactNativeSpec\"",
 ]
 
 Pod::Spec.new do |s|
@@ -45,7 +46,9 @@ Pod::Spec.new do |s|
   s.dependency "React-Core/RCTPushNotificationHeaders"
   s.dependency "React-jsi"
 
-  add_dependency(s, "React-RCTFBReactNativeSpec")
+  add_dependency(s, "React-RCTFBReactNativeSpec", :additional_framework_paths => ['FBReactNativeSpec'])
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "React-NativeModulesApple")
+
+  add_rncore_dependency(s)
 end

package/Libraries/Settings/React-RCTSettings.podspec

@@ -49,4 +49,5 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/Libraries/Vibration/React-RCTVibration.podspec

@@ -49,4 +49,5 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-NativeModulesApple")
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(81),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.0",
+                  RCTVersionPrerelease: @"rc.1",
                   };
   });
   return __rnVersion;

package/React/CoreModules/React-CoreModules.podspec

@@ -63,4 +63,5 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-NativeModulesApple")
 
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/React/React-RCTFBReactNativeSpec.podspec

@@ -61,6 +61,7 @@ Pod::Spec.new do |s|
 
   depend_on_js_engine(s)
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 
   s.subspec "components" do |ss|
     ss.source_files         = podspec_sources("FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/**/*.{m,mm,cpp,h}", "FBReactNativeSpec/react/renderer/components/FBReactNativeSpec/**/*.{h}")

package/React/React-RCTFabric.podspec

@@ -97,6 +97,7 @@ Pod::Spec.new do |s|
 
   depend_on_js_engine(s)
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 
   s.test_spec 'Tests' do |test_spec|
     test_spec.source_files = podspec_sources("Tests/**/*.{mm}", "")

package/React/Runtime/React-RCTRuntime.podspec

@@ -68,4 +68,5 @@ Pod::Spec.new do |s|
 
   depend_on_js_engine(s)
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/React-Core-prebuilt.podspec

@@ -62,8 +62,7 @@ Pod::Spec.new do |s|
         CONFIG="Debug"
       fi
 
-      # TODO(T228219721): Add this for React Native Core as well
-      ##### "$NODE_BINARY" "$REACT_NATIVE_PATH/third-party-podspecs/replace_dependencies_version.js" -c "$CONFIG" -r "#{version}" -p "$PODS_ROOT"
+      "$NODE_BINARY" "$REACT_NATIVE_PATH/scripts/replace-rncore-version.js" -c "$CONFIG" -r "#{version}" -p "$PODS_ROOT"
       EOS
     }
 
@@ -73,7 +72,7 @@ Pod::Spec.new do |s|
       # always run the script without warning
       script_phase[:always_out_of_date] = "1"
     end
-    
+
     s.script_phase = script_phase
   end
 end

package/React-Core.podspec

@@ -83,10 +83,6 @@ Pod::Spec.new do |s|
     ss.exclude_files = exclude_files
     ss.private_header_files   = "React/Cxx*/*.h"
 
-    # Include prebuilt if we're not building from source
-    if !ReactNativeCoreUtils.build_rncore_from_source()
-      ss.dependency "React-Core-prebuilt", version
-    end
   end
 
   s.subspec "DevSupport" do |ss|
@@ -137,4 +133,5 @@ Pod::Spec.new do |s|
 
   depend_on_js_engine(s)
   add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
 end

package/ReactAndroid/api/ReactAndroid.api

@@ -353,7 +353,7 @@ public abstract class com/facebook/react/ReactNativeHost {
 }
 
 public abstract interface class com/facebook/react/ReactPackage {
-	public abstract fun createNativeModules (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
+	public fun createNativeModules (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
 	public abstract fun createViewManagers (Lcom/facebook/react/bridge/ReactApplicationContext;)Ljava/util/List;
 	public fun getModule (Ljava/lang/String;Lcom/facebook/react/bridge/ReactApplicationContext;)Lcom/facebook/react/bridge/NativeModule;
 }

package/ReactAndroid/build.gradle.kts

@@ -112,6 +112,8 @@ val preparePrefab by
                       Pair(
                           "../ReactCommon/react/renderer/animations/",
                           "react/renderer/animations/"),
+                      // react_renderer_bridging
+                      Pair("../ReactCommon/react/renderer/bridging/", "react/renderer/bridging/"),
                       // react_renderer_componentregistry
                       Pair(
                           "../ReactCommon/react/renderer/componentregistry/",

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.81.0-rc.0
+VERSION_NAME=0.81.0-rc.1
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

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

@@ -22,6 +22,7 @@ import javax.inject.Provider
 /** Abstract class that supports lazy loading of NativeModules by default. */
 public abstract class BaseReactPackage : ReactPackage {
 
+  @Deprecated("Migrate to [BaseReactPackage] and implement [getModule] instead.")
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
     throw UnsupportedOperationException(
         "createNativeModules method is not supported. Use getModule() method instead.")

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

@@ -112,6 +112,7 @@ public abstract class HeadlessJsTaskService : Service(), HeadlessJsTaskEventList
    * simply have a different mechanism for storing a `ReactNativeHost`, e.g. as a static field
    * somewhere.
    */
+  @Suppress("DEPRECATION")
   protected val reactNativeHost: ReactNativeHost
     get() = (application as ReactApplication).reactNativeHost
 

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

@@ -92,6 +92,8 @@ public abstract class LazyReactPackage : ReactPackage {
    * @param reactContext react application context that can be used to create modules
    * @return A [List]<[NativeModule]> to register
    */
+  @Suppress("DEPRECATION")
+  @Deprecated("Migrate to [BaseReactPackage] and implement [getModule] instead.")
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
       buildList {
         for (holder in getNativeModules(reactContext)) {

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

@@ -18,20 +18,22 @@ import android.view.KeyEvent;
 import android.view.Window;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 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.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.core.PermissionListener;
 import com.facebook.react.views.view.WindowUtilKt;
 import com.facebook.systrace.Systrace;
+import java.util.Objects;
 
 /**
  * Delegate class for {@link ReactActivity}. You can subclass this to provide custom implementations
  * for e.g. {@link #getReactNativeHost()}, if your Application class doesn't implement {@link
  * ReactApplication}.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ReactActivityDelegate {
 
   private final @Nullable Activity mActivity;
@@ -86,8 +88,11 @@ public class ReactActivityDelegate {
    * ReactApplication#getReactNativeHost()}. Override this method if your application class does not
    * implement {@code ReactApplication} or you simply have a different mechanism for storing a
    * {@code ReactNativeHost}, e.g. as a static field somewhere.
+   *
+   * @deprecated "Do not access {@link ReactNativeHost} directly. This class is going away in the
+   *     New Architecture. You should access {@link ReactHost} instead."
    */
-  @DeprecatedInNewArchitecture(message = "Use getReactHost()")
+  @Deprecated
   protected ReactNativeHost getReactNativeHost() {
     return ((ReactApplication) getPlainActivity().getApplication()).getReactNativeHost();
   }
@@ -107,16 +112,21 @@ public class ReactActivityDelegate {
     return mReactDelegate;
   }
 
-  @DeprecatedInNewArchitecture(message = "Use getReactHost()")
+  /**
+   * @deprecated @deprecated "Do not access {@link ReactInstanceManager} directly. This class is
+   *     going away in the New Architecture. You should access {@link ReactHost} instead."
+   * @noinspection deprecation
+   */
   public ReactInstanceManager getReactInstanceManager() {
-    return mReactDelegate.getReactInstanceManager();
+    return Objects.requireNonNull(mReactDelegate).getReactInstanceManager();
   }
 
+  @Nullable
   public String getMainComponentName() {
     return mMainComponentName;
   }
 
-  public void onCreate(Bundle savedInstanceState) {
+  public void onCreate(@Nullable Bundle savedInstanceState) {
     Systrace.traceSection(
         Systrace.TRACE_TAG_REACT,
         "ReactActivityDelegate.onCreate::init",
@@ -147,6 +157,7 @@ public class ReactActivityDelegate {
                     launchOptions,
                     isFabricEnabled()) {
                   @Override
+                  @Nullable
                   protected ReactRootView createRootView() {
                     ReactRootView rootView = ReactActivityDelegate.this.createRootView();
                     if (rootView == null) {
@@ -162,31 +173,29 @@ public class ReactActivityDelegate {
         });
   }
 
-  protected void loadApp(String appKey) {
-    mReactDelegate.loadApp(appKey);
+  protected void loadApp(@Nullable String appKey) {
+    Objects.requireNonNull(mReactDelegate).loadApp(Objects.requireNonNull(appKey));
     getPlainActivity().setContentView(mReactDelegate.getReactRootView());
   }
 
   public void setReactSurface(ReactSurface reactSurface) {
-    mReactDelegate.setReactSurface(reactSurface);
+    Objects.requireNonNull(mReactDelegate).setReactSurface(reactSurface);
   }
 
   public void setReactRootView(ReactRootView reactRootView) {
-    mReactDelegate.setReactRootView(reactRootView);
+    Objects.requireNonNull(mReactDelegate).setReactRootView(reactRootView);
   }
 
   public void onUserLeaveHint() {
-    if (mReactDelegate != null) {
-      mReactDelegate.onUserLeaveHint();
-    }
+    Objects.requireNonNull(mReactDelegate).onUserLeaveHint();
   }
 
   public void onPause() {
-    mReactDelegate.onHostPause();
+    Objects.requireNonNull(mReactDelegate).onHostPause();
   }
 
   public void onResume() {
-    mReactDelegate.onHostResume();
+    Objects.requireNonNull(mReactDelegate).onHostResume();
 
     if (mPermissionsCallback != null) {
       mPermissionsCallback.invoke();
@@ -195,43 +204,43 @@ public class ReactActivityDelegate {
   }
 
   public void onDestroy() {
-    mReactDelegate.onHostDestroy();
+    Objects.requireNonNull(mReactDelegate).onHostDestroy();
   }
 
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    mReactDelegate.onActivityResult(requestCode, resultCode, data, true);
+  public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+    Objects.requireNonNull(mReactDelegate).onActivityResult(requestCode, resultCode, data, true);
   }
 
   public boolean onKeyDown(int keyCode, KeyEvent event) {
-    return mReactDelegate.onKeyDown(keyCode, event);
+    return Objects.requireNonNull(mReactDelegate).onKeyDown(keyCode, event);
   }
 
   public boolean onKeyUp(int keyCode, KeyEvent event) {
-    return mReactDelegate.shouldShowDevMenuOrReload(keyCode, event);
+    return Objects.requireNonNull(mReactDelegate).shouldShowDevMenuOrReload(keyCode, event);
   }
 
   public boolean onKeyLongPress(int keyCode, KeyEvent event) {
-    return mReactDelegate.onKeyLongPress(keyCode);
+    return Objects.requireNonNull(mReactDelegate).onKeyLongPress(keyCode);
   }
 
   public boolean onBackPressed() {
-    return mReactDelegate.onBackPressed();
+    return Objects.requireNonNull(mReactDelegate).onBackPressed();
   }
 
-  public boolean onNewIntent(Intent intent) {
-    return mReactDelegate.onNewIntent(intent);
+  public boolean onNewIntent(@Nullable Intent intent) {
+    return Objects.requireNonNull(mReactDelegate).onNewIntent(Objects.requireNonNull(intent));
   }
 
   public void onWindowFocusChanged(boolean hasFocus) {
-    mReactDelegate.onWindowFocusChanged(hasFocus);
+    Objects.requireNonNull(mReactDelegate).onWindowFocusChanged(hasFocus);
   }
 
   public void onConfigurationChanged(Configuration newConfig) {
-    mReactDelegate.onConfigurationChanged(newConfig);
+    Objects.requireNonNull(mReactDelegate).onConfigurationChanged(newConfig);
   }
 
   public void requestPermissions(
-      String[] permissions, int requestCode, PermissionListener listener) {
+      String[] permissions, int requestCode, @Nullable PermissionListener listener) {
     mPermissionListener = listener;
     getPlainActivity().requestPermissions(permissions, requestCode);
   }
@@ -267,7 +276,7 @@ public class ReactActivityDelegate {
    * context will no longer be valid.
    */
   public @Nullable ReactContext getCurrentReactContext() {
-    return mReactDelegate.getCurrentReactContext();
+    return Objects.requireNonNull(mReactDelegate).getCurrentReactContext();
   }
 
   /**

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

@@ -10,6 +10,10 @@ package com.facebook.react
 /** Interface that represents an instance of a React Native application */
 public interface ReactApplication {
   /** Get the default [ReactNativeHost] for this app. */
+  @Suppress("DEPRECATION")
+  @Deprecated(
+      "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.",
+      ReplaceWith("reactHost"))
   public val reactNativeHost: ReactNativeHost
 
   /**

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

@@ -14,7 +14,6 @@ import android.os.Bundle
 import android.view.KeyEvent
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
 import com.facebook.react.devsupport.DoubleTapReloadRecognizer
 import com.facebook.react.devsupport.ReleaseDevSupportManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
@@ -26,12 +25,17 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
  * A delegate for handling React Application support. This delegate is unaware whether it is used in
  * an [Activity] or a [android.app.Fragment].
  */
+@Suppress("DEPRECATION")
 public open class ReactDelegate {
   private val activity: Activity
   private var internalReactRootView: ReactRootView? = null
   private val mainComponentName: String?
   private var launchOptions: Bundle?
   private var doubleTapReloadRecognizer: DoubleTapReloadRecognizer?
+
+  @Deprecated(
+      "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.",
+      ReplaceWith("reactHost"))
   private var reactNativeHost: ReactNativeHost? = null
   public var reactHost: ReactHost? = null
     private set
@@ -380,7 +384,8 @@ public open class ReactDelegate {
     return false
   }
 
-  @DeprecatedInNewArchitecture(message = "Use reactHost")
+  @Deprecated(
+      "Do not access [ReactInstanceManager] directly. This class is going away in the New Architecture. You should use [ReactHost] instead.")
   public fun getReactInstanceManager(): ReactInstanceManager {
     val nonNullReactNativeHost =
         checkNotNull(reactNativeHost) {

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

@@ -58,6 +58,10 @@ public open class ReactFragment : Fragment(), PermissionAwareActivity {
    * method if your application class does not implement `ReactApplication` or you simply have a
    * different mechanism for storing a `ReactNativeHost`, e.g. as a static field somewhere.
    */
+  @Suppress("DEPRECATION")
+  @Deprecated(
+      "You should not use ReactNativeHost directly in the New Architecture. Use ReactHost instead.",
+      ReplaceWith("reactHost"))
   protected open val reactNativeHost: ReactNativeHost?
     get() = (activity?.application as ReactApplication?)?.reactNativeHost
 

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

@@ -10,6 +10,7 @@ package com.facebook.react;
 import android.app.Application;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactMarker;
@@ -18,7 +19,6 @@ import com.facebook.react.bridge.UIManagerProvider;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.common.SurfaceDelegateFactory;
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.common.annotations.internal.LegacyArchitecture;
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel;
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
@@ -32,12 +32,12 @@ import java.util.List;
 /**
  * Simple class that holds an instance of {@link ReactInstanceManager}. This can be used in your
  * {@link Application class} (see {@link ReactApplication}), or as a static field.
+ *
+ * @deprecated This class will be replaced by com.facebook.react.ReactHost in the New Architecture.
  */
-@DeprecatedInNewArchitecture(
-    message =
-        "This class will be replaced by com.facebook.react.ReactHost in the new architecture of"
-            + " React Native.")
+@Deprecated
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class ReactNativeHost {
 
   static {

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

@@ -10,7 +10,6 @@ package com.facebook.react
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UIManager
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
 import com.facebook.react.common.annotations.StableReactNativeAPI
 import com.facebook.react.uimanager.ViewManager
 
@@ -34,8 +33,9 @@ public interface ReactPackage {
    * @return list of native modules to register with the newly created catalyst instance This method
    *   is deprecated in the new Architecture of React Native.
    */
-  @DeprecatedInNewArchitecture(message = "Migrate to BaseReactPackage and implement getModule")
-  public fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule>
+  @Deprecated(message = "Migrate to [BaseReactPackage] and implement [getModule] instead.")
+  public fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
+      emptyList()
 
   /** @return a list of view managers that should be registered with [UIManager] */
   public fun createViewManagers(

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

@@ -28,6 +28,7 @@ internal object ReactPackageHelper {
     FLog.d(
         ReactConstants.TAG,
         "${reactPackage.javaClass.simpleName} is not a LazyReactPackage, falling back to old version.")
+    @Suppress("DEPRECATION")
     val nativeModules = reactPackage.createNativeModules(reactApplicationContext)
     return Iterable {
       object : Iterator<ModuleHolder> {

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

@@ -83,6 +83,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
 
       if (shouldSupportLegacyPackages()) {
         // TODO(T145105887): Output warnings that ReactPackage was used
+        @Suppress("DEPRECATION")
         val nativeModules = reactPackage.createNativeModules(reactApplicationContext)
 
         val moduleMap: MutableMap<String, NativeModule> = mutableMapOf()
@@ -94,6 +95,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
 
           val moduleName = reactModule?.name ?: module.name
 
+          @Suppress("DEPRECATION")
           val moduleInfo: ReactModuleInfo =
               if (reactModule != null)
                   ReactModuleInfo(

package/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseJavaModule.java

@@ -16,7 +16,6 @@ import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.common.annotations.StableReactNativeAPI;
 import com.facebook.react.common.build.ReactBuildConfig;
 import java.util.Map;
@@ -72,7 +71,6 @@ public abstract class BaseJavaModule implements NativeModule {
   /**
    * @return a map of constants this module exports to JS. Supports JSON types.
    */
-  @DeprecatedInNewArchitecture()
   public @Nullable Map<String, Object> getConstants() {
     return null;
   }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.java

@@ -14,11 +14,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.common.annotations.FrameworkAPI;
 import com.facebook.react.common.annotations.UnstableReactNativeAPI;
 import com.facebook.react.common.annotations.VisibleForTesting;
@@ -27,16 +27,21 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
 import java.util.Collection;
+import java.util.Objects;
 
 /**
  * This is the bridge-specific concrete subclass of ReactContext. ReactContext has many methods that
  * delegate to the react instance. This subclass implements those methods, by delegating to the
  * CatalystInstance. If you need to create a ReactContext within an "bridge context", please create
  * BridgeReactContext.
+ *
+ * @deprecated This class is deprecated in the New Architecture and will be replaced by {@link
+ *     com.facebook.react.runtime.BridgelessReactContext}
  */
-@DeprecatedInNewArchitecture
 @VisibleForTesting
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
+@Deprecated
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class BridgeReactContext extends ReactApplicationContext {
   static {
     LegacyArchitectureLogger.assertLegacyArchitecture(
@@ -119,6 +124,7 @@ public class BridgeReactContext extends ReactApplicationContext {
     if (mCatalystInstance == null) {
       raiseCatalystInstanceMissingException();
     }
+    Assertions.assertNotNull(mCatalystInstance);
     return mCatalystInstance.hasNativeModule(nativeModuleInterface);
   }
 
@@ -127,6 +133,7 @@ public class BridgeReactContext extends ReactApplicationContext {
     if (mCatalystInstance == null) {
       raiseCatalystInstanceMissingException();
     }
+    Assertions.assertNotNull(mCatalystInstance);
     return mCatalystInstance.getNativeModules();
   }
 
@@ -139,6 +146,7 @@ public class BridgeReactContext extends ReactApplicationContext {
     if (mCatalystInstance == null) {
       raiseCatalystInstanceMissingException();
     }
+    Assertions.assertNotNull(mCatalystInstance);
     return mCatalystInstance.getNativeModule(nativeModuleInterface);
   }
 
@@ -147,6 +155,7 @@ public class BridgeReactContext extends ReactApplicationContext {
     if (mCatalystInstance == null) {
       raiseCatalystInstanceMissingException();
     }
+    Assertions.assertNotNull(mCatalystInstance);
     return mCatalystInstance.getNativeModule(moduleName);
   }
 
@@ -210,8 +219,7 @@ public class BridgeReactContext extends ReactApplicationContext {
   @Override
   public void handleException(Exception e) {
     boolean catalystInstanceVariableExists = mCatalystInstance != null;
-    boolean isCatalystInstanceAlive =
-        catalystInstanceVariableExists && !mCatalystInstance.isDestroyed();
+    boolean isCatalystInstanceAlive = mCatalystInstance != null && !mCatalystInstance.isDestroyed();
     boolean hasExceptionHandler = getJSExceptionHandler() != null;
 
     if (isCatalystInstanceAlive && hasExceptionHandler) {
@@ -268,18 +276,19 @@ public class BridgeReactContext extends ReactApplicationContext {
     return null;
   }
 
-  @DeprecatedInNewArchitecture(
-      message =
-          "This method will be deprecated later as part of Stable APIs with bridge removal and not"
-              + " encouraged usage.")
   /**
    * Get the UIManager for Fabric from the CatalystInstance.
    *
    * @return The UIManager when CatalystInstance is active.
+   * @deprecated Do not use this method. Instead use {@link
+   *     com.facebook.react.uimanager.UIManagerHelper} method {@code getUIManager} to get the
+   *     UIManager instance from the current ReactContext.
    */
   @Override
+  @Deprecated
   public @Nullable UIManager getFabricUIManager() {
-    return mCatalystInstance.getFabricUIManager();
+    //noinspection deprecation
+    return Objects.requireNonNull(mCatalystInstance).getFabricUIManager();
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt

@@ -32,6 +32,8 @@ protected constructor(
     // do nothing
   }
 
+  @Deprecated(
+      "The method canOverrideExistingModule is not used in the New Architecture and will be removed in a future release.")
   override fun canOverrideExistingModule(): Boolean = false
 
   override fun invalidate() {