diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java index e26e507fc8c..429ca74d915 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java @@ -66,7 +66,7 @@ import java.util.Map; class CoreModulesPackage extends BaseReactPackage implements ReactPackageLogger { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "CoreModulesPackage", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java index 2ef33b3f3dd..e56f2092ab1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/LazyReactPackage.java @@ -36,7 +36,7 @@ import java.util.Map; public abstract class LazyReactPackage implements ReactPackage { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "LazyReactPackage", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt index d8fc16f53c2..628c2f40f88 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt @@ -65,7 +65,7 @@ by autolinking. Try removing the existing entry and rebuild. private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "NativeModuleRegistryBuilder", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 0e91c7cdaa3..5c1d66da87f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -150,7 +150,7 @@ import java.util.Set; public class ReactInstanceManager { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "ReactInstanceManager", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java index 634ab324a88..d3b3bb26fc2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java @@ -51,7 +51,7 @@ import java.util.Map; public class ReactInstanceManagerBuilder { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "ReactInstanceManagerBuilder", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java index 3935ecee5dc..84759450286 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java @@ -41,7 +41,7 @@ import java.util.List; public abstract class ReactNativeHost { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "ReactNativeHost", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.java index 599dcd78579..77236153e5c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.java @@ -39,7 +39,7 @@ import java.util.Collection; @LegacyArchitecture public class BridgeReactContext extends ReactApplicationContext { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "BridgeReactContext", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeSoLoader.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeSoLoader.kt index 07d99609a71..390cc7de67d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeSoLoader.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeSoLoader.kt @@ -16,7 +16,7 @@ import com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE @LegacyArchitecture internal object BridgeSoLoader { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("BridgeSoLoader") + LegacyArchitectureLogger.assertLegacyArchitecture("BridgeSoLoader") } @JvmStatic diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.kt index 74a6e411cb1..3f8d1ffc600 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CallbackImpl.kt @@ -28,7 +28,7 @@ internal class CallbackImpl(private val jsInstance: JSInstance, private val call private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "CallbackImpl", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index 0bd756ea9ca..4e1caa6f7d3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class CatalystInstanceImpl implements CatalystInstance { static { BridgeSoLoader.staticInit(); - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "CatalystInstanceImpl", LegacyArchitectureLogLevel.WARNING); } 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 e1d60c624bf..4d09430901a 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 @@ -19,7 +19,7 @@ public open class CxxModuleWrapper protected constructor(hybridData: HybridData) CxxModuleWrapperBase(hybridData) { private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("CxxModuleWrapper") + LegacyArchitectureLogger.assertLegacyArchitecture("CxxModuleWrapper") } } } 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 fe2849b0702..9b120996fd7 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 @@ -49,7 +49,7 @@ protected constructor( private companion object { init { BridgeSoLoader.staticInit() - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "CxxModuleWrapperBase", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.kt index b79daa74e64..5a44e2b5251 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/InvalidIteratorException.kt @@ -21,8 +21,7 @@ internal class InvalidIteratorException @DoNotStrip constructor(msg: String) : RuntimeException(msg) { private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( - "InvalidIteratorException") + LegacyArchitectureLogger.assertLegacyArchitecture("InvalidIteratorException") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSONArguments.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSONArguments.java index 1d617ed647b..1d3538b9944 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSONArguments.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JSONArguments.java @@ -18,7 +18,7 @@ import org.json.JSONObject; @LegacyArchitecture public class JSONArguments { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "JSONArguments", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java index 0d441ad15f7..a35ee9fd2ed 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; @LegacyArchitecture class JavaMethodWrapper implements JavaModuleWrapper.NativeMethod { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "JavaMethodWrapper", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java index 880d9f54bb2..80620bb3066 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java @@ -35,7 +35,7 @@ import java.util.Map; @LegacyArchitecture class JavaModuleWrapper { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "JavaModuleWrapper", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.kt index f234bc1da0f..ec4968f1da0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeArgumentsParseException.kt @@ -20,8 +20,7 @@ internal class NativeArgumentsParseException : JSApplicationCausedNativeExceptio private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( - "NativeArgumentsParseException") + LegacyArchitectureLogger.assertLegacyArchitecture("NativeArgumentsParseException") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java index 144757d070f..0eabba2943a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java @@ -115,7 +115,7 @@ public class NativeModuleRegistry { // short-circuit // the search, and simply call OnBatchComplete on the UI Manager. // With Fabric, UIManager would no longer be a NativeModule, so this call would simply go away - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "NativeModuleRegistry.onBatchComplete()", LegacyArchitectureLogLevel.ERROR); ModuleHolder moduleHolder = mModules.get("UIManager"); if (moduleHolder != null && moduleHolder.hasInstance()) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt index a265c2145bf..7ae58bd3b9a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt @@ -18,7 +18,7 @@ import java.lang.reflect.Method @LegacyArchitecture public object ReactCxxErrorHandler { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "ReactCxxErrorHandler", LegacyArchitectureLogLevel.WARNING) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.java index 329412bb6ab..b93e36ad3cb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.java @@ -68,7 +68,7 @@ public class ReactInstanceManagerInspectorTarget implements AutoCloseable { } static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "ReactInstanceManagerInspectorTarget", LegacyArchitectureLogLevel.WARNING); BridgeSoLoader.staticInit(); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactNoCrashBridgeNotAllowedSoftException.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactNoCrashBridgeNotAllowedSoftException.kt index 2626c071847..af2d1c5a698 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactNoCrashBridgeNotAllowedSoftException.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactNoCrashBridgeNotAllowedSoftException.kt @@ -21,8 +21,7 @@ public class ReactNoCrashBridgeNotAllowedSoftException : ReactNoCrashSoftExcepti private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( - "ReactNoCrashBridgeNotAllowedSoftException") + LegacyArchitectureLogger.assertLegacyArchitecture("ReactNoCrashBridgeNotAllowedSoftException") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt index ba2ff604d2d..32e8f8d08f6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.kt @@ -53,7 +53,7 @@ internal class InteropModuleRegistry { private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("InteropModuleRegistry") + LegacyArchitectureLogger.assertLegacyArchitecture("InteropModuleRegistry") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogger.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogger.kt index 8da55d52eb7..508f563966c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogger.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/annotations/internal/LegacyArchitectureLogger.kt @@ -42,28 +42,54 @@ public object LegacyArchitectureLogger { } /** - * Asserts and logs when legacy architecture components are being used in new architecture. This + * Asserts and logs when legacy architecture classes are being used in New Architecture. This * method will throw an exception if the app is running on the new architecture and the logLevel - * received by parameter is [LegacyArchitectureLogLevel.ERROR]. + * received by parameter is [LegacyArchitectureLogLevel.ERROR]. Otherwise it will show a warning + * on logcat. * - * @param name The name of the legacy component being used + * @param name The name of the legacy class being used * @param logLevel The severity level of the log (ERROR or WARNING, defaults to WARNING) */ @JvmStatic - public fun assertWhenLegacyArchitectureMinifyingEnabled( + public fun assertLegacyArchitecture( name: String, logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING ) { if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE || OSS_LEGACY_WARNINGS_ENABLED) { - when (logLevel) { - LegacyArchitectureLogLevel.ERROR -> { - throw AssertionException("$name $exceptionMessage") - } - LegacyArchitectureLogLevel.WARNING -> { - ReactSoftExceptionLogger.logSoftException( - tag, ReactNoCrashSoftException("$name $exceptionMessage")) - } + executeAssert(name, logLevel) + } + } + + /** + * Similar to [assertLegacyArchitecture] but executes only when + * [UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE] is set to true. This applies only to internal + * builds. + * + * @param name The name of the legacy class being used + * @param logLevel The severity level of the log (ERROR or WARNING, defaults to WARNING) + */ + @JvmStatic + public fun assertLegacyArchitectureOnlyWhenMinifyEnabled( + name: String, + logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING + ) { + if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) { + executeAssert(name, logLevel) + } + } + + private fun executeAssert( + name: String, + logLevel: LegacyArchitectureLogLevel = LegacyArchitectureLogLevel.WARNING + ) { + when (logLevel) { + LegacyArchitectureLogLevel.ERROR -> { + throw AssertionException("$name $exceptionMessage") + } + LegacyArchitectureLogLevel.WARNING -> { + ReactSoftExceptionLogger.logSoftException( + tag, ReactNoCrashSoftException("$name $exceptionMessage")) } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java index 142ca7455a5..fadd6a3e4dd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java @@ -54,7 +54,7 @@ import java.util.Map; public final class BridgeDevSupportManager extends DevSupportManagerBase { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "BridgeDevSupportManager", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt index 2b048229f16..c085cae3ef8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEvent.kt @@ -31,7 +31,7 @@ public class InteropEvent( private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("InteropEvent") + LegacyArchitectureLogger.assertLegacyArchitecture("InteropEvent") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt index 0b24c18103e..c2c7f3670e9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/interop/InteropEventEmitter.kt @@ -60,7 +60,7 @@ public class InteropEventEmitter(private val reactContext: ReactContext) : RCTEv private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("InteropEventEmitter") + LegacyArchitectureLogger.assertLegacyArchitecture("InteropEventEmitter") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutor.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutor.kt index 47c5683f3b8..2ce29108d4c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutor.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutor.kt @@ -27,7 +27,7 @@ public class JSCExecutor internal constructor(jscConfig: ReadableNativeMap) : private companion object { init { loadLibrary() - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("JSCExecutor") + LegacyArchitectureLogger.assertLegacyArchitecture("JSCExecutor") } @JvmStatic diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.kt index a3688c23660..2ca9e8c3e8b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/JSCExecutorFactory.kt @@ -18,7 +18,7 @@ public class JSCExecutorFactory(private val appName: String, private val deviceN JavaScriptExecutorFactory { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("JSCExecutorFactory") + LegacyArchitectureLogger.assertLegacyArchitecture("JSCExecutorFactory") } @Throws(Exception::class) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt index 5724be40ce6..a55fa781263 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutDirectionUtil.kt @@ -15,7 +15,7 @@ import com.facebook.yoga.YogaDirection @LegacyArchitecture internal object LayoutDirectionUtil { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("LayoutDirectionUtil") + LegacyArchitectureLogger.assertLegacyArchitecture("LayoutDirectionUtil") } @JvmStatic diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java index fc5a2889bda..24d65aa2392 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java @@ -40,7 +40,7 @@ import com.facebook.yoga.YogaWrap; @LegacyArchitecture public class LayoutShadowNode extends ReactShadowNodeImpl { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "LayoutShadowNode", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java index 660b4b9a918..4a9e797c747 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java @@ -71,7 +71,7 @@ import javax.annotation.concurrent.NotThreadSafe; public class NativeViewHierarchyManager { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "NativeViewHierarchyManager", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java index 55e8ecb9bf4..033cc9ba094 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyOptimizer.java @@ -52,7 +52,7 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger; public class NativeViewHierarchyOptimizer { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "NativeViewHierarchyOptimizer", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt index baa3ac7f42e..6ba6893bf8b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/NoSuchNativeViewException.kt @@ -20,8 +20,7 @@ internal class NoSuchNativeViewException(detailMessage: String) : private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( - "NoSuchNativeViewException") + LegacyArchitectureLogger.assertLegacyArchitecture("NoSuchNativeViewException") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt index 45745037136..1a789d0e153 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/OnLayoutEvent.kt @@ -59,7 +59,7 @@ public class OnLayoutEvent private constructor() : Event() { public companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "OnLayoutEvent", LegacyArchitectureLogLevel.WARNING) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java index 7f8bf892d72..329ab0b92f5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java @@ -67,7 +67,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode } static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "ReactShadowNodeImpl", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt index 348e38af406..68880523db7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactYogaConfigProvider.kt @@ -16,7 +16,7 @@ import com.facebook.yoga.YogaErrata @LegacyArchitecture internal object ReactYogaConfigProvider { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("ReactYogaConfigProvider") + LegacyArchitectureLogger.assertLegacyArchitecture("ReactYogaConfigProvider") } val yogaConfig: YogaConfig by diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.kt index 3bb62722925..28e1eafada1 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ShadowNodeRegistry.kt @@ -84,7 +84,7 @@ internal class ShadowNodeRegistry { private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "ShadowNodeRegistry", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java index 68bb4a475f3..08a7f7a4e56 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java @@ -44,7 +44,7 @@ import java.util.Map; @LegacyArchitecture public class UIImplementation { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "UIImplementation", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java index 156ce4b9cdb..d770af49e8c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java @@ -78,7 +78,7 @@ public class UIManagerHelper { // - BridgeReactContext is compiled-out when UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE == true // // To detect a potential regression we add the following assertion ERROR - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "UIManagerHelper.getUIManager(context, uiManagerType)", LegacyArchitectureLogLevel.ERROR); if (!context.hasCatalystInstance()) { ReactSoftExceptionLogger.logSoftException( diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java index f267ae09b73..22ffaf4d2b5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java @@ -89,7 +89,7 @@ import java.util.concurrent.CopyOnWriteArrayList; public class UIManagerModule extends ReactContextBaseJavaModule implements OnBatchCompleteListener, LifecycleEventListener, UIManager { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "UIManagerModule", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java index 221ffc4d6fe..a2b4f86caf4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java @@ -52,7 +52,7 @@ import java.util.Map; public class UIViewOperationQueue { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "UIViewOperationQueue", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.kt index 3b9ebd73a8c..413bcaa8454 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewAtIndex.kt @@ -39,7 +39,7 @@ internal class ViewAtIndex( var COMPARATOR: Comparator = Comparator { lhs, rhs -> lhs.mIndex - rhs.mIndex } init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "ViewAtIndex", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt index a8fd91bbca9..c20ac5a3e64 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/YogaNodePool.kt @@ -16,7 +16,7 @@ import com.facebook.yoga.YogaNode @LegacyArchitecture internal object YogaNodePool { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled("YogaNodePool") + LegacyArchitectureLogger.assertLegacyArchitecture("YogaNodePool") } private val pool: ClearableSynchronizedPool by diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt index dc7083b06e0..1ffdaa24b0f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/AbstractLayoutAnimation.kt @@ -99,7 +99,7 @@ internal abstract class AbstractLayoutAnimation { companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "AbstractLayoutAnimation", LegacyArchitectureLogLevel.WARNING) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt index 2093712d1e7..a1d682384ab 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/BaseLayoutAnimation.kt @@ -78,7 +78,7 @@ internal abstract class BaseLayoutAnimation : AbstractLayoutAnimation() { private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "BaseLayoutAnimation", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java index be0b35efd2a..8869d825eb8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java @@ -31,7 +31,7 @@ import javax.annotation.concurrent.NotThreadSafe; public class LayoutAnimationController { static { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "LayoutAnimationController", LegacyArchitectureLogLevel.WARNING); } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt index 44f36699ab4..14f438823f6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationType.kt @@ -22,7 +22,7 @@ internal enum class LayoutAnimationType { companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "LayoutAnimationType", LegacyArchitectureLogLevel.WARNING) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt index da7636fd750..bcce99715b4 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutCreateAnimation.kt @@ -22,7 +22,7 @@ internal class LayoutCreateAnimation : BaseLayoutAnimation() { private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "LayoutCreateAnimation", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt index e47bb7f5c81..3ab34bcbe81 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutDeleteAnimation.kt @@ -22,7 +22,7 @@ internal class LayoutDeleteAnimation : BaseLayoutAnimation() { private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "LayoutDeleteAnimation", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt index f1c6f6dc89e..72dc9164d68 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutUpdateAnimation.kt @@ -51,7 +51,7 @@ internal class LayoutUpdateAnimation : AbstractLayoutAnimation() { private const val USE_TRANSLATE_ANIMATION = false init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "LayoutUpdateAnimation", LegacyArchitectureLogLevel.WARNING) } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt index 65ac4882de7..406d4915e1b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/OpacityAnimation.kt @@ -28,7 +28,7 @@ internal class OpacityAnimation(view: View, private val startOpacity: Float, end init { setAnimationListener(OpacityAnimationListener(view)) - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "OpacityAnimation", LegacyArchitectureLogLevel.WARNING) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt index d63d5491b00..a7a250a8ba6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/PositionAndSizeAnimation.kt @@ -81,8 +81,7 @@ internal class PositionAndSizeAnimation(view: View, x: Int, y: Int, width: Int, private companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( - "PositionAndSizeAnimation") + LegacyArchitectureLogger.assertLegacyArchitecture("PositionAndSizeAnimation") } } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt index 088f48c4983..5f8273c1650 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/SimpleSpringInterpolator.kt @@ -10,7 +10,6 @@ package com.facebook.react.uimanager.layoutanimation import android.view.animation.Interpolator import com.facebook.react.bridge.ReadableMap import com.facebook.react.bridge.ReadableType -import com.facebook.react.bridge.ReadableType.Number import com.facebook.react.common.annotations.internal.LegacyArchitecture import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger @@ -39,7 +38,7 @@ internal class SimpleSpringInterpolator : Interpolator { companion object { init { - LegacyArchitectureLogger.assertWhenLegacyArchitectureMinifyingEnabled( + LegacyArchitectureLogger.assertLegacyArchitecture( "SimpleSpringInterpolator", LegacyArchitectureLogLevel.WARNING) }