From 3e27ef1f6e024bba8725a3bd64e2648ffd6af496 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Fri, 8 Nov 2024 20:40:18 -0800 Subject: [PATCH] Deprecate CatalystInstance in old architecture (#47383) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/47383 CatalystInstance is deprecated and will be removed in new architecture changelog: [Android][Changed] Deprecate CatalystInstance in old architecture Reviewed By: cortinico Differential Revision: D65430643 fbshipit-source-id: 96ba91c45760ead8155f9f28b6fad523be75929e --- .../facebook/react/bridge/CatalystInstance.kt | 19 +++++++++---------- .../runtime/BridgelessCatalystInstance.kt | 4 ++++ .../facebook/react/bridge/ReactTestHelper.kt | 4 ++++ .../modules/network/NetworkingModuleTest.kt | 4 ++++ .../react/modules/timing/TimingModuleTest.kt | 4 ++++ .../react/uimanager/SimpleViewPropertyTest.kt | 4 ++++ .../views/image/ReactImagePropertyTest.kt | 4 ++++ .../textinput/ReactTextInputPropertyTest.kt | 4 ++++ 8 files changed, 37 insertions(+), 10 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.kt index a2325c6b95c..b6c763689a0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.kt @@ -9,7 +9,6 @@ package com.facebook.react.bridge import com.facebook.proguard.annotations.DoNotStrip import com.facebook.react.bridge.queue.ReactQueueConfiguration -import com.facebook.react.common.annotations.DeprecatedInNewArchitecture import com.facebook.react.common.annotations.VisibleForTesting import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder @@ -20,6 +19,9 @@ import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHol * the invocation of JavaScript methods and lets a set of Java APIs be invocable from JavaScript as * well. */ +@Deprecated( + message = + "This class is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.") @DoNotStrip public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundleLoaderDelegate { public fun runJSBundle() @@ -117,21 +119,18 @@ public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundle */ public val nativeMethodCallInvokerHolder: NativeMethodCallInvokerHolder - @DeprecatedInNewArchitecture( + @Deprecated( message = - "This method will be deprecated later as part of Stable APIs with bridge removal and not" + - " encouraged usage.") + "This method is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.") public fun setTurboModuleRegistry(turboModuleRegistry: TurboModuleRegistry) - @DeprecatedInNewArchitecture( + @Deprecated( message = - "This method will be deprecated later as part of Stable APIs with bridge removal and not" + - " encouraged usage.") + "This method is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.") public fun setFabricUIManager(fabricUIManager: UIManager) - @DeprecatedInNewArchitecture( + @Deprecated( message = - "This method will be deprecated later as part of Stable APIs with bridge removal and not" + - " encouraged usage.") + "This method is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.") public fun getFabricUIManager(): UIManager? } 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 99c3296c5e7..07279d4806c 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 @@ -5,6 +5,10 @@ * LICENSE file in the root directory of this source tree. */ +// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") +// annotation +@file:Suppress("DEPRECATION") + package com.facebook.react.runtime import android.content.res.AssetManager diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt index 8de19b6fd58..e82a9d8db9c 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridge/ReactTestHelper.kt @@ -5,6 +5,10 @@ * LICENSE file in the root directory of this source tree. */ +// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") +// annotation +@file:Suppress("DEPRECATION") + package com.facebook.react.bridge import com.facebook.react.bridge.queue.MessageQueueThreadSpec diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt index 683f52ad3f6..cadc66401d0 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.kt @@ -5,6 +5,10 @@ * LICENSE file in the root directory of this source tree. */ +// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") +// annotation +@file:Suppress("DEPRECATION") + package com.facebook.react.modules.network import com.facebook.react.bridge.Arguments diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt index 2d36284234b..7faa5085e22 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/modules/timing/TimingModuleTest.kt @@ -5,6 +5,10 @@ * LICENSE file in the root directory of this source tree. */ +// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") +// annotation +@file:Suppress("DEPRECATION") + package com.facebook.react.modules.timing import android.content.Context diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt index 749e523a846..f6922883f50 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SimpleViewPropertyTest.kt @@ -5,6 +5,10 @@ * LICENSE file in the root directory of this source tree. */ +// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") +// annotation +@file:Suppress("DEPRECATION") + package com.facebook.react.uimanager import android.view.View diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt index faa427a52dd..6704f4755ac 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/image/ReactImagePropertyTest.kt @@ -5,6 +5,10 @@ * LICENSE file in the root directory of this source tree. */ +// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") +// annotation +@file:Suppress("DEPRECATION") + package com.facebook.react.views.image import android.graphics.Color diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt index 109bcd6d91f..91aabb17f3b 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt @@ -5,6 +5,10 @@ * LICENSE file in the root directory of this source tree. */ +// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION") +// annotation +@file:Suppress("DEPRECATION") + package com.facebook.react.views.textinput import android.graphics.Color