react-native-tvos 0.78.0-0rc3 → 0.79.0-0

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java

@@ -11,6 +11,7 @@ import android.util.SparseArray;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.JSApplicationCausedNativeException;
@@ -51,6 +52,7 @@ import java.util.Set;
  *
  * <p>IMPORTANT: This class should be accessed only from the UI Thread
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class NativeAnimatedNodesManager implements EventDispatcherListener {
 
   private static final String TAG = "NativeAnimatedNodesManager";
@@ -252,7 +254,10 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
 
   @UiThread
   public void startAnimatingNode(
-      int animationId, int animatedNodeTag, ReadableMap animationConfig, Callback endCallback) {
+      int animationId,
+      int animatedNodeTag,
+      ReadableMap animationConfig,
+      @Nullable Callback endCallback) {
     AnimatedNode node = mAnimatedNodes.get(animatedNodeTag);
     if (node == null) {
       throw new JSApplicationIllegalArgumentException(
@@ -306,6 +311,7 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
           // Invoke animation end callback with {finished: false}
           WritableMap endCallbackResponse = Arguments.createMap();
           endCallbackResponse.putBoolean("finished", false);
+          // NULLSAFE_FIXME[Nullable Dereference]
           endCallbackResponse.putDouble("value", animation.animatedValue.nodeValue);
           animation.endCallback.invoke(endCallbackResponse);
         } else if (mReactApplicationContext != null) {
@@ -315,6 +321,7 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
           WritableMap params = Arguments.createMap();
           params.putInt("animationId", animation.id);
           params.putBoolean("finished", false);
+          // NULLSAFE_FIXME[Nullable Dereference]
           params.putDouble("value", animation.animatedValue.nodeValue);
           if (events == null) {
             events = Arguments.createArray();
@@ -344,6 +351,7 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
           // Invoke animation end callback with {finished: false}
           WritableMap endCallbackResponse = Arguments.createMap();
           endCallbackResponse.putBoolean("finished", false);
+          // NULLSAFE_FIXME[Nullable Dereference]
           endCallbackResponse.putDouble("value", animation.animatedValue.nodeValue);
           animation.endCallback.invoke(endCallbackResponse);
         } else if (mReactApplicationContext != null) {
@@ -353,6 +361,7 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
           WritableMap params = Arguments.createMap();
           params.putInt("animationId", animation.id);
           params.putBoolean("finished", false);
+          // NULLSAFE_FIXME[Nullable Dereference]
           params.putDouble("value", animation.animatedValue.nodeValue);
           if (events == null) {
             events = Arguments.createArray();
@@ -537,8 +546,11 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
     }
 
     ReadableArray path = eventMapping.getArray("nativeEventPath");
+    // NULLSAFE_FIXME[Nullable Dereference]
     List<String> pathList = new ArrayList<>(path.size());
+    // NULLSAFE_FIXME[Nullable Dereference]
     for (int i = 0; i < path.size(); i++) {
+      // NULLSAFE_FIXME[Nullable Dereference]
       pathList.add(path.getString(i));
     }
 
@@ -562,8 +574,11 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
     ListIterator<EventAnimationDriver> it = mEventDrivers.listIterator();
     while (it.hasNext()) {
       EventAnimationDriver driver = it.next();
+      // NULLSAFE_FIXME[Nullable Dereference]
       if (eventName.equals(driver.eventName)
+          // NULLSAFE_FIXME[Nullable Dereference]
           && viewTag == driver.viewTag
+          // NULLSAFE_FIXME[Nullable Dereference]
           && animatedValueTag == driver.valueNode.tag) {
         it.remove();
         break;
@@ -664,6 +679,7 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
           if (animation.endCallback != null) {
             WritableMap endCallbackResponse = Arguments.createMap();
             endCallbackResponse.putBoolean("finished", true);
+            // NULLSAFE_FIXME[Nullable Dereference]
             endCallbackResponse.putDouble("value", animation.animatedValue.nodeValue);
             animation.endCallback.invoke(endCallbackResponse);
           } else if (mReactApplicationContext != null) {
@@ -673,6 +689,7 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
             WritableMap params = Arguments.createMap();
             params.putInt("animationId", animation.id);
             params.putBoolean("finished", true);
+            // NULLSAFE_FIXME[Nullable Dereference]
             params.putDouble("value", animation.animatedValue.nodeValue);
             if (events == null) {
               events = Arguments.createArray();
@@ -738,8 +755,11 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
 
     while (!nodesQueue.isEmpty()) {
       AnimatedNode nextNode = nodesQueue.poll();
+      // NULLSAFE_FIXME[Nullable Dereference]
       if (nextNode.children != null) {
+        // NULLSAFE_FIXME[Nullable Dereference]
         for (int i = 0; i < nextNode.children.size(); i++) {
+          // NULLSAFE_FIXME[Nullable Dereference]
           AnimatedNode child = nextNode.children.get(i);
           child.activeIncomingNodes++;
           if (child.BFSColor != mAnimatedGraphBFSColor) {
@@ -780,6 +800,7 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
     while (!nodesQueue.isEmpty()) {
       AnimatedNode nextNode = nodesQueue.poll();
       try {
+        // NULLSAFE_FIXME[Nullable Dereference]
         nextNode.update();
         if (nextNode instanceof PropsAnimatedNode) {
           // Send property updates to native view manager
@@ -799,8 +820,11 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
         // Potentially send events to JS when the node's value is updated
         ((ValueAnimatedNode) nextNode).onValueUpdate();
       }
+      // NULLSAFE_FIXME[Nullable Dereference]
       if (nextNode.children != null) {
+        // NULLSAFE_FIXME[Nullable Dereference]
         for (int i = 0; i < nextNode.children.size(); i++) {
+          // NULLSAFE_FIXME[Nullable Dereference]
           AnimatedNode child = nextNode.children.get(i);
           child.activeIncomingNodes--;
           if (child.BFSColor != mAnimatedGraphBFSColor && child.activeIncomingNodes == 0) {

package/ReactAndroid/src/main/java/com/facebook/react/animated/PropsAnimatedNode.kt

@@ -40,7 +40,7 @@ internal class PropsAnimatedNode(
     }
   }
 
-  public fun connectToView(viewTag: Int, uiManager: UIManager?) {
+  fun connectToView(viewTag: Int, uiManager: UIManager?) {
     if (connectedViewTag != -1) {
       throw JSApplicationIllegalArgumentException(
           "Animated node $tag is already attached to a view: $connectedViewTag")
@@ -49,7 +49,7 @@ internal class PropsAnimatedNode(
     connectedViewUIManager = uiManager
   }
 
-  public fun disconnectFromView(viewTag: Int) {
+  fun disconnectFromView(viewTag: Int) {
     if (connectedViewTag != viewTag && connectedViewTag != -1) {
       throw JSApplicationIllegalArgumentException(
           "Attempting to disconnect view that has " +
@@ -59,7 +59,7 @@ internal class PropsAnimatedNode(
     connectedViewTag = -1
   }
 
-  public fun restoreDefaultValues() {
+  fun restoreDefaultValues() {
     // Cannot restore default values if this view has already been disconnected.
     if (connectedViewTag == -1) {
       return
@@ -79,7 +79,7 @@ internal class PropsAnimatedNode(
     connectedViewUIManager?.synchronouslyUpdateViewOnUIThread(connectedViewTag, propMap)
   }
 
-  public fun updateView() {
+  fun updateView() {
     if (connectedViewTag == -1) {
       return
     }
@@ -109,8 +109,8 @@ internal class PropsAnimatedNode(
     connectedViewUIManager?.synchronouslyUpdateViewOnUIThread(connectedViewTag, propMap)
   }
 
-  public val connectedView: View?
-    // resolveView throws an {@link IllegalViewOperationException} when the view doesn't exist
+  val connectedView: View?
+    // resolveView throws an [IllegalViewOperationException] when the view doesn't exist
     // (this can happen if the surface is being deallocated).
     get() = runCatching { connectedViewUIManager?.resolveView(connectedViewTag) }.getOrNull()
 

package/ReactAndroid/src/main/java/com/facebook/react/animated/StyleAnimatedNode.kt

@@ -31,7 +31,7 @@ internal class StyleAnimatedNode(
         }
   }
 
-  public fun collectViewUpdates(propsMap: JavaOnlyMap) {
+  fun collectViewUpdates(propsMap: JavaOnlyMap) {
     for ((key, value) in propMapping) {
       val node = nativeAnimatedNodesManager.getNodeById(value)
       requireNotNull(node) { "Mapped style node does not exist" }

package/ReactAndroid/src/main/java/com/facebook/react/animated/TrackingAnimatedNode.kt

@@ -19,7 +19,7 @@ internal class TrackingAnimatedNode(
   private val toValueNode: Int = config.getInt("toValue")
   private val valueNode: Int = config.getInt("value")
 
-  public override fun update() {
+  override fun update() {
     val toValue = nativeAnimatedNodesManager.getNodeById(toValueNode)
     val valAnimatedNode = toValue as? ValueAnimatedNode
     if (valAnimatedNode != null) {
@@ -30,7 +30,7 @@ internal class TrackingAnimatedNode(
     nativeAnimatedNodesManager.startAnimatingNode(animationId, valueNode, animationConfig, null)
   }
 
-  public override fun prettyPrint(): String =
+  override fun prettyPrint(): String =
       "TrackingAnimatedNode[$tag]: animationID: $animationId toValueNode: $toValueNode " +
           "valueNode: $valueNode animationConfig: $animationConfig"
 }

package/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt

@@ -26,7 +26,7 @@ internal class TransformAnimatedNode(
     transformConfigs =
         if (transforms == null) emptyList()
         else
-            List<TransformConfig>(transforms.size()) { i ->
+            List(transforms.size()) { i ->
               val transformConfigMap = checkNotNull(transforms.getMap(i))
               val property = transformConfigMap.getString("property")
               val type = transformConfigMap.getString("type")
@@ -44,9 +44,9 @@ internal class TransformAnimatedNode(
             }
   }
 
-  public fun collectViewUpdates(propsMap: JavaOnlyMap) {
+  fun collectViewUpdates(propsMap: JavaOnlyMap) {
     val transforms =
-        List<JavaOnlyMap>(transformConfigs.size) { i ->
+        List(transformConfigs.size) { i ->
           val transformConfig = transformConfigs[i]
           val transform =
               if (transformConfig is AnimatedTransformConfig) {

package/ReactAndroid/src/main/java/com/facebook/react/animated/ValueAnimatedNode.kt

@@ -13,38 +13,37 @@ import com.facebook.react.bridge.ReadableMap
  * Basic type of animated node that maps directly from {@code Animated.Value(x)} of Animated.js
  * library.
  */
-public open class ValueAnimatedNode(config: ReadableMap? = null) : AnimatedNode() {
+internal open class ValueAnimatedNode(config: ReadableMap? = null) : AnimatedNode() {
   @JvmField internal var nodeValue: Double = config?.getDouble("value") ?: Double.NaN
   @JvmField internal var offset: Double = config?.getDouble("offset") ?: 0.0
   private var valueListener: AnimatedNodeValueListener? = null
 
-  public fun getValue(): Double {
+  fun getValue(): Double {
     if ((offset + nodeValue).isNaN()) {
       this.update()
     }
     return offset + nodeValue
   }
 
-  public open fun getAnimatedObject(): Any? = null
+  open fun getAnimatedObject(): Any? = null
 
-  public fun flattenOffset(): Unit {
+  fun flattenOffset(): Unit {
     nodeValue += offset
     offset = 0.0
   }
 
-  public fun extractOffset(): Unit {
+  fun extractOffset(): Unit {
     offset += nodeValue
     nodeValue = 0.0
   }
 
-  public fun onValueUpdate(): Unit {
+  fun onValueUpdate(): Unit {
     valueListener?.onValueUpdate(getValue())
   }
 
-  public fun setValueListener(listener: AnimatedNodeValueListener?): Unit {
+  fun setValueListener(listener: AnimatedNodeValueListener?): Unit {
     valueListener = listener
   }
 
-  override public fun prettyPrint(): String =
-      "ValueAnimatedNode[$tag]: value: $nodeValue offset: $offset"
+  override fun prettyPrint(): String = "ValueAnimatedNode[$tag]: value: $nodeValue offset: $offset"
 }

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

@@ -7,7 +7,10 @@
 
 package com.facebook.react.bridge;
 
+import com.facebook.react.common.annotations.internal.LegacyArchitecture;
+
 /** Implementation of javascript callback function that use Bridge to schedule method execution */
+@LegacyArchitecture
 public final class CallbackImpl implements Callback {
 
   private final JSInstance mJSInstance;

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

@@ -10,6 +10,7 @@ package com.facebook.react.bridge
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.queue.ReactQueueConfiguration
 import com.facebook.react.common.annotations.VisibleForTesting
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
 import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
 import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder
@@ -23,6 +24,7 @@ import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHol
     message =
         "This class is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.")
 @DoNotStrip
+@LegacyArchitecture
 public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundleLoaderDelegate {
   public fun runJSBundle()
 
@@ -91,8 +93,8 @@ public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundle
   @VisibleForTesting public fun setGlobalVariable(propName: String, jsonValue: String)
 
   /**
-   * Do not use this anymore. Use {@link #getRuntimeExecutor()} instead. Get the C pointer (as a
-   * long) to the JavaScriptCore context associated with this instance.
+   * Do not use this anymore. Use [getRuntimeExecutor] instead. Get the C pointer (as a long) to the
+   * JavaScriptCore context associated with this instance.
    *
    * <p>Use the following pattern to ensure that the JS context is not cleared while you are using
    * it: JavaScriptContextHolder jsContext = reactContext.getJavaScriptContextHolder()

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge
+
+import com.facebook.jni.HybridClassBase
+import com.facebook.proguard.annotations.DoNotStrip
+
+/** Callback impl that calls directly into the cxx bridge. Created from C++. */
+@DoNotStrip
+public class CxxCallbackImpl @DoNotStrip private constructor() : HybridClassBase(), Callback {
+  override fun invoke(vararg args: Any?) {
+    nativeInvoke(Arguments.fromJavaArgs(args))
+  }
+
+  private external fun nativeInvoke(arguments: NativeArray)
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/{CxxModuleWrapper.java → CxxModuleWrapper.kt}

@@ -5,15 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.bridge;
+package com.facebook.react.bridge
 
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
 
 /** This does nothing interesting, except avoid breaking existing code. */
 @DoNotStrip
-public class CxxModuleWrapper extends CxxModuleWrapperBase {
-  protected CxxModuleWrapper(HybridData hd) {
-    super(hd);
-  }
-}
+public open class CxxModuleWrapper protected constructor(hybridData: HybridData) :
+    CxxModuleWrapperBase(hybridData)

package/ReactAndroid/src/main/java/com/facebook/react/bridge/{DefaultJSExceptionHandler.java → DefaultJSExceptionHandler.kt}

@@ -5,19 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.bridge;
+package com.facebook.react.bridge
 
 /** Crashy crashy exception handler. */
-public class DefaultJSExceptionHandler implements JSExceptionHandler {
-
-  @Override
-  public void handleException(Exception e) {
-    if (e instanceof RuntimeException) {
+public class DefaultJSExceptionHandler : JSExceptionHandler {
+  override fun handleException(e: Exception) {
+    throw if (e is RuntimeException) {
       // Because we are rethrowing the original exception, the original stacktrace will be
       // preserved.
-      throw (RuntimeException) e;
+      e
     } else {
-      throw new RuntimeException(e);
+      RuntimeException(e)
     }
   }
 }

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge
+
+import com.facebook.yoga.YogaUnit
+import com.facebook.yoga.YogaValue
+
+internal class DimensionPropConverter {
+  companion object {
+    @JvmStatic
+    fun getDimension(value: Any?): YogaValue? {
+      return when (value) {
+        null -> null
+        is Double -> YogaValue(value.toFloat(), YogaUnit.POINT)
+        is String -> YogaValue.parse(value)
+        else ->
+            throw JSApplicationCausedNativeException(
+                "DimensionValue: the value must be a number or string.")
+      }
+    }
+  }
+}

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

@@ -10,9 +10,9 @@ package com.facebook.react.bridge
 import com.facebook.proguard.annotations.DoNotStrip
 
 /**
- * Exception thrown by {@link ReadableMapKeySetIterator#nextKey()} when the iterator tries to
- * iterate over elements after the end of the key set.
+ * Exception thrown by [ReadableMapKeySetIterator.nextKey] when the iterator tries to iterate over
+ * elements after the end of the key set.
  */
 @DoNotStrip
-public class InvalidIteratorException public @DoNotStrip constructor(msg: String) :
+public class InvalidIteratorException @DoNotStrip public constructor(msg: String) :
     RuntimeException(msg) {}

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

@@ -92,21 +92,6 @@ public abstract class JSBundleLoader {
     };
   }
 
-  /**
-   * This loader is used when proxy debugging is enabled. In that case there is no point in fetching
-   * the bundle from device as remote executor will have to do it anyway.
-   */
-  public static JSBundleLoader createRemoteDebuggerBundleLoader(
-      final String proxySourceURL, final String realSourceURL) {
-    return new JSBundleLoader() {
-      @Override
-      public String loadScript(JSBundleLoaderDelegate delegate) {
-        delegate.setSourceURLs(realSourceURL, proxySourceURL);
-        return realSourceURL;
-      }
-    };
-  }
-
   /** Loads the script, returning the URL of the source it loaded. */
   public abstract String loadScript(JSBundleLoaderDelegate delegate);
 }

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

@@ -10,7 +10,7 @@ package com.facebook.react.bridge
 /** Exception thrown when a native module method call receives unexpected arguments from JS. */
 internal class NativeArgumentsParseException : JSApplicationCausedNativeException {
 
-  public constructor(detailMessage: String) : super(detailMessage)
+  constructor(detailMessage: String) : super(detailMessage)
 
-  public constructor(detailMessage: String, throwable: Throwable?) : super(detailMessage, throwable)
+  constructor(detailMessage: String, throwable: Throwable?) : super(detailMessage, throwable)
 }

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

@@ -10,10 +10,10 @@ package com.facebook.react.bridge
 import com.facebook.proguard.annotations.DoNotStrip
 
 /**
- * Exception thrown when a caller attempts to modify or use a {@link WritableNativeArray} or {@link
- * WritableNativeMap} after it has already been added to a parent array or map. This is unsafe since
- * we reuse the native memory so the underlying array/map is no longer valid.
+ * Exception thrown when a caller attempts to modify or use a [WritableNativeArray] or
+ * [WritableNativeMap] after it has already been added to a parent array or map. This is unsafe
+ * since we reuse the native memory so the underlying array/map is no longer valid.
  */
 @DoNotStrip
-internal class ObjectAlreadyConsumedException
-public @DoNotStrip constructor(detailMessage: String) : RuntimeException(detailMessage) {}
+internal class ObjectAlreadyConsumedException @DoNotStrip constructor(detailMessage: String) :
+    RuntimeException(detailMessage)

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

@@ -11,7 +11,7 @@ package com.facebook.react.bridge
  * Interface that represents a JavaScript Promise which can be passed to the native module as a
  * method parameter.
  *
- * Methods annotated with {@link ReactMethod} that use a {@link Promise} as the last parameter
+ * Methods annotated with [ReactMethod] that use a [Promise] as the last parameter
  * will be marked as "promise" and will return a promise when invoked from JavaScript.
  */
 public interface Promise {

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge
+
+import android.os.SystemClock
+import com.facebook.soloader.SoLoader
+import com.facebook.systrace.Systrace
+import com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE
+
+internal object ReactBridge {
+  @Volatile private var _loadStartTime: Long = 0
+  @Volatile private var _loadEndTime: Long = 0
+  @Volatile private var _didInit: Boolean = false
+
+  @JvmStatic
+  @Synchronized
+  fun staticInit() {
+    if (_didInit) {
+      return
+    }
+    _loadStartTime = SystemClock.uptimeMillis()
+    Systrace.beginSection(
+        TRACE_TAG_REACT_JAVA_BRIDGE, "ReactBridge.staticInit::load:reactnativejni")
+    ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_SO_FILE_START)
+    SoLoader.loadLibrary("reactnativejni")
+    ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_SO_FILE_END)
+    Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE)
+    _loadEndTime = SystemClock.uptimeMillis()
+    _didInit = true
+  }
+
+  @JvmStatic
+  val loadStartTime: Long
+    get() = _loadStartTime
+
+  @JvmStatic
+  val loadEndTime: Long
+    get() = _loadEndTime
+
+  @JvmStatic
+  val initialized: Boolean
+    @JvmName("isInitialized") get() = _didInit
+}

package/ReactAndroid/src/main/java/com/facebook/react/bridge/{ReactMarkerConstants.java → ReactMarkerConstants.kt}

@@ -5,10 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.bridge;
+package com.facebook.react.bridge
 
 /** Constants used by ReactMarker. */
-public enum ReactMarkerConstants {
+public enum class ReactMarkerConstants(
+    @get:JvmName("hasMatchingNameMarker") public val hasMatchingNameMarker: Boolean = false
+) {
   APP_STARTUP_START(true),
   APP_STARTUP_END(true),
   CREATE_REACT_CONTEXT_START,
@@ -124,21 +126,5 @@ public enum ReactMarkerConstants {
   REACT_BRIDGE_LOADING_START,
   REACT_BRIDGE_LOADING_END,
   REACT_BRIDGELESS_LOADING_START,
-  REACT_BRIDGELESS_LOADING_END,
-  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_START,
-  LOAD_REACT_NATIVE_MAPBUFFER_SO_FILE_END;
-
-  private boolean mHasMatchingNameMarker;
-
-  ReactMarkerConstants() {
-    this(false);
-  }
-
-  ReactMarkerConstants(boolean hasMatchingNameMarker) {
-    mHasMatchingNameMarker = hasMatchingNameMarker;
-  }
-
-  public boolean hasMatchingNameMarker() {
-    return mHasMatchingNameMarker;
-  }
+  REACT_BRIDGELESS_LOADING_END
 }

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

@@ -10,5 +10,5 @@ package com.facebook.react.bridge
 import com.facebook.proguard.annotations.DoNotStripAny
 
 @DoNotStripAny
-@Deprecated("Use {@link TurboModule} to identify generated specs")
+@Deprecated("Use [TurboModule] to identify generated specs")
 public interface ReactModuleWithSpec

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

@@ -19,6 +19,8 @@ public object ReactSoftExceptionLogger {
     public const val RVG_IS_VIEW_CLIPPED: String = "ReactViewGroup.isViewClipped"
     public const val RVG_ON_VIEW_REMOVED: String = "ReactViewGroup.onViewRemoved"
     public const val SOFT_ASSERTIONS: String = "SoftAssertions"
+    public const val SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE: String =
+        "SurfaceMountingManager:MissingViewState"
   }
 
   // Use a list instead of a set here because we expect the number of listeners

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

@@ -86,7 +86,7 @@ public open class ReadableNativeArray protected constructor() : NativeArray(), R
   private companion object {
     @get:JvmStatic
     @get:JvmName("getJNIPassCounter")
-    public var jniPassCounter: Int = 0
+    var jniPassCounter: Int = 0
       private set
   }
 }

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

@@ -179,7 +179,7 @@ public open class ReadableNativeMap protected constructor() : NativeMap(), Reada
   private companion object {
     @get:JvmStatic
     @get:JvmName("getJNIPassCounter")
-    public var jniPassCounter: Int = 0
+    var jniPassCounter: Int = 0
       private set
   }
 }

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

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge
+
+import com.facebook.jni.HybridClassBase
+import com.facebook.proguard.annotations.DoNotStrip
+
+/** A Kotlin holder for a C++ RuntimeExecutor. */
+@DoNotStrip public class RuntimeExecutor @DoNotStrip private constructor() : HybridClassBase()

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

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge
+
+import com.facebook.jni.HybridClassBase
+import com.facebook.proguard.annotations.DoNotStrip
+
+/** A Kotlin holder for a C++ RuntimeScheduler. */
+@DoNotStrip public class RuntimeScheduler @DoNotStrip private constructor() : HybridClassBase()

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

@@ -8,11 +8,11 @@
 package com.facebook.react.bridge
 
 /**
- * {@link UIManagerProvider} is used to create UIManager objects during the initialization of React
+ * [UIManagerProvider] is used to create UIManager objects during the initialization of React
  * Native.
  */
 public fun interface UIManagerProvider {
 
-  /* Provides a {@link com.facebook.react.bridge.UIManager} for the context received as a parameter. */
+  /* Provides a [com.facebook.react.bridge.UIManager] for the context received as a parameter. */
   public fun createUIManager(context: ReactApplicationContext): UIManager?
 }