react-native-tvos 0.81.3-0 → 0.82.0-0

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<57f2dcf4b71512c6b15e8021258d6036>>
+ * @generated SignedSource<<d34119ad2e9a068463e8a31ecced59d9>>
  */
 
 /**
@@ -33,7 +33,7 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool commonTestFlag(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool animatedShouldSignalBatch(
+  static bool cdpInteractionMetricsEnabled(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool cxxNativeAnimatedEnabled(
@@ -42,12 +42,15 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool cxxNativeAnimatedRemoveJsSync(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool disableMainQueueSyncDispatchIOS(
+  static bool disableFabricCommitInCXXAnimated(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool disableMountItemReorderingAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool disableOldAndroidAttachmentMetricsWorkarounds(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool disableTextLayoutManagerCacheAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -75,6 +78,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableDoubleMeasurementFixAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableEagerMainQueueModulesOnIOS(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool enableEagerRootViewAttachment(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -84,9 +90,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableFabricRenderer(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool enableFixForParentTagDuringReparenting(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool enableFontScaleChangesUpdatingLayout(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -96,6 +99,12 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableIOSViewClipToPaddingBox(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableImagePrefetchingAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
+  static bool enableImmediateUpdateModeForContentOffsetChanges(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool enableInteropViewManagerClassLookUpOptimizationIOS(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -108,9 +117,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableMainQueueCoordinatorOnIOS(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool enableMainQueueModulesOnIOS(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool enableModuleArgumentNSNullConversionIOS(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -132,15 +138,15 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableResourceTimingAPI(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool enableSynchronousStateUpdates(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool enableViewCulling(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool enableViewRecycling(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableViewRecyclingForScrollView(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool enableViewRecyclingForText(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -156,6 +162,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool enableVirtualViewWindowFocusDetection(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool enableWebPerformanceAPIsByDefault(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool fixMappingOfEventPrioritiesBetweenFabricAndReact(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -168,12 +177,27 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool hideOffscreenVirtualViewsOnIOS(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool perfMonitorV2Enabled(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static double preparedTextCacheSize(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
   static bool preventShadowTreeCommitExhaustion(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool releaseImageDataWhenConsumed(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
+  static bool shouldPressibilityUseW3CPointerEventsForHover(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
+  static bool skipActivityIdentityAssertionOnHostPause(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
+  static bool sweepActiveTouchOnChildNativeGesturesAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool traceTurboModulePromiseRejectionsOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -210,6 +234,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool useTurboModules(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static double virtualViewHysteresisRatio(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static double virtualViewPrerenderRatio(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 

package/ReactAndroid/src/main/jni/react/featureflags/OnLoad.cpp

@@ -9,7 +9,7 @@
 
 #include "JReactNativeFeatureFlagsCxxInterop.h"
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
   return facebook::jni::initialize(vm, [] {
     facebook::react::JReactNativeFeatureFlagsCxxInterop::registerNatives();
   });

package/ReactAndroid/src/main/jni/react/hermes/instrumentation/CMakeLists.txt

@@ -23,7 +23,7 @@ target_include_directories(jsijniprofiler PRIVATE .)
 
 target_link_libraries(
       jsijniprofiler
-      hermes-engine::libhermes
+      hermes-engine::hermesvm
       jsi
       reactnative
 )

package/ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesSamplingProfiler.cpp

@@ -11,21 +11,21 @@
 
 namespace facebook::jsi::jni {
 
-void HermesSamplingProfiler::enable(jni::alias_ref<jclass>) {
+void HermesSamplingProfiler::enable(jni::alias_ref<jclass> /*unused*/) {
   auto* hermesAPI =
       castInterface<hermes::IHermesRootAPI>(hermes::makeHermesRootAPI());
   hermesAPI->enableSamplingProfiler();
 }
 
-void HermesSamplingProfiler::disable(jni::alias_ref<jclass>) {
+void HermesSamplingProfiler::disable(jni::alias_ref<jclass> /*unused*/) {
   auto* hermesAPI =
       castInterface<hermes::IHermesRootAPI>(hermes::makeHermesRootAPI());
   hermesAPI->disableSamplingProfiler();
 }
 
 void HermesSamplingProfiler::dumpSampledTraceToFile(
-    jni::alias_ref<jclass>,
-    std::string filename) {
+    jni::alias_ref<jclass> /*unused*/,
+    const std::string& filename) {
   auto* hermesAPI =
       castInterface<hermes::IHermesRootAPI>(hermes::makeHermesRootAPI());
   hermesAPI->dumpSampledTraceToFile(filename);

package/ReactAndroid/src/main/jni/react/hermes/instrumentation/HermesSamplingProfiler.h

@@ -23,7 +23,7 @@ class HermesSamplingProfiler : public jni::JavaClass<HermesSamplingProfiler> {
   static void disable(jni::alias_ref<jclass>);
   static void dumpSampledTraceToFile(
       jni::alias_ref<jclass>,
-      std::string filename);
+      const std::string& filename);
 
   static void registerNatives();
 

package/ReactAndroid/src/main/jni/react/hermes/instrumentation/OnLoad.cpp

@@ -7,7 +7,7 @@
 
 #include "HermesSamplingProfiler.h"
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
   return facebook::jni::initialize(vm, [] {
     facebook::jsi::jni::HermesSamplingProfiler::registerNatives();
   });

package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt

@@ -20,11 +20,15 @@ target_include_directories(hermes_executor PRIVATE .)
 target_link_libraries(
         hermes_executor
         hermes_executor_common
-        hermes-engine::libhermes
+        hermes-engine::hermesvm
         jsi
         reactnative
 )
 target_compile_reactnative_options(hermes_executor PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(hermes_executor PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
+
+  if (HERMES_V1_ENABLED)
+        target_compile_options(hermes_executor PRIVATE -DHERMES_V1_ENABLED=1)
+  endif()
 endif()

package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp

@@ -44,7 +44,8 @@ static void installBindings(jsi::Runtime& runtime) {
   react::bindNativeLogger(runtime, &reactAndroidLoggingHook);
 }
 
-class HermesExecutorHolder
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] HermesExecutorHolder
     : public jni::HybridClass<HermesExecutorHolder, JavaScriptExecutorHolder> {
  public:
   static constexpr auto kJavaDescriptor =
@@ -110,6 +111,10 @@ class HermesExecutorHolder
 } // namespace facebook::react
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
-  return facebook::jni::initialize(
-      vm, [] { facebook::react::HermesExecutorHolder::registerNatives(); });
+  return facebook::jni::initialize(vm, [] {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    facebook::react::HermesExecutorHolder::registerNatives();
+#pragma clang diagnostic pop
+  });
 }

package/ReactAndroid/src/main/jni/react/hermes/tooling/CMakeLists.txt

@@ -28,7 +28,7 @@ target_link_libraries(hermestooling
         PUBLIC
         reactnative
         jsi
-        hermes-engine::libhermes
+        hermes-engine::hermesvm
 )
 target_include_directories(hermestooling
         PUBLIC

package/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt

@@ -38,7 +38,7 @@ add_library(
 target_merge_so(reactnativejni_common)
 target_include_directories(reactnativejni_common PUBLIC ../../)
 
-target_link_libraries(reactnativejni_common fbjni folly_runtime react_cxxreact yoga react_renderer_graphics)
+target_link_libraries(reactnativejni_common fbjni folly_runtime react_cxxreact rrc_view)
 target_compile_reactnative_options(reactnativejni_common PRIVATE)
 target_compile_options(reactnativejni_common PRIVATE -Wno-unused-lambda-capture)
 
@@ -54,7 +54,6 @@ add_library(
           CatalystInstanceImpl.cpp
           InspectorNetworkRequestListener.cpp
           JExecutor.cpp
-          JInspector.cpp
           JMessageQueueThread.cpp
           JReactCxxErrorHandler.cpp
           JReactSoftExceptionLogger.cpp

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -10,6 +10,7 @@
 
 #include <fstream>
 #include <memory>
+#include <utility>
 
 #include <ReactCommon/CallInvokerHolder.h>
 #include <cxxreact/CxxNativeModule.h>
@@ -44,7 +45,9 @@ namespace facebook::react {
 
 namespace {
 
-class InstanceCallbackImpl : public InstanceCallback {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] InstanceCallbackImpl
+    : public InstanceCallback {
  public:
   explicit InstanceCallbackImpl(alias_ref<JInstanceCallback::javaobject> jobj)
       : jobj_(make_global(jobj)) {}
@@ -83,7 +86,7 @@ class InstanceCallbackImpl : public InstanceCallback {
 } // namespace
 
 jni::local_ref<CatalystInstanceImpl::jhybriddata>
-CatalystInstanceImpl::initHybrid(jni::alias_ref<jclass>) {
+CatalystInstanceImpl::initHybrid(jni::alias_ref<jclass> /*unused*/) {
   return makeCxxInstance();
 }
 
@@ -358,14 +361,14 @@ CatalystInstanceImpl::getNativeMethodCallInvokerHolder() {
      public:
       NativeMethodCallInvokerImpl(
           std::shared_ptr<JMessageQueueThread> messageQueueThread)
-          : messageQueueThread_(messageQueueThread) {}
+          : messageQueueThread_(std::move(messageQueueThread)) {}
       void invokeAsync(
-          const std::string& methodName,
+          const std::string& /*methodName*/,
           std::function<void()>&& work) noexcept override {
         messageQueueThread_->runOnQueue(std::move(work));
       }
       void invokeSync(
-          const std::string& methodName,
+          const std::string& /*methodName*/,
           std::function<void()>&& work) override {
         messageQueueThread_->runOnQueueSync(std::move(work));
       }

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h

@@ -29,12 +29,16 @@ class Instance;
 class JavaScriptExecutorHolder;
 class NativeArray;
 
-struct JInstanceCallback : public jni::JavaClass<JInstanceCallback> {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JInstanceCallback
+    : public jni::JavaClass<JInstanceCallback> {
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/bridge/CatalystInstanceImpl$InstanceCallback;";
 };
 
-class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] CatalystInstanceImpl
+    : public jni::HybridClass<CatalystInstanceImpl> {
  public:
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/bridge/CatalystInstanceImpl;";
@@ -57,7 +61,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
       // This executor is actually a factory holder.
       JavaScriptExecutorHolder* jseh,
       jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue,
-      jni::alias_ref<JavaMessageQueueThread::javaobject> moduleQueue,
+      jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
       jni::alias_ref<
           jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
           javaModules,

package/ReactAndroid/src/main/jni/react/jni/JDynamicNative.cpp

@@ -14,7 +14,7 @@ using namespace facebook::jni;
 namespace facebook::react {
 
 jboolean JDynamicNative::isNullNative() {
-  return payload_.isNull();
+  return static_cast<jboolean>(payload_.isNull());
 }
 
 jni::local_ref<ReadableType> JDynamicNative::getTypeNative() {
@@ -26,7 +26,7 @@ jni::local_ref<jstring> JDynamicNative::asString() {
 }
 
 jboolean JDynamicNative::asBoolean() {
-  return payload_.asBool();
+  return static_cast<jboolean>(payload_.asBool());
 }
 
 jdouble JDynamicNative::asDouble() {

package/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp

@@ -68,7 +68,7 @@ void JMessageQueueThread::runOnQueueSync(std::function<void()>&& runnable) {
       JavaMessageQueueThread::javaClassStatic()->getMethod<jboolean()>(
           "isOnThread");
 
-  if (jIsOnThread(m_jobj)) {
+  if (jIsOnThread(m_jobj) != 0u) {
     wrapRunnable(std::move(runnable))();
   } else {
     std::mutex signalMutex;

package/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.cpp

@@ -7,6 +7,8 @@
 
 #include "JReactCxxErrorHandler.h"
 
+#include <utility>
+
 using namespace facebook::react;
 
 void JReactCxxErrorHandler::handleError(std::string message) {
@@ -14,5 +16,5 @@ void JReactCxxErrorHandler::handleError(std::string message) {
       javaClassStatic()->getStaticMethod<void(std::string message)>(
           "handleError");
 
-  return handleError(javaClassStatic(), message);
+  return handleError(javaClassStatic(), std::move(message));
 }

package/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp

@@ -117,7 +117,7 @@ void JReactMarker::logPerfMarkerWithInstanceKey(
 
 void JReactMarker::nativeLogMarker(
     jni::alias_ref<jclass> /* unused */,
-    std::string markerNameStr,
+    const std::string& markerNameStr,
     jlong markerTime) {
   // TODO: refactor this to a bidirectional map along with
   // logPerfMarkerWithInstanceKey

package/ReactAndroid/src/main/jni/react/jni/JReactMarker.h

@@ -40,7 +40,7 @@ class JReactMarker : public facebook::jni::JavaClass<JReactMarker> {
       const int instanceKey);
   static void nativeLogMarker(
       jni::alias_ref<jclass> /* unused */,
-      std::string markerNameStr,
+      const std::string& markerNameStr,
       jlong markerTime);
 };
 

package/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.cpp

@@ -7,6 +7,8 @@
 
 #include "JReactSoftExceptionLogger.h"
 
+#include <utility>
+
 using namespace facebook::react;
 
 void JReactSoftExceptionLogger::logNoThrowSoftExceptionWithMessage(
@@ -17,5 +19,6 @@ void JReactSoftExceptionLogger::logNoThrowSoftExceptionWithMessage(
           ->getStaticMethod<void(std::string tag, std::string message)>(
               "logNoThrowSoftExceptionWithMessage");
 
-  return logNoThrowSoftExceptionWithMessage(javaClassStatic(), tag, message);
+  return logNoThrowSoftExceptionWithMessage(
+      javaClassStatic(), std::move(tag), std::move(message));
 }

package/ReactAndroid/src/main/jni/react/jni/JRuntimeExecutor.cpp

@@ -7,10 +7,12 @@
 
 #include "JRuntimeExecutor.h"
 
+#include <utility>
+
 namespace facebook::react {
 
 JRuntimeExecutor::JRuntimeExecutor(RuntimeExecutor runtimeExecutor)
-    : runtimeExecutor_(runtimeExecutor) {}
+    : runtimeExecutor_(std::move(runtimeExecutor)) {}
 
 RuntimeExecutor JRuntimeExecutor::get() {
   return runtimeExecutor_;

package/ReactAndroid/src/main/jni/react/jni/JRuntimeScheduler.cpp

@@ -7,11 +7,13 @@
 
 #include "JRuntimeScheduler.h"
 
+#include <utility>
+
 namespace facebook::react {
 
 JRuntimeScheduler::JRuntimeScheduler(
     std::weak_ptr<RuntimeScheduler> runtimeScheduler)
-    : runtimeScheduler_(runtimeScheduler) {}
+    : runtimeScheduler_(std::move(runtimeScheduler)) {}
 
 std::weak_ptr<RuntimeScheduler> JRuntimeScheduler::get() {
   return runtimeScheduler_;

package/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp

@@ -21,7 +21,7 @@ class AssetManagerString : public JSBigString {
  public:
   AssetManagerString(AAsset* asset) : asset_(asset){};
 
-  virtual ~AssetManagerString() {
+  ~AssetManagerString() override {
     AAsset_close(asset_);
   }
 
@@ -52,19 +52,19 @@ __attribute__((visibility("default"))) std::unique_ptr<const JSBigString>
 loadScriptFromAssets(AAssetManager* manager, const std::string& assetName) {
   TraceSection s(
       "reactbridge_jni_loadScriptFromAssets", "assetName", assetName);
-  if (manager) {
+  if (manager != nullptr) {
     auto asset = AAssetManager_open(
         manager,
         assetName.c_str(),
         AASSET_MODE_STREAMING); // Optimized for sequential read: see
                                 // AssetManager.java for docs
-    if (asset) {
+    if (asset != nullptr) {
       auto script = std::make_unique<AssetManagerString>(asset);
       if (script->size() >= sizeof(BundleHeader)) {
         // When using bytecode, it's safe for the underlying buffer to not be \0
         // terminated. In all other scenarios, we will force a copy of the
         // script to ensure we have a terminator.
-        const BundleHeader* header =
+        const auto* header =
             reinterpret_cast<const BundleHeader*>(script->c_str());
         if (isHermesBytecodeBundle(*header)) {
           return script;

package/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp

@@ -25,8 +25,6 @@
 
 #ifndef RCT_FIT_RM_OLD_RUNTIME
 
-using facebook::xplat::module::CxxModule;
-
 namespace facebook::react {
 
 std::string JMethodDescriptor::getSignature() const {
@@ -126,7 +124,7 @@ void JavaNativeModule::invoke(
         invokeMethod(
             wrapper_,
             static_cast<jint>(reactMethodId),
-            ReadableNativeArray::newObjectCxxArgs(std::move(params)).get());
+            ReadableNativeArray::newObjectCxxArgs(params).get());
       });
 }
 

package/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h

@@ -20,7 +20,9 @@ namespace facebook::react {
 class Instance;
 class MessageQueueThread;
 
-struct JMethodDescriptor : public jni::JavaClass<JMethodDescriptor> {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JMethodDescriptor
+    : public jni::JavaClass<JMethodDescriptor> {
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/bridge/JavaModuleWrapper$MethodDescriptor;";
 
@@ -30,7 +32,9 @@ struct JMethodDescriptor : public jni::JavaClass<JMethodDescriptor> {
   std::string getType() const;
 };
 
-struct JavaModuleWrapper : jni::JavaClass<JavaModuleWrapper> {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JavaModuleWrapper
+    : jni::JavaClass<JavaModuleWrapper> {
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/bridge/JavaModuleWrapper;";
 
@@ -59,7 +63,9 @@ struct JavaModuleWrapper : jni::JavaClass<JavaModuleWrapper> {
   }
 };
 
-class JavaNativeModule : public NativeModule {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JavaNativeModule
+    : public NativeModule {
  public:
   JavaNativeModule(
       std::weak_ptr<Instance> instance,

package/ReactAndroid/src/main/jni/react/jni/JavaScriptExecutorHolder.h

@@ -14,7 +14,8 @@
 
 namespace facebook::react {
 
-class JavaScriptExecutorHolder
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JavaScriptExecutorHolder
     : public jni::HybridClass<JavaScriptExecutorHolder> {
  public:
   static constexpr auto kJavaDescriptor =

package/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp

@@ -52,18 +52,19 @@ std::unique_ptr<JniJSModulesUnbundle> JniJSModulesUnbundle::fromEntryFile(
 
 JniJSModulesUnbundle::JniJSModulesUnbundle(
     AAssetManager* assetManager,
-    const std::string& moduleDirectory)
-    : m_assetManager(assetManager), m_moduleDirectory(moduleDirectory) {}
+    std::string moduleDirectory)
+    : m_assetManager(assetManager),
+      m_moduleDirectory(std::move(moduleDirectory)) {}
 
 bool JniJSModulesUnbundle::isUnbundle(
     AAssetManager* assetManager,
     const std::string& assetName) {
-  if (!assetManager) {
+  if (assetManager == nullptr) {
     return false;
   }
 
   auto magicFileName = jsModulesDir(assetName) + MAGIC_FILE_NAME;
-  auto asset = openAsset(assetManager, magicFileName.c_str());
+  auto asset = openAsset(assetManager, magicFileName);
   if (asset == nullptr) {
     return false;
   }
@@ -92,7 +93,9 @@ JSModulesUnbundle::Module JniJSModulesUnbundle::getModule(
   if (buffer == nullptr) {
     throw ModuleNotFound(moduleId);
   }
-  return {sourceUrl, std::string(buffer, AAsset_getLength(asset.get()))};
+  return {
+      .name = sourceUrl,
+      .code = std::string(buffer, AAsset_getLength(asset.get()))};
 }
 
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h

@@ -16,7 +16,9 @@
 
 namespace facebook::react {
 
-class JniJSModulesUnbundle : public JSModulesUnbundle {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JniJSModulesUnbundle
+    : public JSModulesUnbundle {
   /**
    * This implementation reads modules as single file from the assets of an apk.
    */
@@ -24,7 +26,7 @@ class JniJSModulesUnbundle : public JSModulesUnbundle {
   JniJSModulesUnbundle() = default;
   JniJSModulesUnbundle(
       AAssetManager* assetManager,
-      const std::string& moduleDirectory);
+      std::string moduleDirectory);
   JniJSModulesUnbundle(JniJSModulesUnbundle&& other) = delete;
   JniJSModulesUnbundle& operator=(JSModulesUnbundle&& other) = delete;
 

package/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp

@@ -14,6 +14,8 @@
 #include <cxxreact/TraceSection.h>
 #include <fbjni/fbjni.h>
 
+#include <utility>
+
 #include "JCallback.h"
 #include "ReadableNativeArray.h"
 #include "ReadableNativeMap.h"
@@ -76,9 +78,12 @@ local_ref<JCxxCallbackImpl::jhybridobject> extractCallback(
     std::weak_ptr<Instance>& instance,
     const folly::dynamic& value) {
   if (value.isNull()) {
-    return local_ref<JCxxCallbackImpl::jhybridobject>(nullptr);
+    return {nullptr};
   } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     return JCxxCallbackImpl::newObjectCxxArgs(makeCallback(instance, value));
+#pragma clang diagnostic pop
   }
 }
 
@@ -195,7 +200,7 @@ MethodInvoker::MethodInvoker(
     std::string traceName,
     bool isSync)
     : method_(method->getMethodID()),
-      methodName_(methodName),
+      methodName_(std::move(methodName)),
       signature_(signature),
       jsArgCount_(countJsArgs(signature) - 2),
       traceName_(std::move(traceName)),