From db6c98eac1bfc2618c0081439ab13d75f754d09f Mon Sep 17 00:00:00 2001 From: David Vacca Date: Tue, 30 Jan 2024 15:46:23 -0800 Subject: [PATCH] Deprecate com/facebook/react/config/ReactFeatureFlags (#42718) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/42718 Deprecate com/facebook/react/config/ReactFeatureFlags, to be replaced by com.facebook.react.internal.featureflags.ReactNativeFeatureFlags changelog: [internal] internal Reviewed By: NickGerleman Differential Revision: D53199655 fbshipit-source-id: 32bdc526e377ff70e2df3c97a259066a25180231 --- .../java/com/facebook/react/config/ReactFeatureFlags.java | 1 + .../react/defaults/DefaultNewArchitectureEntryPoint.kt | 1 + .../main/java/com/facebook/react/uiapp/RNTesterApplication.kt | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index c335549d909..74ce9afe057 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -17,6 +17,7 @@ import com.facebook.react.common.build.ReactBuildConfig; * *

These values are safe defaults and should not require manual changes. */ +@Deprecated(since = "Use com.facebook.react.internal.featureflags.ReactNativeFeatureFlags instead.") @DoNotStripAny public class ReactFeatureFlags { /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt index 2dcea68aec0..72e0bd0f40a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt @@ -25,6 +25,7 @@ import com.facebook.react.config.ReactFeatureFlags object DefaultNewArchitectureEntryPoint { @JvmStatic @JvmOverloads + @Suppress("DEPRECATION") fun load( turboModulesEnabled: Boolean = true, fabricEnabled: Boolean = true, diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt index ee8d1b2d063..e81e1956788 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt @@ -49,6 +49,7 @@ class RNTesterApplication : Application(), ReactApplication { name: String, reactContext: ReactApplicationContext ): NativeModule? { + @Suppress("DEPRECATION") if (!ReactFeatureFlags.useTurboModules) { return null } @@ -66,6 +67,7 @@ class RNTesterApplication : Application(), ReactApplication { // modules. override fun getReactModuleInfoProvider(): ReactModuleInfoProvider = ReactModuleInfoProvider { + @Suppress("DEPRECATION") if (ReactFeatureFlags.useTurboModules) { mapOf( SampleTurboModule.NAME to @@ -77,6 +79,7 @@ class RNTesterApplication : Application(), ReactApplication { false, // isCxxModule true // isTurboModule ), + SampleLegacyModule.NAME to ReactModuleInfo( SampleLegacyModule.NAME, @@ -86,6 +89,7 @@ class RNTesterApplication : Application(), ReactApplication { false, // isCxxModule false // isTurboModule )) + } else { emptyMap() }