From 7e4ec7d8d3325802df18d6efa38d06a8acf05ba7 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 24 Apr 2025 22:06:30 -0700 Subject: [PATCH] Mark NativeModule interop classes with InteropLegacyArchitecture (#50926) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/50926 Mark NativeModule interop classes with InteropLegacyArchitecture changelog: [internal] internal Reviewed By: shwanton Differential Revision: D73407611 fbshipit-source-id: 57de0ec81209ec0947520278f3adbc9c0bb58369 --- .../main/java/com/facebook/react/bridge/CxxModuleWrapper.kt | 4 ++-- .../java/com/facebook/react/bridge/CxxModuleWrapperBase.kt | 4 ++-- .../main/java/com/facebook/react/bridge/JavaModuleWrapper.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapper.kt index 4d09430901a..e3e65a7bf10 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapper.kt @@ -9,12 +9,12 @@ package com.facebook.react.bridge import com.facebook.jni.HybridData import com.facebook.proguard.annotations.DoNotStrip -import com.facebook.react.common.annotations.internal.LegacyArchitecture +import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger /** This does nothing interesting, except avoid breaking existing code. */ @DoNotStrip -@LegacyArchitecture +@InteropLegacyArchitecture public open class CxxModuleWrapper protected constructor(hybridData: HybridData) : CxxModuleWrapperBase(hybridData) { private companion object { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt index 9b120996fd7..944d56892ad 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CxxModuleWrapperBase.kt @@ -9,7 +9,7 @@ package com.facebook.react.bridge import com.facebook.jni.HybridData import com.facebook.proguard.annotations.DoNotStrip -import com.facebook.react.common.annotations.internal.LegacyArchitecture +import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @@ -20,7 +20,7 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger * the underlying Cxx module will be extracted by the bridge and called directly. */ @DoNotStrip -@LegacyArchitecture +@InteropLegacyArchitecture public open class CxxModuleWrapperBase protected constructor( // For creating a wrapper from C++, or from a derived class. diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt index 922dbfefc8e..40b0b9cbb96 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt @@ -8,7 +8,7 @@ package com.facebook.react.bridge import com.facebook.proguard.annotations.DoNotStrip -import com.facebook.react.common.annotations.internal.LegacyArchitecture +import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger.assertLegacyArchitecture import com.facebook.react.turbomodule.core.interfaces.TurboModule @@ -23,7 +23,7 @@ import java.lang.reflect.Method * read and means fewer JNI calls. */ @DoNotStrip -@LegacyArchitecture +@InteropLegacyArchitecture internal class JavaModuleWrapper( private val jsInstance: JSInstance, private val moduleHolder: ModuleHolder