From 091d9706d618997688f26370d0a01fa18b739113 Mon Sep 17 00:00:00 2001 From: Arushi Kesarwani Date: Mon, 21 Aug 2023 19:51:36 -0700 Subject: [PATCH] Bridgeless -> Runtime (#39062) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/39062 Renaming `bridgeless` -> `runtime` Package `com.facebook.react.bridgeless` -> `com.facebook.react.runtime` changelog: [General][Changed] - Renaming bridgeless to runtime Reviewed By: rshest Differential Revision: D48440542 fbshipit-source-id: ff58894518cfba858675b59b7bb30611e71ef0b8 --- .../react/defaults/DefaultBindingsInstaller.kt | 2 +- .../react/defaults/DefaultReactHostDelegate.kt | 8 ++++---- .../react/{bridgeless => runtime}/.clang-format | 0 .../react/{bridgeless => runtime}/.clang-tidy | 0 .../{bridgeless => runtime}/BindingsInstaller.kt | 2 +- .../{bridgeless => runtime}/BoltsFutureTask.java | 6 +++--- .../{bridgeless => runtime}/BridgelessAtomicRef.java | 2 +- .../BridgelessDevSupportManager.java | 6 +++--- .../BridgelessReactContext.java | 2 +- .../BridgelessReactStateTracker.java | 2 +- .../{bridgeless => runtime}/CoreReactPackage.java | 2 +- .../react/{bridgeless => runtime}/JSCInstance.java | 2 +- .../{bridgeless => runtime}/JSEngineInstance.java | 2 +- .../{bridgeless => runtime}/JSTimerExecutor.java | 2 +- .../facebook/react/{bridgeless => runtime}/README.md | 0 .../{bridgeless => runtime}/ReactHostDelegate.kt | 2 +- .../react/{bridgeless => runtime}/ReactHostImpl.java | 8 ++++---- .../react/{bridgeless => runtime}/ReactInstance.java | 2 +- .../ReactLifecycleStateManager.java | 2 +- .../{bridgeless => runtime}/ReactSurfaceImpl.java | 4 ++-- .../{bridgeless => runtime}/ReactSurfaceView.java | 2 +- .../{bridgeless => runtime}/hermes/HermesInstance.kt | 4 ++-- .../internal/bolts/AggregateException.java | 2 +- .../internal/bolts/AndroidExecutors.java | 2 +- .../internal/bolts/BoltsExecutors.java | 2 +- .../internal/bolts/CancellationToken.java | 2 +- .../bolts/CancellationTokenRegistration.java | 2 +- .../internal/bolts/CancellationTokenSource.java | 2 +- .../internal/bolts/Capture.java | 2 +- .../internal/bolts/Continuation.java | 2 +- .../internal/bolts/ExecutorException.java | 2 +- .../{bridgeless => runtime}/internal/bolts/Task.java | 2 +- .../internal/bolts/TaskCompletionSource.java | 2 +- .../internal/bolts/UnobservedErrorNotifier.java | 2 +- .../internal/bolts/UnobservedTaskException.java | 2 +- .../BridgelessReactContextTest.java | 2 +- .../{bridgeless => runtime}/ReactHostDelegateTest.kt | 4 ++-- .../react/{bridgeless => runtime}/ReactHostTest.java | 6 +++--- .../{bridgeless => runtime}/ReactSurfaceTest.java | 4 ++-- .../platform/ios/ReactCommon/RCTJSThreadManager.mm | 2 +- .../facebook/react/uiapp/RNTesterApplication.java | 2 +- .../react/uiapp/RNTesterReactHostDelegate.java | 12 ++++++------ 42 files changed, 60 insertions(+), 60 deletions(-) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/.clang-format (100%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/.clang-tidy (100%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/BindingsInstaller.kt (93%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/BoltsFutureTask.java (94%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/BridgelessAtomicRef.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/BridgelessDevSupportManager.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/BridgelessReactContext.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/BridgelessReactStateTracker.java (95%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/CoreReactPackage.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/JSCInstance.java (94%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/JSEngineInstance.java (94%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/JSTimerExecutor.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/README.md (100%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/ReactHostDelegate.kt (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/ReactHostImpl.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/ReactInstance.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/ReactLifecycleStateManager.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/ReactSurfaceImpl.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/ReactSurfaceView.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/hermes/HermesInstance.kt (84%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/AggregateException.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/AndroidExecutors.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/BoltsExecutors.java (98%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/CancellationToken.java (97%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/CancellationTokenRegistration.java (96%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/CancellationTokenSource.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/Capture.java (92%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/Continuation.java (92%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/ExecutorException.java (91%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/Task.java (99%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/TaskCompletionSource.java (97%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/UnobservedErrorNotifier.java (95%) rename packages/react-native/ReactAndroid/src/main/java/com/facebook/react/{bridgeless => runtime}/internal/bolts/UnobservedTaskException.java (89%) rename packages/react-native/ReactAndroid/src/test/java/com/facebook/react/{bridgeless => runtime}/BridgelessReactContextTest.java (98%) rename packages/react-native/ReactAndroid/src/test/java/com/facebook/react/{bridgeless => runtime}/ReactHostDelegateTest.kt (94%) rename packages/react-native/ReactAndroid/src/test/java/com/facebook/react/{bridgeless => runtime}/ReactHostTest.java (97%) rename packages/react-native/ReactAndroid/src/test/java/com/facebook/react/{bridgeless => runtime}/ReactSurfaceTest.java (98%) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultBindingsInstaller.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultBindingsInstaller.kt index 638451231eb663..d0573dc405097b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultBindingsInstaller.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultBindingsInstaller.kt @@ -8,8 +8,8 @@ package com.facebook.react.defaults import com.facebook.jni.annotations.DoNotStrip -import com.facebook.react.bridgeless.BindingsInstaller import com.facebook.react.common.annotations.UnstableReactNativeAPI +import com.facebook.react.runtime.BindingsInstaller /** * A utility class that provides users a default [BindingsInstaller] class that's used to initialize diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt index 2f5ac9fc363460..d356a20eabf93a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHostDelegate.kt @@ -11,12 +11,12 @@ import com.facebook.jni.annotations.DoNotStrip import com.facebook.react.ReactPackage import com.facebook.react.ReactPackageTurboModuleManagerDelegate import com.facebook.react.bridge.JSBundleLoader -import com.facebook.react.bridgeless.BindingsInstaller -import com.facebook.react.bridgeless.JSEngineInstance -import com.facebook.react.bridgeless.ReactHostDelegate -import com.facebook.react.bridgeless.hermes.HermesInstance import com.facebook.react.common.annotations.UnstableReactNativeAPI import com.facebook.react.fabric.ReactNativeConfig +import com.facebook.react.runtime.BindingsInstaller +import com.facebook.react.runtime.JSEngineInstance +import com.facebook.react.runtime.ReactHostDelegate +import com.facebook.react.runtime.hermes.HermesInstance import com.facebook.react.turbomodule.core.TurboModuleManager /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/.clang-format b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/.clang-format similarity index 100% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/.clang-format rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/.clang-format diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/.clang-tidy b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/.clang-tidy similarity index 100% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/.clang-tidy rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/.clang-tidy diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BindingsInstaller.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BindingsInstaller.kt similarity index 93% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BindingsInstaller.kt rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BindingsInstaller.kt index dcb9874bc48ed3..61333f0c9f55aa 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BindingsInstaller.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BindingsInstaller.kt @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless +package com.facebook.react.runtime import com.facebook.jni.HybridData import com.facebook.proguard.annotations.DoNotStrip diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BoltsFutureTask.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BoltsFutureTask.java similarity index 94% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BoltsFutureTask.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BoltsFutureTask.java index a2a7903a8541ba..04a9e8a97b7ec3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BoltsFutureTask.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BoltsFutureTask.java @@ -5,10 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; -import com.facebook.react.bridgeless.internal.bolts.CancellationTokenSource; -import com.facebook.react.bridgeless.internal.bolts.Task; +import com.facebook.react.runtime.internal.bolts.CancellationTokenSource; +import com.facebook.react.runtime.internal.bolts.Task; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessAtomicRef.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessAtomicRef.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.java index d613b497c9e1bd..133d50d5c230bf 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessAtomicRef.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import static com.facebook.infer.annotation.Assertions.assertNotNull; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessDevSupportManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessDevSupportManager.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessDevSupportManager.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessDevSupportManager.java index 7152a19ab56300..3627129e9233b8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessDevSupportManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessDevSupportManager.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import android.app.Activity; import android.content.Context; @@ -15,13 +15,13 @@ import com.facebook.react.bridge.JavaJSExecutor; import com.facebook.react.bridge.JavaScriptExecutorFactory; import com.facebook.react.bridge.ReactContext; -import com.facebook.react.bridgeless.internal.bolts.Continuation; -import com.facebook.react.bridgeless.internal.bolts.Task; import com.facebook.react.devsupport.DevSupportManagerBase; import com.facebook.react.devsupport.HMRClient; import com.facebook.react.devsupport.ReactInstanceDevHelper; import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback; import com.facebook.react.modules.core.DeviceEventManagerModule; +import com.facebook.react.runtime.internal.bolts.Continuation; +import com.facebook.react.runtime.internal.bolts.Task; import javax.annotation.Nullable; /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessReactContext.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessReactContext.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.java index 4cd4c7918b41b8..de5519395dd043 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessReactContext.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import android.content.Context; import com.facebook.infer.annotation.Nullsafe; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessReactStateTracker.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactStateTracker.java similarity index 95% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessReactStateTracker.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactStateTracker.java index 3bdae47d1b0b2d..4c9e912ec1ddc2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/BridgelessReactStateTracker.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactStateTracker.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import com.facebook.common.logging.FLog; import com.facebook.infer.annotation.Nullsafe; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/CoreReactPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/CoreReactPackage.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java index 9094a2aa399b0b..f82769ce8b23d6 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/CoreReactPackage.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import com.facebook.infer.annotation.Nullsafe; import com.facebook.react.TurboReactPackage; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSCInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSCInstance.java similarity index 94% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSCInstance.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSCInstance.java index 117425a88021db..8fb32073cfafed 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSCInstance.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSCInstance.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import com.facebook.infer.annotation.Nullsafe; import com.facebook.jni.HybridData; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSEngineInstance.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSEngineInstance.java similarity index 94% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSEngineInstance.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSEngineInstance.java index c7c2e32ebdea1c..708e71676641d3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSEngineInstance.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSEngineInstance.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import com.facebook.infer.annotation.Nullsafe; import com.facebook.jni.HybridData; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSTimerExecutor.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSTimerExecutor.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSTimerExecutor.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSTimerExecutor.java index 8d474db2a4b85f..69cffd5cfa9229 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/JSTimerExecutor.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/JSTimerExecutor.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import com.facebook.infer.annotation.Nullsafe; import com.facebook.jni.HybridData; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/README.md b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/README.md similarity index 100% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/README.md rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/README.md diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostDelegate.kt similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostDelegate.kt index 8d845667190ba9..ff1e38fd147115 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostDelegate.kt @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless +package com.facebook.react.runtime import com.facebook.infer.annotation.ThreadSafe import com.facebook.react.ReactPackage diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostImpl.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java index 87039ea85ae37f..70062476d33794 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHostImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import static com.facebook.infer.annotation.Assertions.assertNotNull; import static com.facebook.infer.annotation.Assertions.nullsafeFIXME; @@ -40,9 +40,6 @@ 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.internal.bolts.Continuation; -import com.facebook.react.bridgeless.internal.bolts.Task; -import com.facebook.react.bridgeless.internal.bolts.TaskCompletionSource; import com.facebook.react.common.LifecycleState; import com.facebook.react.common.build.ReactBuildConfig; import com.facebook.react.config.ReactFeatureFlags; @@ -57,6 +54,9 @@ import com.facebook.react.interfaces.fabric.ReactSurface; import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler; import com.facebook.react.modules.core.DeviceEventManagerModule; +import com.facebook.react.runtime.internal.bolts.Continuation; +import com.facebook.react.runtime.internal.bolts.Task; +import com.facebook.react.runtime.internal.bolts.TaskCompletionSource; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.events.BlackHoleEventDispatcher; import com.facebook.react.uimanager.events.EventDispatcher; 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/runtime/ReactInstance.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactInstance.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java index d89e4e8784b9b3..f97db18472926f 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/runtime/ReactInstance.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import android.content.res.AssetManager; import android.view.View; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactLifecycleStateManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactLifecycleStateManager.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactLifecycleStateManager.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactLifecycleStateManager.java index af857986185842..7ecd50fe5ed100 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactLifecycleStateManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactLifecycleStateManager.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import static com.facebook.infer.annotation.ThreadConfined.UI; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceImpl.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.java index f9d5bed9005053..89ed46fb9a2ada 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceImpl.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import android.content.Context; import android.os.Bundle; @@ -20,13 +20,13 @@ import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.bridge.WritableNativeMap; -import com.facebook.react.bridgeless.internal.bolts.Task; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.fabric.SurfaceHandlerBinding; import com.facebook.react.interfaces.TaskInterface; import com.facebook.react.interfaces.fabric.ReactSurface; import com.facebook.react.interfaces.fabric.SurfaceHandler; import com.facebook.react.modules.i18nmanager.I18nUtil; +import com.facebook.react.runtime.internal.bolts.Task; import com.facebook.react.uimanager.events.EventDispatcher; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceView.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java index 8d8093ca325221..f261cafec7c761 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurfaceView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import android.content.Context; import android.graphics.Point; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/hermes/HermesInstance.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/hermes/HermesInstance.kt similarity index 84% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/hermes/HermesInstance.kt rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/hermes/HermesInstance.kt index 59fcf9885dcfd4..2f7697b249405b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/hermes/HermesInstance.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/hermes/HermesInstance.kt @@ -5,11 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.hermes +package com.facebook.react.runtime.hermes import com.facebook.jni.HybridData import com.facebook.jni.annotations.DoNotStrip -import com.facebook.react.bridgeless.JSEngineInstance +import com.facebook.react.runtime.JSEngineInstance import com.facebook.soloader.SoLoader class HermesInstance : JSEngineInstance(initHybrid()!!) { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/AggregateException.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/AggregateException.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/AggregateException.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/AggregateException.java index 93294b3a5faa6c..37bf364cbe0c41 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/AggregateException.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/AggregateException.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/AndroidExecutors.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/AndroidExecutors.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/AndroidExecutors.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/AndroidExecutors.java index f623bd40106003..49518ccc90db0b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/AndroidExecutors.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/AndroidExecutors.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import android.annotation.SuppressLint; import android.os.Build; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/BoltsExecutors.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/BoltsExecutors.java similarity index 98% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/BoltsExecutors.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/BoltsExecutors.java index 035871fce0b5e1..8ea8b60b8b661f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/BoltsExecutors.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/BoltsExecutors.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.NonNull; import java.util.Locale; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationToken.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationToken.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationToken.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationToken.java index d85c74e3fc1a22..09b6f59dae33b2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationToken.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationToken.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.NonNull; import java.util.Locale; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationTokenRegistration.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationTokenRegistration.java similarity index 96% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationTokenRegistration.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationTokenRegistration.java index 8edb0a9f5b4a2d..3acde667848fbc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationTokenRegistration.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationTokenRegistration.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationTokenSource.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationTokenSource.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationTokenSource.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationTokenSource.java index 59970ff30b17c1..3febccbb7ce0bc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/CancellationTokenSource.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/CancellationTokenSource.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Capture.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Capture.java similarity index 92% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Capture.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Capture.java index e2e0ddf0a213f9..f7beec042b7f4f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Capture.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Capture.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Continuation.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Continuation.java similarity index 92% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Continuation.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Continuation.java index f11a224caf1ce0..216747122516c7 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Continuation.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Continuation.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/ExecutorException.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/ExecutorException.java similarity index 91% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/ExecutorException.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/ExecutorException.java index e6d4990238a9a0..35915b9deed47d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/ExecutorException.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/ExecutorException.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Task.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.java similarity index 99% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Task.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.java index 87deb28a08a681..cb5399b6c120f8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/Task.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Task.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.Nullable; import com.facebook.react.interfaces.TaskInterface; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/TaskCompletionSource.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.java similarity index 97% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/TaskCompletionSource.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.java index 0c4566e85fea25..49884cea16cc5b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/TaskCompletionSource.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/TaskCompletionSource.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/UnobservedErrorNotifier.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedErrorNotifier.java similarity index 95% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/UnobservedErrorNotifier.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedErrorNotifier.java index b6aebef51e3e13..02021011c4037f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/UnobservedErrorNotifier.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedErrorNotifier.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/UnobservedTaskException.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedTaskException.java similarity index 89% rename from packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/UnobservedTaskException.java rename to packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedTaskException.java index b418c9a40fe8b1..8cf4fef2eb8385 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/internal/bolts/UnobservedTaskException.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/UnobservedTaskException.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless.internal.bolts; +package com.facebook.react.runtime.internal.bolts; import androidx.annotation.Nullable; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/BridgelessReactContextTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/BridgelessReactContextTest.java similarity index 98% rename from packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/BridgelessReactContextTest.java rename to packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/BridgelessReactContextTest.java index a663bd3f723b27..e5e773c8c2c8e6 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/BridgelessReactContextTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/BridgelessReactContextTest.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostDelegateTest.kt similarity index 94% rename from packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt rename to packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostDelegateTest.kt index 346a046bf33e38..33932b8a87bf34 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostDelegateTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostDelegateTest.kt @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless +package com.facebook.react.runtime import com.facebook.react.ReactPackageTurboModuleManagerDelegate import com.facebook.react.bridge.JSBundleLoader -import com.facebook.react.bridgeless.hermes.HermesInstance import com.facebook.react.common.annotations.UnstableReactNativeAPI import com.facebook.react.defaults.DefaultReactHostDelegate +import com.facebook.react.runtime.hermes.HermesInstance import com.facebook.testutils.shadows.ShadowSoLoader import org.assertj.core.api.Assertions.assertThat import org.junit.Test diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostTest.java similarity index 97% rename from packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostTest.java rename to packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostTest.java index 35ee5bac934c1a..a72e51adee5f38 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactHostTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostTest.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import static android.os.Looper.getMainLooper; import static org.assertj.core.api.Assertions.assertThat; @@ -23,11 +23,11 @@ import com.facebook.react.bridge.MemoryPressureListener; import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.UIManager; -import com.facebook.react.bridgeless.internal.bolts.TaskCompletionSource; import com.facebook.react.common.LifecycleState; import com.facebook.react.devsupport.interfaces.PackagerStatusCallback; import com.facebook.react.fabric.ComponentFactory; import com.facebook.react.interfaces.TaskInterface; +import com.facebook.react.runtime.internal.bolts.TaskCompletionSource; import com.facebook.react.uimanager.events.BlackHoleEventDispatcher; import com.facebook.react.uimanager.events.EventDispatcher; import com.facebook.testutils.shadows.ShadowSoLoader; @@ -42,7 +42,7 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.LooperMode; -/** Tests {@linkcom.facebook.react.bridgeless.ReactHostImpl} */ +/** Tests {@linkcom.facebook.react.runtime.ReactHostImpl} */ @Ignore("Ignore for now as these tests fail in OSS only") @RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSoLoader.class) diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactSurfaceTest.java b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactSurfaceTest.java similarity index 98% rename from packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactSurfaceTest.java rename to packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactSurfaceTest.java index e9be77e64511ae..429e5c0350ee6a 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/bridgeless/ReactSurfaceTest.java +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactSurfaceTest.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -package com.facebook.react.bridgeless; +package com.facebook.react.runtime; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -19,8 +19,8 @@ import android.content.Context; import android.view.View; import com.facebook.react.bridge.NativeMap; -import com.facebook.react.bridgeless.internal.bolts.Task; import com.facebook.react.interfaces.fabric.SurfaceHandler; +import com.facebook.react.runtime.internal.bolts.Task; import com.facebook.react.uimanager.events.EventDispatcher; import java.util.concurrent.Callable; import org.junit.Before; diff --git a/packages/react-native/ReactCommon/react/bridgeless/platform/ios/ReactCommon/RCTJSThreadManager.mm b/packages/react-native/ReactCommon/react/bridgeless/platform/ios/ReactCommon/RCTJSThreadManager.mm index 66d53609779b47..af520aa4227902 100644 --- a/packages/react-native/ReactCommon/react/bridgeless/platform/ios/ReactCommon/RCTJSThreadManager.mm +++ b/packages/react-native/ReactCommon/react/bridgeless/platform/ios/ReactCommon/RCTJSThreadManager.mm @@ -10,7 +10,7 @@ #import #import -static NSString *const RCTJSThreadName = @"com.facebook.react.bridgeless.JavaScript"; +static NSString *const RCTJSThreadName = @"com.facebook.react.runtime.JavaScript"; #define RCTAssertJSThread() \ RCTAssert(self->_jsThread == [NSThread currentThread], @"This method must be called on JS thread") 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 af4f41220cfb86..0706214a22f662 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.ReactHostImpl; import com.facebook.react.common.annotations.UnstableReactNativeAPI; import com.facebook.react.common.assets.ReactFontManager; import com.facebook.react.common.mapbuffer.ReadableMapBuffer; @@ -32,6 +31,7 @@ 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.runtime.ReactHostImpl; import com.facebook.react.shell.MainReactPackage; import com.facebook.react.uiapp.component.MyLegacyViewManager; import com.facebook.react.uiapp.component.MyNativeViewManager; diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java index 0f0a68f84a576e..823303750ab14b 100644 --- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java +++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterReactHostDelegate.java @@ -19,18 +19,18 @@ import com.facebook.react.bridge.JSBundleLoader; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridgeless.BindingsInstaller; -import com.facebook.react.bridgeless.JSCInstance; -import com.facebook.react.bridgeless.JSEngineInstance; -import com.facebook.react.bridgeless.ReactHostDelegate; -import com.facebook.react.bridgeless.ReactHostImpl; -import com.facebook.react.bridgeless.hermes.HermesInstance; import com.facebook.react.common.annotations.UnstableReactNativeAPI; import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.defaults.DefaultTurboModuleManagerDelegate; import com.facebook.react.fabric.ReactNativeConfig; import com.facebook.react.module.model.ReactModuleInfo; import com.facebook.react.module.model.ReactModuleInfoProvider; +import com.facebook.react.runtime.BindingsInstaller; +import com.facebook.react.runtime.JSCInstance; +import com.facebook.react.runtime.JSEngineInstance; +import com.facebook.react.runtime.ReactHostDelegate; +import com.facebook.react.runtime.ReactHostImpl; +import com.facebook.react.runtime.hermes.HermesInstance; import com.facebook.react.shell.MainReactPackage; import com.facebook.react.turbomodule.core.TurboModuleManager; import com.facebook.react.uiapp.component.MyLegacyViewManager;