react-native-tvos 0.77.0-0rc5 → 0.78.0-0

package/ReactAndroid/build.gradle.kts

@@ -99,7 +99,7 @@ val preparePrefab by
                       // jsiinpsector
                       Pair("../ReactCommon/jsinspector-modern/", "jsinspector-modern/"),
                       // mapbufferjni
-                      Pair("src/main/jni/react/mapbuffer", "react/mapbuffer/"),
+                      Pair("src/main/jni/react/mapbuffer", ""),
                       // turbomodulejsijni
                       Pair("src/main/jni/react/turbomodule", ""),
                       // react_codegen_rncore
@@ -193,7 +193,6 @@ val preparePrefab by
                       Pair("../ReactCommon/callinvoker/", ""),
                       Pair("../ReactCommon/cxxreact/", "cxxreact/"),
                       Pair("../ReactCommon/react/bridging/", "react/bridging/"),
-                      Pair("../ReactCommon/react/config/", "react/config/"),
                       Pair("../ReactCommon/react/nativemodule/core/", ""),
                       Pair("../ReactCommon/react/nativemodule/core/platform/android/", ""),
                       Pair(
@@ -398,13 +397,6 @@ val prepareGlog by
       outputDir.set(File(thirdPartyNdkDir, "glog"))
     }
 
-// Create Android native library module based on jsc from npm
-val prepareJSC by
-    tasks.registering(PrepareJSCTask::class) {
-      jscPackagePath.set(findNodeModulePath(projectDir, "jsc-android"))
-      outputDir = project.layout.buildDirectory.dir("third-party-ndk/jsc")
-    }
-
 val prepareKotlinBuildScriptModel by
     tasks.registering {
       // This task is run when Gradle Sync is running.
@@ -522,6 +514,7 @@ android {
     buildConfigField("boolean", "IS_INTERNAL_BUILD", "false")
     buildConfigField("int", "EXOPACKAGE_FLAGS", "0")
     buildConfigField("boolean", "UNSTABLE_ENABLE_FUSEBOX_RELEASE", "false")
+    buildConfigField("boolean", "ENABLE_PERFETTO", "false")
 
     resValue("integer", "react_native_dev_server_port", reactNativeDevServerPort())
 
@@ -579,7 +572,6 @@ android {
           prepareFolly,
           prepareGlog,
           prepareGtest,
-          prepareJSC,
           preparePrefab)
   tasks.getByName("generateCodegenSchemaFromJavaScript").dependsOn(buildCodegenCLI)
   prepareKotlinBuildScriptModel.dependsOn("preBuild")
@@ -593,7 +585,8 @@ android {
             "src/main/res/shell",
             "src/main/res/views/alert",
             "src/main/res/views/modal",
-            "src/main/res/views/uimanager"))
+            "src/main/res/views/uimanager",
+            "src/main/res/views/view"))
     java.exclude("com/facebook/react/processing")
     java.exclude("com/facebook/react/module/processing")
   }
@@ -665,13 +658,15 @@ dependencies {
   compileOnly(libs.javax.annotation.api)
   api(libs.javax.inject)
 
-  // It's up to the consumer to decide if hermes should be included or not.
-  // Therefore hermes-engine is a compileOnly dependency.
+  // It's up to the consumer to decide if hermes/jsc should be included or not.
+  // Therefore hermes-engine and jsc are compileOnly dependencies.
   compileOnly(project(":packages:react-native:ReactAndroid:hermes-engine"))
+  compileOnly(libs.jsc.android)
 
   testImplementation(libs.junit)
   testImplementation(libs.assertj)
   testImplementation(libs.mockito)
+  testImplementation(libs.mockito.kotlin)
   testImplementation(libs.robolectric)
   testImplementation(libs.thoughtworks)
 }

package/ReactAndroid/cmake-utils/ReactNative-application.cmake

@@ -39,9 +39,19 @@ if (PROJECT_ROOT_DIR)
 # variable is defined if user need to access it.
 endif ()
 
-file(GLOB input_SRC CONFIGURE_DEPENDS
-        ${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp
-        ${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
+file(GLOB override_cpp_SRC CONFIGURE_DEPENDS *.cpp)
+# We check if the user is providing a custom OnLoad.cpp file. If so, we pick that
+# for compilation. Otherwise we fallback to using the `default-app-setup/OnLoad.cpp` 
+# file instead.
+if(override_cpp_SRC)
+        file(GLOB input_SRC CONFIGURE_DEPENDS
+                *.cpp
+                ${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
+else()
+        file(GLOB input_SRC CONFIGURE_DEPENDS
+                ${REACT_ANDROID_DIR}/cmake-utils/default-app-setup/*.cpp
+                ${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
+endif()
 
 add_library(${CMAKE_PROJECT_NAME} SHARED ${input_SRC})
 

package/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp

@@ -73,6 +73,8 @@ std::shared_ptr<TurboModule> cxxModuleProvider(
 
   // And we fallback to the CXX module providers autolinked
   return autolinking_cxxModuleProvider(name, jsInvoker);
+
+  return nullptr;
 }
 
 std::shared_ptr<TurboModule> javaModuleProvider(

package/ReactAndroid/external-artifacts/build.gradle.kts

@@ -17,13 +17,13 @@ version =
     parent?.extraProperties?.get("publishing_version")
         ?: error("publishing_version not set for external-artifacts")
 
-configurations.maybeCreate("default")
+configurations.maybeCreate("externalArtifacts")
 
 // Those artifacts should be placed inside the `artifacts/hermes-ios-*.tar.gz` location.
 val hermesiOSDebugArtifactFile: RegularFile =
     layout.projectDirectory.file("artifacts/hermes-ios-debug.tar.gz")
 val hermesiOSDebugArtifact: PublishArtifact =
-    artifacts.add("default", hermesiOSDebugArtifactFile) {
+    artifacts.add("externalArtifacts", hermesiOSDebugArtifactFile) {
       type = "tgz"
       extension = "tar.gz"
       classifier = "hermes-ios-debug"
@@ -31,7 +31,7 @@ val hermesiOSDebugArtifact: PublishArtifact =
 val hermesiOSReleaseArtifactFile: RegularFile =
     layout.projectDirectory.file("artifacts/hermes-ios-release.tar.gz")
 val hermesiOSReleaseArtifact: PublishArtifact =
-    artifacts.add("default", hermesiOSReleaseArtifactFile) {
+    artifacts.add("externalArtifacts", hermesiOSReleaseArtifactFile) {
       type = "tgz"
       extension = "tar.gz"
       classifier = "hermes-ios-release"
@@ -41,7 +41,7 @@ val hermesiOSReleaseArtifact: PublishArtifact =
 val hermesDSYMDebugArtifactFile: RegularFile =
     layout.projectDirectory.file("artifacts/hermes-framework-dSYM-debug.tar.gz")
 val hermesDSYMDebugArtifact: PublishArtifact =
-    artifacts.add("default", hermesDSYMDebugArtifactFile) {
+    artifacts.add("externalArtifacts", hermesDSYMDebugArtifactFile) {
       type = "tgz"
       extension = "tar.gz"
       classifier = "hermes-framework-dSYM-debug"
@@ -49,7 +49,7 @@ val hermesDSYMDebugArtifact: PublishArtifact =
 val hermesDSYMReleaseArtifactFile: RegularFile =
     layout.projectDirectory.file("artifacts/hermes-framework-dSYM-release.tar.gz")
 val hermesDSYMReleaseArtifact: PublishArtifact =
-    artifacts.add("default", hermesDSYMReleaseArtifactFile) {
+    artifacts.add("externalArtifacts", hermesDSYMReleaseArtifactFile) {
       type = "tgz"
       extension = "tar.gz"
       classifier = "hermes-framework-dSYM-release"

package/ReactAndroid/gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=0.77.0-0rc5
-react.internal.publishingGroup=com.facebook.react
+VERSION_NAME=0.78.0-0
+react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true
 
@@ -31,4 +31,4 @@ binaryCompatibilityValidator.ignoredPackages=com.facebook.debug,\
 binaryCompatibilityValidator.nonPublicMarkers=com.facebook.react.common.annotations.VisibleForTesting,\
   com.facebook.react.common.annotations.UnstableReactNativeAPI
 binaryCompatibilityValidator.validationDisabled=true
-binaryCompatibilityValidator.outputApiFileName=ReactAndroid
+binaryCompatibilityValidator.outputApiFileName=ReactAndroid

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/{HermesMemoryDumper.java → HermesMemoryDumper.kt}

@@ -5,14 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.hermes.instrumentation;
+package com.facebook.hermes.instrumentation
 
 public interface HermesMemoryDumper {
-  boolean shouldSaveSnapshot();
+  public fun shouldSaveSnapshot(): Boolean
 
-  String getInternalStorage();
+  public fun getInternalStorage(): String
 
-  String getId();
+  public fun getId(): String
 
-  void setMetaData(String crashId);
+  public fun setMetaData(crashId: String)
 }

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/{HermesSamplingProfiler.java → HermesSamplingProfiler.kt}

@@ -5,28 +5,26 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.hermes.instrumentation;
+package com.facebook.hermes.instrumentation
 
-import com.facebook.soloader.SoLoader;
+import com.facebook.soloader.SoLoader
 
 /** Hermes sampling profiler static JSI API. */
-public class HermesSamplingProfiler {
-  static {
-    SoLoader.loadLibrary("jsijniprofiler");
+public object HermesSamplingProfiler {
+  init {
+    SoLoader.loadLibrary("jsijniprofiler")
   }
 
   /** Start sample profiling. */
-  public static native void enable();
+  @JvmStatic public external fun enable()
 
   /** Stop sample profiling. */
-  public static native void disable();
+  @JvmStatic public external fun disable()
 
   /**
    * Dump sampled stack traces to file.
    *
    * @param filename the file to dump sampling trace to.
    */
-  public static native void dumpSampledTraceToFile(String filename);
-
-  private HermesSamplingProfiler() {}
+  @JvmStatic public external fun dumpSampledTraceToFile(filename: String)
 }

package/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java

@@ -11,9 +11,6 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.common.ClassFinder;
-import com.facebook.react.devsupport.JSCHeapCapture;
-import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.module.annotations.ReactModuleList;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
@@ -22,20 +19,17 @@ import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.views.debuggingoverlay.DebuggingOverlayManager;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.inject.Provider;
 
 /**
  * Package defining core framework modules (e.g. UIManager). It should be used for modules that
  * require special integration with other framework parts (e.g. with the list of packages to load
  * view managers from).
  */
-@ReactModuleList(
-    nativeModules = {
-      JSCHeapCapture.class,
-    })
+@ReactModuleList(nativeModules = {})
 /* package */
 public class DebugCorePackage extends BaseReactPackage implements ViewManagerOnDemandReactPackage {
   private @Nullable Map<String, ModuleSpec> mViewManagers;
@@ -44,59 +38,17 @@ public class DebugCorePackage extends BaseReactPackage implements ViewManagerOnD
 
   @Override
   public @Nullable NativeModule getModule(String name, ReactApplicationContext reactContext) {
-    switch (name) {
-      case JSCHeapCapture.NAME:
-        return new JSCHeapCapture(reactContext);
-      default:
-        return null;
-    }
+    return null;
   }
 
   @Override
   public ReactModuleInfoProvider getReactModuleInfoProvider() {
-    if (!ClassFinder.canLoadClassesFromAnnotationProcessors()) {
-      return fallbackForMissingClass();
-    }
-    try {
-      Class<?> reactModuleInfoProviderClass =
-          ClassFinder.findClass("com.facebook.react.DebugCorePackage$$ReactModuleInfoProvider");
-      return (ReactModuleInfoProvider) reactModuleInfoProviderClass.newInstance();
-    } catch (ClassNotFoundException e) {
-      return fallbackForMissingClass();
-    } catch (InstantiationException e) {
-      throw new RuntimeException(
-          "No ReactModuleInfoProvider for DebugCorePackage$$ReactModuleInfoProvider", e);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(
-          "No ReactModuleInfoProvider for DebugCorePackage$$ReactModuleInfoProvider", e);
-    }
-  }
-
-  private ReactModuleInfoProvider fallbackForMissingClass() {
-    // In OSS case, the annotation processor does not run. We fall back on creating this by hand
-    Class<? extends NativeModule>[] moduleList = new Class[] {JSCHeapCapture.class};
-
-    final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
-    for (Class<? extends NativeModule> moduleClass : moduleList) {
-      ReactModule reactModule = moduleClass.getAnnotation(ReactModule.class);
-
-      reactModuleInfoMap.put(
-          reactModule.name(),
-          new ReactModuleInfo(
-              reactModule.name(),
-              moduleClass.getName(),
-              reactModule.canOverrideExistingModule(),
-              reactModule.needsEagerInit(),
-              reactModule.isCxxModule(),
-              ReactModuleInfo.classIsTurboModule(moduleClass)));
-    }
-
-    return () -> reactModuleInfoMap;
-  }
-
-  private static void appendMap(
-      Map<String, ModuleSpec> map, String name, Provider<? extends NativeModule> provider) {
-    map.put(name, ModuleSpec.viewManagerSpec(provider));
+    return new ReactModuleInfoProvider() {
+      @Override
+      public Map<String, ReactModuleInfo> getReactModuleInfos() {
+        return Collections.emptyMap();
+      }
+    };
   }
 
   /**
@@ -105,8 +57,9 @@ public class DebugCorePackage extends BaseReactPackage implements ViewManagerOnD
   private Map<String, ModuleSpec> getViewManagersMap() {
     if (mViewManagers == null) {
       Map<String, ModuleSpec> viewManagers = new HashMap<>();
-      appendMap(viewManagers, DebuggingOverlayManager.REACT_CLASS, DebuggingOverlayManager::new);
-
+      viewManagers.put(
+          DebuggingOverlayManager.REACT_CLASS,
+          ModuleSpec.viewManagerSpec(DebuggingOverlayManager::new));
       mViewManagers = viewManagers;
     }
     return mViewManagers;

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java

@@ -144,6 +144,14 @@ public abstract class ReactActivity extends AppCompatActivity
     mDelegate.onConfigurationChanged(newConfig);
   }
 
+  public boolean onDialogKeyUp(int keyCode, KeyEvent event) {
+    return mDelegate != null && mDelegate.onDialogKeyUp(keyCode, event);
+  }
+
+  public boolean onDialogKeyDown(int keyCode, KeyEvent event) {
+    return mDelegate != null && mDelegate.onDialogKeyDown(keyCode, event);
+  }
+
   protected final ReactNativeHost getReactNativeHost() {
     return mDelegate.getReactNativeHost();
   }

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java

@@ -199,6 +199,14 @@ public class ReactActivityDelegate {
     return mReactDelegate.onBackPressed();
   }
 
+  public boolean onDialogKeyUp(int keyCode, KeyEvent event) {
+    return mReactDelegate != null && mReactDelegate.onDialogKeyUp(keyCode, event);
+  }
+
+  public boolean onDialogKeyDown(int keyCode, KeyEvent event) {
+    return mReactDelegate != null && mReactDelegate.onDialogKeyDown(keyCode, event);
+  }
+
   public boolean onNewIntent(Intent intent) {
     return mReactDelegate.onNewIntent(intent);
   }

package/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.java

@@ -247,6 +247,43 @@ public class ReactDelegate {
     return false;
   }
 
+  /**
+   * Handles key up events for a dialog.
+   * <p>
+   * This method currently does not perform any action and always returns {@code false}. Subclasses
+   * can override this method to provide custom behavior.
+   * </p>
+   *
+   * @param keyCode the code of the key that was released
+   * @param event the {@link KeyEvent} object containing full information about the event
+   * @return {@code true} if the event was handled, {@code false} otherwise
+   *
+   * @see KeyEvent
+   * @see <a href="https://github.com/react-native-tvos/react-native-tvos/issues/829">GitHub Issue #829</a>
+   */
+  public boolean onDialogKeyUp(int keyCode, KeyEvent event) {
+    return false;
+  }
+
+  /**
+   * Handles key down events for a dialog.
+   * <p>
+   * This method currently does not perform any action and always returns {@code false}. Subclasses
+   * can override this method to provide custom behavior.
+   * </p>
+   *
+   * @param keyCode the code of the key that was pressed
+   * @param event the {@link KeyEvent} object containing full information about the event
+   * @return {@code false} indicating the event was not handled
+   *
+   * @see KeyEvent
+   * @see <a href="https://github.com/react-native-tvos/react-native-tvos/issues/829">GitHub Issue #829</a>
+   */
+  public boolean onDialogKeyDown(int keyCode, KeyEvent event) {
+    return false;
+  }
+
+
   public void reload() {
     DevSupportManager devSupportManager = getDevSupportManager();
     if (devSupportManager == null) {

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -651,6 +651,16 @@ public class ReactInstanceManager {
   @ThreadConfined(UI)
   public void onHostPause(@Nullable Activity activity) {
     if (mRequireActivity) {
+      if (mCurrentActivity == null) {
+        String message =
+            "ReactInstanceManager.onHostPause called with null activity, expected:"
+                + mCurrentActivity.getClass().getSimpleName();
+        FLog.e(TAG, message);
+        StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+        for (StackTraceElement element : stackTrace) {
+          FLog.e(TAG, element.toString());
+        }
+      }
       Assertions.assertCondition(mCurrentActivity != null);
     }
     if (mCurrentActivity != null) {
@@ -1521,7 +1531,8 @@ public class ReactInstanceManager {
     if (mBridgeIdleDebugListener != null) {
       catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener);
     }
-    if (Systrace.isTracing(TRACE_TAG_REACT_APPS | TRACE_TAG_REACT_JS_VM_CALLS)) {
+    if (BuildConfig.ENABLE_PERFETTO
+        || Systrace.isTracing(TRACE_TAG_REACT_APPS | TRACE_TAG_REACT_JS_VM_CALLS)) {
       catalystInstance.setGlobalVariable("__RCTProfileIsProfiling", "true");
     }
 

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

@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react;
+package com.facebook.react
 
 /** Interface for the bridge to call for TTI start and end markers. */
 public interface ReactPackageLogger {
 
-  void startProcessPackage();
+  public fun startProcessPackage(): Unit
 
-  void endProcessPackage();
+  public fun endProcessPackage(): Unit
 }

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

@@ -25,17 +25,17 @@ internal class EventAnimationDriver(
     @JvmField internal var valueNode: ValueAnimatedNode
 ) : RCTModernEventEmitter {
   @Deprecated("Deprecated in Java")
-  override fun receiveEvent(targetReactTag: Int, eventName: String, event: WritableMap?) =
-      receiveEvent(-1, targetReactTag, eventName, event)
+  override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?) =
+      receiveEvent(-1, targetTag, eventName, params)
 
   override fun receiveEvent(
       surfaceId: Int,
       targetTag: Int,
       eventName: String,
-      event: WritableMap?
+      params: WritableMap?
   ) =
       // We assume this event can't be coalesced. `customCoalesceKey` has no meaning in Fabric.
-      receiveEvent(surfaceId, targetTag, eventName, false, 0, event, EventCategoryDef.UNSPECIFIED)
+      receiveEvent(surfaceId, targetTag, eventName, false, 0, params, EventCategoryDef.UNSPECIFIED)
 
   @Deprecated("Deprecated in Java")
   override fun receiveTouches(
@@ -47,7 +47,7 @@ internal class EventAnimationDriver(
   }
 
   @Deprecated("Deprecated in Java")
-  override fun receiveTouches(touchEvent: TouchEvent) {
+  override fun receiveTouches(event: TouchEvent) {
     throw UnsupportedOperationException("receiveTouches is not support by native animated events")
   }
 
@@ -57,13 +57,13 @@ internal class EventAnimationDriver(
       eventName: String,
       canCoalesceEvent: Boolean,
       customCoalesceKey: Int,
-      event: WritableMap?,
+      params: WritableMap?,
       @EventCategoryDef category: Int
   ) {
-    requireNotNull(event) { "Native animated events must have event data." }
+    requireNotNull(params) { "Native animated events must have event data." }
 
     // Get the new value for the node by looking into the event map using the provided event path.
-    var currMap: ReadableMap? = event
+    var currMap: ReadableMap? = params
     var currArray: ReadableArray? = null
     for (i in 0 until eventPath.size - 1) {
       if (currMap != null) {

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

@@ -134,7 +134,7 @@ public abstract class BaseJavaModule implements NativeModule {
   }
 
   @DoNotStrip
-  private final void setEventEmitterCallback(CxxCallbackImpl eventEmitterCallback) {
+  protected void setEventEmitterCallback(CxxCallbackImpl eventEmitterCallback) {
     mEventEmitterCallback = eventEmitterCallback;
   }
 }

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

@@ -503,9 +503,7 @@ public abstract class ReactContext extends ContextWrapper {
   public abstract @Nullable CallInvokerHolder getJSCallInvokerHolder();
 
   @Deprecated(
-      since =
-          "This method will be deprecated later as part of Stable APIs with bridge removal and not"
-              + " encouraged usage.")
+      since = "This method is deprecated, please use UIManagerHelper.getUIManager() instead.")
   /**
    * Get the UIManager for Fabric from the CatalystInstance.
    *

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

@@ -14,6 +14,12 @@ import kotlin.jvm.JvmStatic
 
 @DoNotStrip
 public object ReactSoftExceptionLogger {
+  /** Constants that listeners can utilize for custom category-based behavior. */
+  public object Categories {
+    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"
+  }
 
   // Use a list instead of a set here because we expect the number of listeners
   // to be very small, and we want listeners to be called in a deterministic

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

@@ -7,6 +7,8 @@
 
 package com.facebook.react.bridge
 
+import com.facebook.react.bridge.ReactSoftExceptionLogger.Categories.SOFT_ASSERTIONS
+
 /**
  * Utility class to make assertions that should not hard-crash the app but instead be handled by the
  * Catalyst app [JSExceptionHandler]. See the javadoc on that class for more information about our
@@ -23,7 +25,7 @@ public object SoftAssertions {
    */
   @JvmStatic
   public fun assertUnreachable(message: String): Unit {
-    ReactSoftExceptionLogger.logSoftException("SoftAssertions", AssertionException(message))
+    ReactSoftExceptionLogger.logSoftException(SOFT_ASSERTIONS, AssertionException(message))
   }
 
   /**
@@ -34,7 +36,7 @@ public object SoftAssertions {
   @JvmStatic
   public fun assertCondition(condition: Boolean, message: String): Unit {
     if (!condition) {
-      ReactSoftExceptionLogger.logSoftException("SoftAssertions", AssertionException(message))
+      ReactSoftExceptionLogger.logSoftException(SOFT_ASSERTIONS, AssertionException(message))
     }
   }
 
@@ -46,7 +48,7 @@ public object SoftAssertions {
   public fun <T> assertNotNull(instance: T?): T? {
     if (instance == null) {
       ReactSoftExceptionLogger.logSoftException(
-          "SoftAssertions", AssertionException("Expected object to not be null!"))
+          SOFT_ASSERTIONS, AssertionException("Expected object to not be null!"))
     }
     return instance
   }

package/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.kt

@@ -5,9 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
+
 package com.facebook.react.common.network
 
-import okhttp3.Dispatcher
 import okhttp3.OkHttpClient
 
 /**
@@ -15,13 +16,8 @@ import okhttp3.OkHttpClient
  */
 internal object OkHttpCallUtil {
   @JvmStatic
-  public fun cancelTag(client: OkHttpClient, tag: Any) {
-    // client.dispatcher is private, so we need to use reflection to access
-    // it via method dispatcher() otherwise we will get a compile error:
-    // Using 'dispatcher(): Dispatcher' is an error. moved to val
-    val dispatcherMethod = OkHttpClient::class.java.getMethod("dispatcher")
-    dispatcherMethod.setAccessible(true)
-    val dispatcher = dispatcherMethod.invoke(client) as Dispatcher
+  fun cancelTag(client: OkHttpClient, tag: Any) {
+    val dispatcher = client.dispatcher()
     for (call in dispatcher.queuedCalls()) {
       if (tag == call.request().tag()) {
         call.cancel()