From 683e279dfe164066a808b981732f32ddd0dd294b Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sat, 8 Jul 2023 16:10:15 -0700 Subject: [PATCH] Move ReactJsExceptionHandler -> interfaces package (#38241) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/38241 In this diff I'm moving the ReactJsExceptionHandler interface into the react.interfaces package. This bring consistence with the rest of bridgeless APIs changelog: [internal] internal Reviewed By: cortinico Differential Revision: D47277572 fbshipit-source-id: ad17b19de3571df4ea1545f45d5998912deac072 --- .../src/main/java/com/facebook/react/bridgeless/ReactHost.java | 2 +- .../main/java/com/facebook/react/bridgeless/ReactInstance.java | 2 +- .../exceptionmanager/ReactJsExceptionHandler.java | 2 +- .../src/main/jni/react/bridgeless/jni/JReactExceptionManager.h | 2 +- .../main/java/com/facebook/react/uiapp/RNTesterApplication.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => interfaces}/exceptionmanager/ReactJsExceptionHandler.java (88%) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java index 8f28651c94d..84e4f82ab58 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java @@ -39,7 +39,6 @@ import com.facebook.react.bridge.ReactSoftExceptionLogger; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.bridge.queue.QueueThreadExceptionHandler; import com.facebook.react.bridge.queue.ReactQueueConfiguration; -import com.facebook.react.bridgeless.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.bridgeless.internal.bolts.Continuation; import com.facebook.react.bridgeless.internal.bolts.Task; import com.facebook.react.bridgeless.internal.bolts.TaskCompletionSource; @@ -53,6 +52,7 @@ import com.facebook.react.fabric.ComponentFactory; import com.facebook.react.fabric.FabricUIManager; import com.facebook.react.interfaces.ReactHostInterface; import com.facebook.react.interfaces.ReactSurfaceInterface; +import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.modules.core.DeviceEventManagerModule; import com.facebook.react.uimanager.UIManagerModule; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java index 44d3fb724b4..e756dd67402 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java @@ -33,7 +33,6 @@ import com.facebook.react.bridge.queue.QueueThreadExceptionHandler; import com.facebook.react.bridge.queue.ReactQueueConfiguration; import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl; import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec; -import com.facebook.react.bridgeless.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.devsupport.interfaces.DevSupportManager; import com.facebook.react.fabric.Binding; import com.facebook.react.fabric.BindingImpl; @@ -41,6 +40,7 @@ import com.facebook.react.fabric.ComponentFactory; import com.facebook.react.fabric.FabricUIManager; import com.facebook.react.fabric.ReactNativeConfig; import com.facebook.react.fabric.events.EventBeatManager; +import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.modules.core.JavaTimerManager; import com.facebook.react.modules.core.ReactChoreographer; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/exceptionmanager/ReactJsExceptionHandler.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler.java similarity index 88% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/exceptionmanager/ReactJsExceptionHandler.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler.java index a05e6471911..fc25d75f826 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/exceptionmanager/ReactJsExceptionHandler.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.exceptionmanager; +package com.facebook.react.interfaces.exceptionmanager; import com.facebook.proguard.annotations.DoNotStripAny; import com.facebook.react.common.mapbuffer.ReadableMapBuffer; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/bridgeless/jni/JReactExceptionManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/bridgeless/jni/JReactExceptionManager.h index f84b068e705..80b898c39ea 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/bridgeless/jni/JReactExceptionManager.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/bridgeless/jni/JReactExceptionManager.h @@ -17,7 +17,7 @@ class JReactExceptionManager : public facebook::jni::JavaClass { public: static auto constexpr kJavaDescriptor = - "Lcom/facebook/react/bridgeless/exceptionmanager/ReactJsExceptionHandler;"; + "Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler;"; void reportJsException(const JReadableMapBuffer::javaobject errorMapBuffer); }; diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java index 53c416400ef..958951fdc58 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java @@ -18,7 +18,6 @@ import com.facebook.react.TurboReactPackage; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridgeless.ReactHost; -import com.facebook.react.bridgeless.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.common.annotations.UnstableReactNativeAPI; import com.facebook.react.common.mapbuffer.ReadableMapBuffer; import com.facebook.react.config.ReactFeatureFlags; @@ -28,6 +27,7 @@ import com.facebook.react.defaults.DefaultReactNativeHost; import com.facebook.react.fabric.ComponentFactory; import com.facebook.react.flipper.ReactNativeFlipper; import com.facebook.react.interfaces.ReactHostInterface; +import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler; import com.facebook.react.module.model.ReactModuleInfo; import com.facebook.react.module.model.ReactModuleInfoProvider; import com.facebook.react.shell.MainReactPackage;