react-native 0.71.4 → 0.72.0-rc.0

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

@@ -39,15 +39,22 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
     return mJniCallCounter;
   }
 
+  private void ensureKeysAreImported() {
+    if (mKeys != null) {
+      return;
+    }
+    synchronized (this) {
+      mKeys = Assertions.assertNotNull(importKeys());
+      mJniCallCounter++;
+    }
+  }
+
   private HashMap<String, Object> getLocalMap() {
     if (mLocalMap != null) {
       return mLocalMap;
     }
     synchronized (this) {
-      if (mKeys == null) {
-        mKeys = Assertions.assertNotNull(importKeys());
-        mJniCallCounter++;
-      }
+      ensureKeysAreImported();
       if (mLocalMap == null) {
         Object[] values = Assertions.assertNotNull(importValues());
         mJniCallCounter++;
@@ -70,11 +77,7 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
       return mLocalTypeMap;
     }
     synchronized (this) {
-      if (mKeys == null) {
-        mKeys = Assertions.assertNotNull(importKeys());
-        mJniCallCounter++;
-      }
-      // check that no other thread has already updated
+      ensureKeysAreImported();
       if (mLocalTypeMap == null) {
         Object[] types = Assertions.assertNotNull(importTypes());
         mJniCallCounter++;
@@ -187,48 +190,49 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
 
   @Override
   public @NonNull Iterator<Map.Entry<String, Object>> getEntryIterator() {
-    if (mKeys == null) {
-      mKeys = Assertions.assertNotNull(importKeys());
-    }
-    final String[] iteratorKeys = mKeys;
-    final Object[] iteratorValues = Assertions.assertNotNull(importValues());
-    return new Iterator<Map.Entry<String, Object>>() {
-      int currentIndex = 0;
+    synchronized (this) {
+      ensureKeysAreImported();
 
-      @Override
-      public boolean hasNext() {
-        return currentIndex < iteratorKeys.length;
-      }
+      final String[] iteratorKeys = mKeys;
+      final Object[] iteratorValues = Assertions.assertNotNull(importValues());
+      mJniCallCounter++;
 
-      @Override
-      public Map.Entry<String, Object> next() {
-        final int index = currentIndex++;
-        return new Map.Entry<String, Object>() {
-          @Override
-          public String getKey() {
-            return iteratorKeys[index];
-          }
-
-          @Override
-          public Object getValue() {
-            return iteratorValues[index];
-          }
-
-          @Override
-          public Object setValue(Object value) {
-            throw new UnsupportedOperationException(
-                "Can't set a value while iterating over a ReadableNativeMap");
-          }
-        };
-      }
-    };
+      return new Iterator<Map.Entry<String, Object>>() {
+        int currentIndex = 0;
+
+        @Override
+        public boolean hasNext() {
+          return currentIndex < iteratorKeys.length;
+        }
+
+        @Override
+        public Map.Entry<String, Object> next() {
+          final int index = currentIndex++;
+          return new Map.Entry<String, Object>() {
+            @Override
+            public String getKey() {
+              return iteratorKeys[index];
+            }
+
+            @Override
+            public Object getValue() {
+              return iteratorValues[index];
+            }
+
+            @Override
+            public Object setValue(Object value) {
+              throw new UnsupportedOperationException(
+                  "Can't set a value while iterating over a ReadableNativeMap");
+            }
+          };
+        }
+      };
+    }
   }
 
   @Override
   public @NonNull ReadableMapKeySetIterator keySetIterator() {
-    if (mKeys == null) {
-      mKeys = Assertions.assertNotNull(importKeys());
-    }
+    ensureKeysAreImported();
     final String[] iteratorKeys = mKeys;
     return new ReadableMapKeySetIterator() {
       int currentIndex = 0;
@@ -286,22 +290,4 @@ public class ReadableNativeMap extends NativeMap implements ReadableMap {
     }
     return hashMap;
   }
-
-  private static class ReadableNativeMapKeySetIterator implements ReadableMapKeySetIterator {
-    private final Iterator<String> mIterator;
-
-    public ReadableNativeMapKeySetIterator(ReadableNativeMap readableNativeMap) {
-      mIterator = readableNativeMap.getLocalMap().keySet().iterator();
-    }
-
-    @Override
-    public boolean hasNextKey() {
-      return mIterator.hasNext();
-    }
-
-    @Override
-    public String nextKey() {
-      return mIterator.next();
-    }
-  }
 }

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

@@ -14,7 +14,6 @@ import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import com.facebook.infer.annotation.ThreadConfined;
-import java.util.List;
 
 public interface UIManager extends JSIModule, PerformanceCounter {
 
@@ -153,15 +152,4 @@ public interface UIManager extends JSIModule, PerformanceCounter {
   @Deprecated
   @Nullable
   String resolveCustomDirectEventName(@Nullable String eventName);
-
-  /**
-   * Helper method to pre-initialize view managers. When using Native ViewConfigs this method will
-   * also pre-compute the constants for a view manager. The purpose is to ensure that we don't block
-   * for getting the constants for view managers during initial rendering of a surface.
-   *
-   * @deprecated this method will be removed in the future
-   * @param viewManagerNames {@link List <String>} names of ViewManagers
-   */
-  @Deprecated
-  void preInitializeViewManagers(List<String> viewManagerNames);
 }

package/ReactAndroid/src/main/java/com/facebook/react/common/BUCK

@@ -16,13 +16,6 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "JAVA",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
-        react_native_dep("third-party/android/androidx:core"),
-        react_native_dep("third-party/android/androidx:fragment"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
-    ],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
@@ -30,6 +23,10 @@ rn_android_library(
     deps = [
         ":build_config",
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/android/androidx:core"),
+        react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
     ],

package/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java

@@ -7,12 +7,14 @@
 
 package com.facebook.react.common;
 
+import com.facebook.proguard.annotations.DoNotStrip;
 import javax.annotation.Nullable;
 
 /**
  * A JS exception that was propagated to native. In debug mode, these exceptions are normally shown
  * to developers in a redbox.
  */
+@DoNotStrip
 public class JavascriptException extends RuntimeException
     implements HasJavascriptExceptionMetadata {
 

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/BUCK

@@ -11,7 +11,6 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "KOTLIN",
-    provided_deps = [],
     pure_kotlin = False,
     required_for_source_only_abi = True,
     visibility = [

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt

@@ -21,7 +21,7 @@ package com.facebook.react.common.mapbuffer
  * Limitations:
  * - Keys are usually sized as 2 bytes, with each buffer supporting up to 65536 entries as a result.
  * - O(log(N)) random key access for native buffers due to selected structure. Faster access can be
- * achieved by retrieving [MapBuffer.Entry] with [entryAt] on known offsets.
+ *   achieved by retrieving [MapBuffer.Entry] with [entryAt] on known offsets.
  */
 interface MapBuffer : Iterable<MapBuffer.Entry> {
   companion object {
@@ -46,12 +46,14 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Number of elements inserted into current MapBuffer.
+   *
    * @return number of elements in the [MapBuffer]
    */
   val count: Int
 
   /**
    * Checks whether entry for given key exists in MapBuffer.
+   *
    * @param key key to lookup the entry
    * @return whether entry for the given key exists in the MapBuffer.
    */
@@ -60,6 +62,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
   /**
    * Provides offset of the key to use for [entryAt], for cases when offset is not statically known
    * but can be cached.
+   *
    * @param key key to lookup offset for
    * @return offset for the given key to be used for entry access, -1 if key wasn't found.
    */
@@ -67,14 +70,16 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed access to a MapBuffer without additional lookups for provided offset.
+   *
    * @param offset offset of entry in the MapBuffer structure. Can be looked up for known keys with
-   * [getKeyOffset].
+   *   [getKeyOffset].
    * @return parsed entry for structured access for given offset
    */
   fun entryAt(offset: Int): MapBuffer.Entry
 
   /**
    * Provides parsed [DataType] annotation associated with the given key.
+   *
    * @param key key to lookup type for
    * @return data type of the given key.
    * @throws IllegalArgumentException if the key doesn't exist
@@ -83,6 +88,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [Boolean] value if the entry for given key exists with [DataType.BOOL] type
+   *
    * @param key key to lookup [Boolean] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -92,6 +98,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [Int] value if the entry for given key exists with [DataType.INT] type
+   *
    * @param key key to lookup [Int] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -101,6 +108,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [Double] value if the entry for given key exists with [DataType.DOUBLE] type
+   *
    * @param key key to lookup [Double] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -110,6 +118,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [String] value if the entry for given key exists with [DataType.STRING] type
+   *
    * @param key key to lookup [String] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -119,6 +128,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [MapBuffer] value if the entry for given key exists with [DataType.MAP] type
+   *
    * @param key key to lookup [MapBuffer] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -129,6 +139,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
   /**
    * Provides parsed [List<MapBuffer>] value if the entry for given key exists with [DataType.MAP]
    * type
+   *
    * @param key key to lookup [List<MapBuffer>] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -149,30 +160,35 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
     /**
      * Entry value represented as [Boolean]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.BOOL]
      */
     val booleanValue: Boolean
 
     /**
      * Entry value represented as [Int]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.INT]
      */
     val intValue: Int
 
     /**
      * Entry value represented as [Double]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.DOUBLE]
      */
     val doubleValue: Double
 
     /**
      * Entry value represented as [String]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.STRING]
      */
     val stringValue: String
 
     /**
      * Entry value represented as [MapBuffer]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.MAP]
      */
     val mapBufferValue: MapBuffer

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt

@@ -66,7 +66,7 @@ class ReadableMapBuffer : MapBuffer {
   /**
    * @param key Key to search for
    * @return the "bucket index" for a key or -1 if not found. It uses a binary search algorithm
-   * (log(n))
+   *   (log(n))
    */
   private fun getBucketIndexForKey(intKey: Int): Int {
     if (intKey !in KEY_RANGE) {

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/WritableMapBuffer.kt

@@ -30,6 +30,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds a boolean value for given key to the MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range
@@ -38,6 +39,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds an int value for given key to the MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range
@@ -46,6 +48,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds a double value for given key to the MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range
@@ -54,6 +57,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds a string value for given key to the MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range
@@ -62,6 +66,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds a [MapBuffer] value for given key to the current MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range

package/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java

@@ -25,6 +25,9 @@ public class ReactFeatureFlags {
    */
   public static volatile boolean useTurboModules = false;
 
+  /** In Bridgeless mode, should legacy NativeModules use the TurboModule system? */
+  public static volatile boolean unstable_useTurboModuleInterop = false;
+
   /**
    * Should this application use the new (Fabric) Renderer? If yes, all rendering in this app will
    * use Fabric instead of the legacy renderer.
@@ -42,6 +45,9 @@ public class ReactFeatureFlags {
    */
   public static volatile boolean enableBridgelessArchitectureSoftExceptions = false;
 
+  /** Does the bridgeless architecture use the new create/reload/destroy routines */
+  public static volatile boolean enableBridgelessArchitectureNewCreateReloadDestroy = false;
+
   /**
    * After TurboModules and Fabric are enabled, we need to ensure that the legacy NativeModule isn't
    * isn't used. So, turn this flag on to trigger warnings whenever the legacy NativeModule system
@@ -52,26 +58,6 @@ public class ReactFeatureFlags {
   /** Should we dispatch TurboModule methods with promise returns to the NativeModules thread? */
   public static volatile boolean enableTurboModulePromiseAsyncDispatch = false;
 
-  /**
-   * Experiment:
-   *
-   * <p>Bridge and Bridgeless mode can run concurrently. This means that there can be two
-   * TurboModule systems alive at the same time.
-   *
-   * <p>The TurboModule system stores all JS callbacks in a global LongLivedObjectCollection. This
-   * collection is cleared when the JS VM is torn down. Implication: Tearing down the bridge JSVM
-   * invalidates the bridgeless JSVM's callbacks, and vice versa.
-   *
-   * <p>useGlobalCallbackCleanupScopeUsingRetainJSCallback => Use a retainJSCallbacks lambda to
-   * store jsi::Functions into the global LongLivedObjectCollection
-   *
-   * <p>useTurboModuleManagerCallbackCleanupScope => Use a retainJSCallbacks labmda to store
-   * jsi::Functions into a LongLivedObjectCollection owned by the TurboModuleManager
-   */
-  public static boolean useGlobalCallbackCleanupScopeUsingRetainJSCallback = false;
-
-  public static boolean useTurboModuleManagerCallbackCleanupScope = false;
-
   /** This feature flag enables logs for Fabric */
   public static boolean enableFabricLogs = false;
 
@@ -84,9 +70,6 @@ public class ReactFeatureFlags {
   /** Enables or disables calculation of Transformed Frames */
   public static boolean calculateTransformedFramesEnabled = false;
 
-  /** Feature Flag to use overflowInset values provided by Yoga */
-  public static boolean useOverflowInset = false;
-
   public static boolean dispatchPointerEvents = false;
 
   /** Feature Flag to enable the pending event queue in fabric before mounting views */
@@ -121,6 +104,27 @@ public class ReactFeatureFlags {
   /** Temporary flag to allow execution of mount items up to 15ms earlier than normal. */
   public static boolean enableEarlyScheduledMountItemExecution = false;
 
-  // TODO (T136375139): Remove this once finish testing
-  public static boolean enableAtomicRegisterSegment = false;
+  /**
+   * Allow closing the small gap that appears between paths when drawing a rounded View with a
+   * border.
+   */
+  public static boolean enableCloseVisibleGapBetweenPaths = true;
+
+  /**
+   * Allow fix in layout animation to drop delete...create mutations which could cause missing view
+   * state in Fabric SurfaceMountingManager.
+   */
+  public static boolean reduceDeleteCreateMutationLayoutAnimation = true;
+
+  /**
+   * Allow fix to drop delete...create mutations which could cause missing view state in Fabric
+   * SurfaceMountingManager.
+   */
+  public static boolean reduceDeleteCreateMutation = false;
+
+  /**
+   * Use JSI NativeState API to store references to native objects rather than the more expensive
+   * HostObject pattern
+   */
+  public static boolean useNativeState = false;
 }

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt

@@ -27,23 +27,45 @@ object DefaultNewArchitectureEntryPoint {
   fun load(
       turboModulesEnabled: Boolean = true,
       fabricEnabled: Boolean = true,
-      concurrentReactEnabled: Boolean = true,
       dynamicLibraryName: String = "appmodules",
   ) {
     ReactFeatureFlags.useTurboModules = turboModulesEnabled
     ReactFeatureFlags.enableFabricRenderer = fabricEnabled
 
-    this.fabricEnabled = fabricEnabled
-    this.turboModulesEnabled = turboModulesEnabled
-    this.concurrentReactEnabled = concurrentReactEnabled
+    this.privateFabricEnabled = fabricEnabled
+    this.privateTurboModulesEnabled = turboModulesEnabled
+    this.privateConcurrentReactEnabled = fabricEnabled
 
     SoLoader.loadLibrary("react_newarchdefaults")
     SoLoader.loadLibrary(dynamicLibraryName)
   }
 
-  @JvmStatic var fabricEnabled: Boolean = false
+  @Deprecated(
+      message =
+          "Calling DefaultNewArchitectureEntryPoint.load() with different fabricEnabled and concurrentReactEnabled is deprecated. Please use a single flag for both Fabric and Concurrent React",
+      replaceWith = ReplaceWith("load(turboModulesEnabled, fabricEnabled, dynamicLibraryName)"),
+      level = DeprecationLevel.WARNING)
+  fun load(
+      turboModulesEnabled: Boolean = true,
+      fabricEnabled: Boolean = true,
+      @Suppress("UNUSED_PARAMETER") concurrentReactEnabled: Boolean = true,
+      dynamicLibraryName: String = "appmodules",
+  ) {
+    load(turboModulesEnabled, fabricEnabled, dynamicLibraryName)
+  }
 
-  @JvmStatic var turboModulesEnabled: Boolean = false
+  private var privateFabricEnabled: Boolean = false
+  @JvmStatic
+  val fabricEnabled: Boolean
+    get() = privateFabricEnabled
 
-  @JvmStatic var concurrentReactEnabled: Boolean = false
+  private var privateTurboModulesEnabled: Boolean = false
+  @JvmStatic
+  val turboModulesEnabled: Boolean
+    get() = privateTurboModulesEnabled
+
+  private var privateConcurrentReactEnabled: Boolean = false
+  @JvmStatic
+  val concurrentReactEnabled: Boolean
+    get() = privateConcurrentReactEnabled
 }

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt

@@ -15,31 +15,31 @@ import com.facebook.react.ReactRootView
  * A utility class that allows you to simplify the setup of a [ReactActivityDelegate] for new apps
  * in Open Source.
  *
- * Specifically, with this class you can simply control if Fabric and Concurrent Root are enabled
- * for an Activity using the boolean flags in the constructor.
+ * Specifically, with this class you can simply control if Fabric is enabled for an Activity using
+ * the boolean flag in the constructor.
  *
  * @param fabricEnabled Whether Fabric should be enabled for the RootView of this Activity.
- * @param concurrentRootEnabled Whether ConcurrentRoot (aka React 18) should be enabled for the
- * RootView of this Activity.
  */
 open class DefaultReactActivityDelegate(
     activity: ReactActivity,
     mainComponentName: String,
     private val fabricEnabled: Boolean = false,
-    private val concurrentRootEnabled: Boolean = false
 ) : ReactActivityDelegate(activity, mainComponentName) {
 
-  /**
-   * Override this method to enable Concurrent Root on the surface for this Activity. See:
-   * https://reactjs.org/blog/2022/03/29/react-v18.html
-   *
-   * This requires to be rendering on Fabric (i.e. on the New Architecture).
-   *
-   * @return Whether you want to enable Concurrent Root for this surface or not.
-   */
-  override fun isConcurrentRootEnabled(): Boolean {
-    return concurrentRootEnabled
-  }
+  @Deprecated(
+      message =
+          "Creating DefaultReactActivityDelegate with both fabricEnabled and concurrentReactEnabled is deprecated. Please pass only one boolean value that will be used for both flags",
+      level = DeprecationLevel.WARNING,
+      replaceWith =
+          ReplaceWith("DefaultReactActivityDelegate(activity, mainComponentName, fabricEnabled)"))
+  constructor(
+      activity: ReactActivity,
+      mainComponentName: String,
+      fabricEnabled: Boolean,
+      @Suppress("UNUSED_PARAMETER") concurrentReactEnabled: Boolean,
+  ) : this(activity, mainComponentName, fabricEnabled)
+
+  override fun isFabricEnabled(): Boolean = fabricEnabled
 
   override fun createRootView(): ReactRootView =
       ReactRootView(context).apply { setIsFabric(fabricEnabled) }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK

@@ -9,28 +9,23 @@ rn_android_library(
     ],
     language = "JAVA",
     manifest = "AndroidManifest.xml",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:core"),
-        react_native_dep("third-party/android/androidx:fragment"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
-    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/android/androidx:core"),
+        react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/okhttp:okhttp3"),
         react_native_dep("third-party/java/okio:okio"),
         react_native_target("java/com/facebook/debug/holder:holder"),
-        react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
-        react_native_target("java/com/facebook/react/util:util"),
         react_native_target("java/com/facebook/react/common/network:network"),
         react_native_target("java/com/facebook/react/devsupport:interfaces"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
@@ -39,6 +34,8 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
         react_native_target("java/com/facebook/react/packagerconnection:packagerconnection"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_target("java/com/facebook/react/util:util"),
         react_native_target("res:devsupport"),
     ],
     exported_deps = [