react-native-tvos 0.81.3-0 → 0.82.0-0

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.kt

@@ -17,19 +17,24 @@ import com.facebook.systrace.SystraceMessage
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
 internal class JavaMethodWrapper(
     private val moduleWrapper: JavaModuleWrapper,
     val method: Method,
-    isSync: Boolean
+    isSync: Boolean,
 ) : JavaModuleWrapper.NativeMethod {
   private abstract class ArgumentExtractor<T> {
     open fun getJSArgumentsNeeded(): Int = 1
 
+    @Suppress("DEPRECATION")
     abstract fun extractArgument(
         jsInstance: JSInstance,
         jsArguments: ReadableArray,
-        atIndex: Int
+        atIndex: Int,
     ): T?
   }
 
@@ -157,6 +162,7 @@ internal class JavaMethodWrapper(
         "$startIndex"
       }
 
+  @Suppress("DEPRECATION")
   override fun invoke(jsInstance: JSInstance, parameters: ReadableArray) {
     val traceName = moduleWrapper.name + "." + method.name
     SystraceMessage.beginSection(TRACE_TAG_REACT, "callJavaModuleMethod")
@@ -164,7 +170,11 @@ internal class JavaMethodWrapper(
         .flush()
     if (DEBUG) {
       PrinterHolder.printer.logMessage(
-          ReactDebugOverlayTags.BRIDGE_CALLS, "JS->Java: %s.%s()", moduleWrapper.name, method.name)
+          ReactDebugOverlayTags.BRIDGE_CALLS,
+          "JS->Java: %s.%s()",
+          moduleWrapper.name,
+          method.name,
+      )
     }
     try {
       if (!argumentsProcessed) {
@@ -179,8 +189,9 @@ internal class JavaMethodWrapper(
           }
 
       if (jsArgumentsNeeded != parameters.size()) {
-        throw NativeArgumentsParseException(
-            "$traceName got ${parameters.size()} arguments, expected $jsArgumentsNeeded")
+        throw JSApplicationCausedNativeException(
+            "$traceName got ${parameters.size()} arguments, expected $jsArgumentsNeeded"
+        )
       }
 
       var i = 0
@@ -189,28 +200,33 @@ internal class JavaMethodWrapper(
         while (i < validatedArgumentExtractors.size) {
           validatedArguments[i] =
               validatedArgumentExtractors[i].extractArgument(
-                  jsInstance, parameters, jsArgumentsConsumed)
+                  jsInstance,
+                  parameters,
+                  jsArgumentsConsumed,
+              )
           jsArgumentsConsumed += validatedArgumentExtractors[i].getJSArgumentsNeeded()
           i++
         }
       } catch (e: UnexpectedNativeTypeException) {
-        throw NativeArgumentsParseException(
+        throw JSApplicationCausedNativeException(
             "${e.message} (constructing arguments for $traceName at argument index ${
               getAffectedRange(
                   jsArgumentsConsumed,
-                  validatedArgumentExtractors[i].getJSArgumentsNeeded()
+                  validatedArgumentExtractors[i].getJSArgumentsNeeded(),
               )
           })",
-            e)
+            e,
+        )
       } catch (e: NullPointerException) {
-        throw NativeArgumentsParseException(
+        throw JSApplicationCausedNativeException(
             "${e.message} (constructing arguments for $traceName at argument index ${
               getAffectedRange(
                   jsArgumentsConsumed,
-                  validatedArgumentExtractors[i].getJSArgumentsNeeded()
+                  validatedArgumentExtractors[i].getJSArgumentsNeeded(),
               )
           })",
-            e)
+            e,
+        )
       }
 
       try {
@@ -235,93 +251,104 @@ internal class JavaMethodWrapper(
   companion object {
     init {
       LegacyArchitectureLogger.assertLegacyArchitecture(
-          "JavaMethodWrapper", LegacyArchitectureLogLevel.ERROR)
+          "JavaMethodWrapper",
+          LegacyArchitectureLogLevel.ERROR,
+      )
     }
 
     private val ARGUMENT_EXTRACTOR_BOOLEAN: ArgumentExtractor<Boolean> =
         object : ArgumentExtractor<Boolean>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): Boolean = jsArguments.getBoolean(atIndex)
         }
 
     private val ARGUMENT_EXTRACTOR_DOUBLE: ArgumentExtractor<Double> =
         object : ArgumentExtractor<Double>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): Double = jsArguments.getDouble(atIndex)
         }
 
     private val ARGUMENT_EXTRACTOR_FLOAT: ArgumentExtractor<Float> =
         object : ArgumentExtractor<Float>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): Float = jsArguments.getDouble(atIndex).toFloat()
         }
 
     private val ARGUMENT_EXTRACTOR_INTEGER: ArgumentExtractor<Int> =
         object : ArgumentExtractor<Int>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): Int = jsArguments.getDouble(atIndex).toInt()
         }
 
     private val ARGUMENT_EXTRACTOR_STRING: ArgumentExtractor<String> =
         object : ArgumentExtractor<String>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): String? = jsArguments.getString(atIndex)
         }
 
     private val ARGUMENT_EXTRACTOR_ARRAY: ArgumentExtractor<ReadableArray> =
         object : ArgumentExtractor<ReadableArray>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): ReadableArray? = jsArguments.getArray(atIndex)
         }
 
     private val ARGUMENT_EXTRACTOR_DYNAMIC: ArgumentExtractor<Dynamic> =
         object : ArgumentExtractor<Dynamic>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): Dynamic = DynamicFromArray.create(jsArguments, atIndex)
         }
 
     private val ARGUMENT_EXTRACTOR_MAP: ArgumentExtractor<ReadableMap> =
         object : ArgumentExtractor<ReadableMap>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): ReadableMap? = jsArguments.getMap(atIndex)
         }
 
     private val ARGUMENT_EXTRACTOR_CALLBACK: ArgumentExtractor<Callback> =
         object : ArgumentExtractor<Callback>() {
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): Callback? =
               if (jsArguments.isNull(atIndex)) {
                 null
               } else {
                 val id = jsArguments.getDouble(atIndex).toInt()
-                CallbackImpl(jsInstance, id)
+                @Suppress("DEPRECATION") CallbackImpl(jsInstance, id)
               }
         }
 
@@ -329,10 +356,11 @@ internal class JavaMethodWrapper(
         object : ArgumentExtractor<Promise>() {
           override fun getJSArgumentsNeeded(): Int = 2
 
+          @Suppress("DEPRECATION")
           override fun extractArgument(
               jsInstance: JSInstance,
               jsArguments: ReadableArray,
-              atIndex: Int
+              atIndex: Int,
           ): Promise {
             val resolve =
                 ARGUMENT_EXTRACTOR_CALLBACK.extractArgument(jsInstance, jsArguments, atIndex)

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.kt

@@ -25,11 +25,11 @@ import java.lang.reflect.Method
 @DoNotStrip
 @InteropLegacyArchitecture
 internal class JavaModuleWrapper(
-    private val jsInstance: JSInstance,
-    private val moduleHolder: ModuleHolder
+    @Suppress("DEPRECATION") private val jsInstance: JSInstance,
+    private val moduleHolder: ModuleHolder,
 ) {
   interface NativeMethod {
-    fun invoke(jsInstance: JSInstance, parameters: ReadableArray)
+    @Suppress("DEPRECATION") fun invoke(jsInstance: JSInstance, parameters: ReadableArray)
 
     val type: String
   }
@@ -74,6 +74,7 @@ internal class JavaModuleWrapper(
       targetMethod.getAnnotation(ReactMethod::class.java)?.let { annotation ->
         val methodName = targetMethod.name
         val md = MethodDescriptor()
+        @Suppress("DEPRECATION")
         val method = JavaMethodWrapper(this, targetMethod, annotation.isBlockingSynchronousMethod)
         md.name = methodName
         md.type = method.type

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaOnlyMap.kt

@@ -98,7 +98,8 @@ public class JavaOnlyMap() : ReadableMap, WritableMap {
       value is Dynamic -> value.type
       else -> {
         throw IllegalArgumentException(
-            "Invalid value $value for key $name contained in JavaOnlyMap")
+            "Invalid value $value for key $name contained in JavaOnlyMap"
+        )
       }
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.kt

@@ -24,7 +24,7 @@ public class JavaScriptModuleRegistry {
   @Synchronized
   public fun <T : JavaScriptModule> getJavaScriptModule(
       @Suppress("DEPRECATION") instance: CatalystInstance,
-      moduleInterface: Class<T>
+      moduleInterface: Class<T>,
   ): T {
     val module = moduleInstances[moduleInterface]
     if (module != null) {
@@ -36,7 +36,8 @@ public class JavaScriptModuleRegistry {
         Proxy.newProxyInstance(
             moduleInterface.classLoader,
             arrayOf<Class<*>>(moduleInterface),
-            JavaScriptModuleInvocationHandler(instance, moduleInterface)) as JavaScriptModule
+            JavaScriptModuleInvocationHandler(instance, moduleInterface),
+        ) as JavaScriptModule
 
     moduleInstances[moduleInterface] = proxy
     @Suppress("UNCHECKED_CAST")
@@ -45,7 +46,7 @@ public class JavaScriptModuleRegistry {
 
   private class JavaScriptModuleInvocationHandler(
       @Suppress("DEPRECATION") private val catalystInstance: CatalystInstance,
-      private val moduleInterface: Class<out JavaScriptModule>
+      private val moduleInterface: Class<out JavaScriptModule>,
   ) : InvocationHandler {
 
     private var name: String? = null
@@ -56,7 +57,8 @@ public class JavaScriptModuleRegistry {
         for (method in moduleInterface.declaredMethods) {
           if (!methodNames.add(method.name)) {
             throw AssertionError(
-                "Method overloading is unsupported: ${moduleInterface.name}#${method.name}")
+                "Method overloading is unsupported: ${moduleInterface.name}#${method.name}"
+            )
           }
         }
       }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.kt

@@ -61,11 +61,15 @@ public class ModuleHolder {
             nativeModule.canOverrideExistingModule(),
             true,
             CxxModuleWrapper::class.java.isAssignableFrom(nativeModule.javaClass),
-            ReactModuleInfo.classIsTurboModule(nativeModule.javaClass))
+            ReactModuleInfo.classIsTurboModule(nativeModule.javaClass),
+        )
 
     internalModule = nativeModule
     PrinterHolder.printer.logMessage(
-        ReactDebugOverlayTags.NATIVE_MODULE, "NativeModule init: %s", name)
+        ReactDebugOverlayTags.NATIVE_MODULE,
+        "NativeModule init: %s",
+        name,
+    )
   }
 
   /*
@@ -162,7 +166,10 @@ public class ModuleHolder {
         .arg("name", name)
         .flush()
     PrinterHolder.printer.logMessage(
-        ReactDebugOverlayTags.NATIVE_MODULE, "NativeModule init: %s", name)
+        ReactDebugOverlayTags.NATIVE_MODULE,
+        "NativeModule init: %s",
+        name,
+    )
     val module: NativeModule
     try {
       module = checkNotNull(provider).get()

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleSpec.kt

@@ -18,7 +18,7 @@ import javax.inject.Provider
 public class ModuleSpec
 private constructor(
     @get:JvmName("provider") public val provider: Provider<out NativeModule>,
-    @get:JvmName("moduleName") public val name: String? = null
+    @get:JvmName("moduleName") public val name: String? = null,
 ) {
   public fun getProvider(): Provider<out NativeModule> = provider
 
@@ -34,7 +34,7 @@ private constructor(
     @JvmStatic
     public fun nativeModuleSpec(
         type: Class<out NativeModule>,
-        provider: Provider<out NativeModule>
+        provider: Provider<out NativeModule>,
     ): ModuleSpec {
       val annotation: ReactModule? = type.getAnnotation(ReactModule::class.java)
 
@@ -42,7 +42,8 @@ private constructor(
         FLog.w(
             TAG,
             "Could not find @ReactModule annotation on ${type.name}. " +
-                "Creating the module eagerly to get the name. Consider adding the annotation.")
+                "Creating the module eagerly to get the name. Consider adding the annotation.",
+        )
         val nativeModule: NativeModule = provider.get()
         ModuleSpec(provider, nativeModule.name)
       } else {
@@ -53,7 +54,7 @@ private constructor(
     @JvmStatic
     public fun nativeModuleSpec(
         className: String,
-        provider: Provider<out NativeModule>
+        provider: Provider<out NativeModule>,
     ): ModuleSpec = ModuleSpec(provider, className)
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.facebook.react.bridge
 
 import com.facebook.react.bridge.ReactMarker.logMarker
@@ -19,9 +21,13 @@ import com.facebook.systrace.Systrace.endSection
 
 /** A set of Java APIs to expose to a particular JavaScript instance. */
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
 public class NativeModuleRegistry(
     private val reactApplicationContext: ReactApplicationContext,
-    private val modules: MutableMap<String, ModuleHolder>
+    private val modules: MutableMap<String, ModuleHolder>,
 ) {
   /** Private getters for combining NativeModuleRegistry's */
   private val moduleMap: Map<String, ModuleHolder>
@@ -37,7 +43,8 @@ public class NativeModuleRegistry(
   }
 
   @get:JvmName(
-      "getCxxModules") // This is needed till there are Java Consumer of this API inside React
+      "getCxxModules"
+  ) // This is needed till there are Java Consumer of this API inside React
   // Native
   internal val cxxModules: List<ModuleHolder>
     get() = buildList {
@@ -50,7 +57,8 @@ public class NativeModuleRegistry(
 
   /** Adds any new modules to the current module registry */
   @JvmName(
-      "registerModules") // This is needed till there are Java Consumer of this API inside React
+      "registerModules"
+  ) // This is needed till there are Java Consumer of this API inside React
   // Native
   internal fun registerModules(newRegister: NativeModuleRegistry) {
     check(reactApplicationContext == newRegister.reactApplicationContext) {
@@ -67,7 +75,8 @@ public class NativeModuleRegistry(
   }
 
   @JvmName(
-      "notifyJSInstanceDestroy") // This is needed till there are Java Consumer of this API inside
+      "notifyJSInstanceDestroy"
+  ) // This is needed till there are Java Consumer of this API inside
   // React Native
   internal fun notifyJSInstanceDestroy() {
     reactApplicationContext.assertOnNativeModulesQueueThread()
@@ -86,7 +95,8 @@ public class NativeModuleRegistry(
   internal fun notifyJSInstanceInitialized() {
     reactApplicationContext.assertOnNativeModulesQueueThread(
         "From version React Native v0.44, " +
-            "native modules are explicitly not initialized on the UI thread.")
+            "native modules are explicitly not initialized on the UI thread."
+    )
     logMarker(ReactMarkerConstants.NATIVE_MODULE_INITIALIZE_START)
     beginSection(Systrace.TRACE_TAG_REACT, "NativeModuleRegistry_notifyJSInstanceInitialized")
     try {
@@ -106,7 +116,9 @@ public class NativeModuleRegistry(
     // 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
     assertLegacyArchitecture(
-        "NativeModuleRegistry.onBatchComplete()", LegacyArchitectureLogLevel.WARNING)
+        "NativeModuleRegistry.onBatchComplete()",
+        LegacyArchitectureLogLevel.WARNING,
+    )
     modules["UIManager"]?.let {
       if (it.hasInstance()) {
         (it.module as OnBatchCompleteListener).onBatchComplete()
@@ -150,7 +162,9 @@ public class NativeModuleRegistry(
   private companion object {
     init {
       LegacyArchitectureLogger.assertLegacyArchitecture(
-          "NativeModuleRegistry", logLevel = LegacyArchitectureLogLevel.ERROR)
+          "NativeModuleRegistry",
+          logLevel = LegacyArchitectureLogLevel.ERROR,
+      )
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/NotThreadSafeBridgeIdleDebugListener.kt

@@ -6,6 +6,10 @@
  */
 
 package com.facebook.react.bridge
+
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
+import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
+
 /**
  * Interface for receiving notification for bridge idle/busy events. Should not affect application
  * logic and should only be used for debug/monitoring/testing purposes. Call
@@ -14,6 +18,8 @@ package com.facebook.react.bridge
  * NB: onTransitionToBridgeIdle and onTransitionToBridgeBusy may be called from different threads,
  * and those threads may not be the same thread on which the listener was originally registered.
  */
+@Deprecated("NotThreadSafeBridgeIdleDebugListener will be deleted in the new architecture.")
+@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
 public interface NotThreadSafeBridgeIdleDebugListener {
   /**
    * Called once all pending JS calls have resolved via an onBatchComplete call in the bridge and

package/ReactAndroid/src/main/java/com/facebook/react/bridge/OnBatchCompleteListener.kt

@@ -12,6 +12,10 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
 
 /** Interface for a module that will be notified when a batch of JS->Java calls has finished. */
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
-public fun interface OnBatchCompleteListener {
-  public fun onBatchComplete()
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
+internal fun interface OnBatchCompleteListener {
+  fun onBatchComplete()
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.kt

@@ -109,6 +109,7 @@ public interface Promise {
       message =
           """Prefer passing a module-specific error code to JS. Using this method will pass the
         error code EUNSPECIFIED""",
-      replaceWith = ReplaceWith("reject(code, message)"))
+      replaceWith = ReplaceWith("reject(code, message)"),
+  )
   public fun reject(message: String)
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.kt

@@ -133,7 +133,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
       code: String?,
       message: String?,
       throwable: Throwable?,
-      userInfo: WritableMap?
+      userInfo: WritableMap?,
   ) {
     if (reject == null) {
       resolve = null

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java

@@ -108,14 +108,8 @@ public abstract class ReactContext extends ContextWrapper {
     mInteropModuleRegistry = new InteropModuleRegistry();
   }
 
-  public void resetPerfStats() {
-    if (mNativeModulesMessageQueueThread != null) {
-      mNativeModulesMessageQueueThread.resetPerfStats();
-    }
-    if (mJSMessageQueueThread != null) {
-      mJSMessageQueueThread.resetPerfStats();
-    }
-  }
+  @Deprecated(since = "MessageQueueThread perf stats are no longer collected")
+  public void resetPerfStats() {}
 
   public void setJSExceptionHandler(@Nullable JSExceptionHandler jSExceptionHandler) {
     mJSExceptionHandler = jSExceptionHandler;

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.kt

@@ -26,7 +26,8 @@ public abstract class ReactContextBaseJavaModule : BaseJavaModule {
    */
   @Deprecated(
       "Deprecated in 0.80.0. Use getReactApplicationContext.getCurrentActivity() instead.",
-      ReplaceWith("reactApplicationContext.currentActivity"))
+      ReplaceWith("reactApplicationContext.currentActivity"),
+  )
   protected fun getCurrentActivity(): Activity? {
     return reactApplicationContext.currentActivity
   }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactCxxErrorHandler.kt

@@ -16,10 +16,16 @@ import java.lang.reflect.Method
 
 @DoNotStrip
 @LegacyArchitecture
-public object ReactCxxErrorHandler {
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
+internal object ReactCxxErrorHandler {
   init {
     LegacyArchitectureLogger.assertLegacyArchitecture(
-        "ReactCxxErrorHandler", LegacyArchitectureLogLevel.WARNING)
+        "ReactCxxErrorHandler",
+        LegacyArchitectureLogLevel.WARNING,
+    )
   }
 
   private var handleErrorFunc: Method? = null
@@ -27,7 +33,7 @@ public object ReactCxxErrorHandler {
 
   @DoNotStrip
   @JvmStatic
-  public fun setHandleErrorFunc(handlerObject: Any?, handleErrorFunc: Method?) {
+  fun setHandleErrorFunc(handlerObject: Any?, handleErrorFunc: Method?) {
     this.handlerObject = handlerObject
     this.handleErrorFunc = handleErrorFunc
   }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactInstanceManagerInspectorTarget.kt

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.facebook.react.bridge
 
 import com.facebook.jni.HybridData
@@ -17,6 +19,10 @@ import java.util.concurrent.Executor
 
 @DoNotStripAny
 @LegacyArchitecture
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
 internal class ReactInstanceManagerInspectorTarget(delegate: TargetDelegate) : AutoCloseable {
 
   @DoNotStripAny
@@ -44,7 +50,8 @@ internal class ReactInstanceManagerInspectorTarget(delegate: TargetDelegate) : A
               UiThreadUtil.runOnUiThread(command)
             }
           },
-          delegate)
+          delegate,
+      )
 
   private external fun initHybrid(executor: Executor, delegate: TargetDelegate): HybridData
 
@@ -62,8 +69,10 @@ internal class ReactInstanceManagerInspectorTarget(delegate: TargetDelegate) : A
   private companion object {
     init {
       LegacyArchitectureLogger.assertLegacyArchitecture(
-          "ReactInstanceManagerInspectorTarget", LegacyArchitectureLogLevel.WARNING)
-      BridgeSoLoader.staticInit()
+          "ReactInstanceManagerInspectorTarget",
+          LegacyArchitectureLogLevel.WARNING,
+      )
+      ReactNativeJNISoLoader.staticInit()
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.kt

@@ -77,8 +77,8 @@ public object ReactMarker {
       tag: String?,
       instanceKey: Int,
       timestamp: Long,
-      counter: Int
-  ): Unit {
+      counter: Int,
+  ) {
     for (listener in fabricMarkerListeners) {
       listener.logFabricMarker(name, tag, instanceKey, timestamp, counter)
     }
@@ -90,7 +90,7 @@ public object ReactMarker {
       name: ReactMarkerConstants,
       tag: String?,
       instanceKey: Int,
-      timestamp: Long
+      timestamp: Long,
   ) {
     for (listener in fabricMarkerListeners) {
       listener.logFabricMarker(name, tag, instanceKey, timestamp, 0)
@@ -145,12 +145,7 @@ public object ReactMarker {
   @JvmStatic
   @DoNotStrip
   @AnyThread
-  public fun logMarker(
-      name: ReactMarkerConstants,
-      tag: String?,
-      instanceKey: Int,
-      time: Long?
-  ): Unit {
+  public fun logMarker(name: ReactMarkerConstants, tag: String?, instanceKey: Int, time: Long?) {
     logFabricMarker(name, tag, instanceKey)
     for (listener in listeners) {
       listener.logMarker(name, tag, instanceKey)
@@ -161,7 +156,7 @@ public object ReactMarker {
 
   @JvmStatic
   @DoNotStrip
-  private fun notifyNativeMarker(name: ReactMarkerConstants, time: Long?): Unit {
+  private fun notifyNativeMarker(name: ReactMarkerConstants, time: Long?) {
     if (!name.hasMatchingNameMarker) {
       return
     }
@@ -198,15 +193,15 @@ public object ReactMarker {
         name: ReactMarkerConstants,
         tag: String?,
         instanceKey: Int,
-        timestamp: Long
-    ): Unit
+        timestamp: Long,
+    )
 
     public fun logFabricMarker(
         name: ReactMarkerConstants,
         tag: String?,
         instanceKey: Int,
         timestamp: Long,
-        counter: Int
+        counter: Int,
     ): Unit = logFabricMarker(name, tag, instanceKey, timestamp)
   }
 }