From a02052d37f44498db3bf75fb74ac85cba914c539 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Mon, 5 May 2025 23:53:10 -0700 Subject: [PATCH] Mark BridgelessCatalystInstance as LegacyArchitecture and remove DoNotStrip (#51111) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/51111 BridgelessCatalystInstance is unused in bridgeless, any usage will lead to an exception / crash. This diffs marks BridgelessCatalystInstance as LegacyArchitecture and removes DoNotStrip annotation to enable further optimizations changelog: [internal] internal Reviewed By: alanleedev Differential Revision: D74200097 fbshipit-source-id: f99b6fa74c30bdf0e1cd6758e223601b3ce5826c --- .../react/runtime/BridgelessCatalystInstance.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt index 2e77780e62c..da8ec612e67 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt @@ -12,7 +12,6 @@ package com.facebook.react.runtime import android.content.res.AssetManager -import com.facebook.proguard.annotations.DoNotStrip import com.facebook.react.bridge.CatalystInstance import com.facebook.react.bridge.JavaScriptContextHolder import com.facebook.react.bridge.JavaScriptModule @@ -26,14 +25,16 @@ import com.facebook.react.bridge.RuntimeScheduler import com.facebook.react.bridge.UIManager import com.facebook.react.bridge.queue.ReactQueueConfiguration import com.facebook.react.common.annotations.VisibleForTesting +import com.facebook.react.common.annotations.internal.LegacyArchitecture +import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder -@DoNotStrip @Deprecated( message = "This class is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.") +@LegacyArchitecture internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) : CatalystInstance { override fun handleMemoryPressure(level: Int) { @@ -68,7 +69,6 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) throw UnsupportedOperationException("Unimplemented method 'hasRunJSBundle'") } - @DoNotStrip override fun invokeCallback(callbackID: Int, arguments: NativeArrayInterface) { throw UnsupportedOperationException("Unimplemented method 'invokeCallback'") } @@ -172,4 +172,10 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) override fun getFabricUIManager(): UIManager { throw UnsupportedOperationException("Unimplemented method 'getFabricUIManager'") } + + private companion object { + init { + LegacyArchitectureLogger.assertLegacyArchitecture("BridgelessCatalystInstance") + } + } }