react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -26,9 +26,16 @@
 #include <fb/log.h>
 #include <fbjni/ByteBuffer.h>
 #include <folly/dynamic.h>
+#include <glog/logging.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+#include <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
+
+#include <logger/react_native_log.h>
 
 #include "CxxModuleWrapper.h"
 #include "JNativeRunnable.h"
+#include "JReactCxxErrorHandler.h"
+#include "JReactSoftExceptionLogger.h"
 #include "JavaScriptExecutorHolder.h"
 #include "JniJSModulesUnbundle.h"
 #include "NativeArray.h"
@@ -92,6 +99,10 @@ CatalystInstanceImpl::initHybrid(jni::alias_ref<jclass>) {
 CatalystInstanceImpl::CatalystInstanceImpl()
     : instance_(std::make_unique<Instance>()) {}
 
+void CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse() {
+  CxxNativeModule::setShouldWarnOnUse(true);
+}
+
 void CatalystInstanceImpl::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", CatalystInstanceImpl::initHybrid),
@@ -127,11 +138,39 @@ void CatalystInstanceImpl::registerNatives() {
           CatalystInstanceImpl::handleMemoryPressure),
       makeNativeMethod(
           "getRuntimeExecutor", CatalystInstanceImpl::getRuntimeExecutor),
+      makeNativeMethod(
+          "getRuntimeScheduler", CatalystInstanceImpl::getRuntimeScheduler),
+      makeNativeMethod(
+          "installRuntimeScheduler",
+          CatalystInstanceImpl::installRuntimeScheduler),
+      makeNativeMethod(
+          "warnOnLegacyNativeModuleSystemUse",
+          CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse),
   });
 
   JNativeRunnable::registerNatives();
 }
 
+void log(ReactNativeLogLevel level, const char *message) {
+  switch (level) {
+    case ReactNativeLogLevelInfo:
+      LOG(INFO) << message;
+      break;
+    case ReactNativeLogLevelWarning:
+      LOG(WARNING) << message;
+      JReactSoftExceptionLogger::logNoThrowSoftExceptionWithMessage(
+          "react_native_log#warning", message);
+      break;
+    case ReactNativeLogLevelError:
+      LOG(ERROR) << message;
+      JReactCxxErrorHandler::handleError(message);
+      break;
+    case ReactNativeLogLevelFatal:
+      LOG(FATAL) << message;
+      break;
+  }
+}
+
 void CatalystInstanceImpl::initializeBridge(
     jni::alias_ref<ReactCallback::javaobject> callback,
     // This executor is actually a factory holder.
@@ -142,6 +181,8 @@ void CatalystInstanceImpl::initializeBridge(
         javaModules,
     jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
         cxxModules) {
+  set_react_native_logfunc(&log);
+
   // TODO mhorowitz: how to assert here?
   // Assertions.assertCondition(mBridge == null, "initializeBridge should be
   // called once");
@@ -346,13 +387,33 @@ CatalystInstanceImpl::getNativeCallInvokerHolder() {
 }
 
 jni::alias_ref<JRuntimeExecutor::javaobject>
-CatalystInstanceImpl::getRuntimeExecutor(bool shouldFlush) {
+CatalystInstanceImpl::getRuntimeExecutor() {
   if (!runtimeExecutor_) {
-    runtimeExecutor_ = jni::make_global(JRuntimeExecutor::newObjectCxxArgs(
-        instance_->getRuntimeExecutor(shouldFlush)));
+    runtimeExecutor_ = jni::make_global(
+        JRuntimeExecutor::newObjectCxxArgs(instance_->getRuntimeExecutor()));
   }
   return runtimeExecutor_;
 }
 
+jni::alias_ref<JRuntimeScheduler::javaobject>
+CatalystInstanceImpl::getRuntimeScheduler() {
+  return runtimeScheduler_;
+}
+
+void CatalystInstanceImpl::installRuntimeScheduler() {
+  if (!runtimeScheduler_) {
+    auto runtimeExecutor = instance_->getRuntimeExecutor();
+    auto runtimeScheduler = std::make_shared<RuntimeScheduler>(runtimeExecutor);
+
+    runtimeScheduler_ =
+        jni::make_global(JRuntimeScheduler::newObjectCxxArgs(runtimeScheduler));
+
+    runtimeExecutor([runtimeScheduler](jsi::Runtime &runtime) {
+      RuntimeSchedulerBinding::createAndInstallIfNeeded(
+          runtime, runtimeScheduler);
+    });
+  }
+}
+
 } // namespace react
 } // namespace facebook

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h

@@ -15,6 +15,7 @@
 #include "CxxModuleWrapper.h"
 #include "JMessageQueueThread.h"
 #include "JRuntimeExecutor.h"
+#include "JRuntimeScheduler.h"
 #include "JSLoader.h"
 #include "JavaModuleWrapper.h"
 #include "ModuleRegistryBuilder.h"
@@ -61,6 +62,10 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
       jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
           cxxModules);
 
+  // When called from CatalystInstanceImpl.java, warnings will be logged when
+  // CxxNativeModules are used. Java NativeModule usages log error in Java.
+  void warnOnLegacyNativeModuleSystemUse();
+
   void extendNativeModules(
       jni::alias_ref<jni::JCollection<
           JavaModuleWrapper::javaobject>::javaobject> javaModules,
@@ -93,8 +98,9 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   void jniCallJSCallback(jint callbackId, NativeArray *arguments);
   jni::alias_ref<CallInvokerHolder::javaobject> getJSCallInvokerHolder();
   jni::alias_ref<CallInvokerHolder::javaobject> getNativeCallInvokerHolder();
-  jni::alias_ref<JRuntimeExecutor::javaobject> getRuntimeExecutor(
-      bool shouldFlush);
+  jni::alias_ref<JRuntimeExecutor::javaobject> getRuntimeExecutor();
+  jni::alias_ref<JRuntimeScheduler::javaobject> getRuntimeScheduler();
+  void installRuntimeScheduler();
   void setGlobalVariable(std::string propName, std::string &&jsonValue);
   jlong getJavaScriptContext();
   void handleMemoryPressure(int pressureLevel);
@@ -107,6 +113,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   jni::global_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder_;
   jni::global_ref<CallInvokerHolder::javaobject> nativeCallInvokerHolder_;
   jni::global_ref<JRuntimeExecutor::javaobject> runtimeExecutor_;
+  jni::global_ref<JRuntimeScheduler::javaobject> runtimeScheduler_;
 };
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.cpp

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "JReactCxxErrorHandler.h"
+
+using namespace facebook::react;
+
+void JReactCxxErrorHandler::handleError(std::string message) {
+  static const auto handleError =
+      javaClassStatic()->getStaticMethod<void(std::string message)>(
+          "handleError");
+
+  return handleError(javaClassStatic(), message);
+}

package/{ReactCommon/react/renderer/components/picker/iospicker/primitives.h → ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.h}

@@ -7,22 +7,18 @@
 
 #pragma once
 
-#include <react/renderer/graphics/Color.h>
-
+#include <fbjni/fbjni.h>
 #include <string>
 
 namespace facebook {
 namespace react {
 
-struct PickerItemsStruct {
-  std::string label;
-  std::string value;
-  SharedColor textColor;
+class JReactCxxErrorHandler : public jni::JavaClass<JReactCxxErrorHandler> {
+ public:
+  static constexpr const char *kJavaDescriptor =
+      "Lcom/facebook/react/bridge/ReactCxxErrorHandler;";
 
-  bool operator==(const PickerItemsStruct &rhs) const {
-    return (
-        label == rhs.label && value == rhs.value && textColor == rhs.textColor);
-  }
+  static void handleError(std::string message);
 };
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.cpp

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "JReactSoftExceptionLogger.h"
+
+using namespace facebook::react;
+
+void JReactSoftExceptionLogger::logNoThrowSoftExceptionWithMessage(
+    std::string tag,
+    std::string message) {
+  static const auto logNoThrowSoftExceptionWithMessage =
+      javaClassStatic()
+          ->getStaticMethod<void(std::string tag, std::string message)>(
+              "logNoThrowSoftExceptionWithMessage");
+
+  return logNoThrowSoftExceptionWithMessage(javaClassStatic(), tag, message);
+}

package/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <string>
+
+namespace facebook {
+namespace react {
+
+class JReactSoftExceptionLogger
+    : public jni::JavaClass<JReactSoftExceptionLogger> {
+ public:
+  static constexpr const char *kJavaDescriptor =
+      "Lcom/facebook/react/bridge/ReactSoftExceptionLogger;";
+
+  static void logNoThrowSoftExceptionWithMessage(
+      std::string tag,
+      std::string message);
+};
+
+} // namespace react
+} // namespace facebook

package/{ReactCommon/react/renderer/components/picker/androidpicker/react/renderer/components/androidpicker/AndroidDialogPickerComponentDescriptor.h → ReactAndroid/src/main/jni/react/jni/JRuntimeScheduler.cpp}

@@ -5,17 +5,18 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#pragma once
-
-#include "AndroidDialogPickerShadowNode.h"
-
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include "JRuntimeScheduler.h"
 
 namespace facebook {
 namespace react {
 
-using AndroidDialogPickerComponentDescriptor =
-    ConcreteComponentDescriptor<AndroidDialogPickerShadowNode>;
+JRuntimeScheduler::JRuntimeScheduler(
+    std::weak_ptr<RuntimeScheduler> runtimeScheduler)
+    : runtimeScheduler_(runtimeScheduler) {}
+
+std::weak_ptr<RuntimeScheduler> JRuntimeScheduler::get() {
+  return runtimeScheduler_;
+}
 
 } // namespace react
 } // namespace facebook

package/ReactAndroid/src/main/jni/react/jni/JRuntimeScheduler.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/renderer/runtimescheduler/RuntimeScheduler.h>
+
+namespace facebook {
+namespace react {
+
+class JRuntimeScheduler : public jni::HybridClass<JRuntimeScheduler> {
+ public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/facebook/react/bridge/RuntimeScheduler;";
+
+  std::weak_ptr<RuntimeScheduler> get();
+
+ private:
+  friend HybridBase;
+  JRuntimeScheduler(std::weak_ptr<RuntimeScheduler> runtimeScheduler);
+  std::weak_ptr<RuntimeScheduler> runtimeScheduler_;
+};
+
+} // namespace react
+} // namespace facebook

package/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp

@@ -66,7 +66,7 @@ loadScriptFromAssets(AAssetManager *manager, const std::string &assetName) {
 
   throw std::runtime_error(folly::to<std::string>(
       "Unable to load script. Make sure you're "
-      "either running Metro (run 'react-native start') or that your bundle '",
+      "either running Metro (run 'npx react-native start') or that your bundle '",
       assetName,
       "' is packaged correctly for release."));
 }

package/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <cxxreact/JSExecutor.h>
+#include <cxxreact/RAMBundleRegistry.h>
 #include <fbjni/fbjni.h>
 #include <jni.h>
 #include "OnLoad.h"

package/ReactAndroid/src/main/jni/third-party/folly/Android.mk

@@ -86,11 +86,13 @@ LOCAL_SRC_FILES := \
   folly/io/async/AsyncTimeout.cpp \
   folly/io/async/EventBase.cpp \
   folly/io/async/EventBaseBackendBase.cpp \
+  folly/io/async/EventBaseLocal.cpp \
   folly/io/async/EventHandler.cpp \
   folly/io/async/HHWheelTimer.cpp \
   folly/io/async/Request.cpp \
   folly/io/async/TimeoutManager.cpp \
   folly/io/async/VirtualEventBase.cpp \
+  folly/lang/Exception.cpp \
   folly/memory/MallctlHelper.cpp \
   folly/portability/SysMembarrier.cpp \
   folly/synchronization/AsymmetricMemoryBarrier.cpp \
@@ -106,7 +108,7 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare
+LOCAL_CFLAGS += -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -Wno-unused-variable
 
 LOCAL_CFLAGS += $(FOLLY_FLAGS)
 

package/ReactAndroid/src/main/jni/third-party/libevent/Android.mk

@@ -12,7 +12,6 @@ LOCAL_SRC_FILES := event.c \
 	bufferevent_ratelim.c \
 	bufferevent_sock.c \
 	epoll.c \
-	event.c \
 	evmap.c \
 	evthread.c \
 	evthread_pthread.c \

package/ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK

@@ -9,8 +9,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "fresco-binary-aar",
-    sha1 = "fbc98413bb32eefe882a07cc556c7a1224dc9f24",
-    url = "mvn:com.facebook.fresco:fresco:aar:2.3.0",
+    sha1 = "b768459446d166d148aaf3b8edcdcecd59381190",
+    url = "mvn:com.facebook.fresco:fresco:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -21,8 +21,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "drawee-binary-aar",
-    sha1 = "1cff917b6f19efe7a21ca542c8b8bed18d0d9779",
-    url = "mvn:com.facebook.fresco:drawee:aar:2.3.0",
+    sha1 = "06971aca0134eafa61c1b81714c0954cb4eb4e10",
+    url = "mvn:com.facebook.fresco:drawee:aar:2.5.0",
 )
 
 rn_android_library(
@@ -51,8 +51,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "imagepipeline-base-aar",
-    sha1 = "ed3c290961f4c20fffa0ce35c098714c1934523d",
-    url = "mvn:com.facebook.fresco:imagepipeline-base:aar:2.3.0",
+    sha1 = "6839693f5d3b6697cfabbf159d004dae2f465126",
+    url = "mvn:com.facebook.fresco:imagepipeline-base:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -63,8 +63,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "imagepipeline-aar",
-    sha1 = "579954628c8e1da96e1585741f5dae08f282ce3e",
-    url = "mvn:com.facebook.fresco:imagepipeline:aar:2.3.0",
+    sha1 = "dd62dd1607ade4532c1240f137ac3c2d7920c134",
+    url = "mvn:com.facebook.fresco:imagepipeline:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -75,8 +75,8 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "nativeimagefilters-aar",
-    sha1 = "1f4d81f8f6e2706ae848124d454c99cadd85496c",
-    url = "mvn:com.facebook.fresco:nativeimagefilters:aar:2.3.0",
+    sha1 = "4a30438df8d960000b37b1f8cdba9d7996d57ea9",
+    url = "mvn:com.facebook.fresco:nativeimagefilters:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -87,8 +87,8 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "nativeimagetranscoder-aar",
-    sha1 = "1b74432d16db744719dfe1d03d4d93850e061d08",
-    url = "mvn:com.facebook.fresco:nativeimagetranscoder:aar:2.3.0",
+    sha1 = "7db353c68b41e2ad502a959c554387d59e75eb75",
+    url = "mvn:com.facebook.fresco:nativeimagetranscoder:aar:2.5.0",
 )
 
 rn_prebuilt_jar(
@@ -111,8 +111,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "fbcore-aar",
-    sha1 = "6d568ce3e1a5377c390dbde6f150884fecd61bd0",
-    url = "mvn:com.facebook.fresco:fbcore:aar:2.3.0",
+    sha1 = "ffe378b572055e0600377c000d390fb46bf278a5",
+    url = "mvn:com.facebook.fresco:fbcore:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -123,8 +123,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "imagepipeline-native-binary-aar",
-    sha1 = "705a3629cfba16ab8c9b2765058380276514342c",
-    url = "mvn:com.facebook.fresco:imagepipeline-native:aar:2.3.0",
+    sha1 = "f8e65e897a883ac4f754d57897aaba0016c8beba",
+    url = "mvn:com.facebook.fresco:imagepipeline-native:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -135,8 +135,8 @@ rn_android_prebuilt_aar(
 
 fb_native.remote_file(
     name = "imagepipeline-okhttp3-binary-aar",
-    sha1 = "1065513f02b97ee46601d92105151ae9e2111bfc",
-    url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:2.3.0",
+    sha1 = "8e274a77ffbe9f8334e09855b2a811b2a63a5708",
+    url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -147,8 +147,8 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "memory-type-ashmem-aar",
-    sha1 = "d0e2ab70d5d35d08de81d3917b0f5d7bbf4fa82c",
-    url = "mvn:com.facebook.fresco:memory-type-ashmem:aar:2.3.0",
+    sha1 = "b43b53aca89569fd2e8e964b71dc7afbf62204e8",
+    url = "mvn:com.facebook.fresco:memory-type-ashmem:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -159,8 +159,8 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "memory-type-java-aar",
-    sha1 = "5e8adc594bc9d8f4e8d794dff23c70882fb98e65",
-    url = "mvn:com.facebook.fresco:memory-type-java:aar:2.3.0",
+    sha1 = "57537a8b69dbad44fafdaea3067a776e11586465",
+    url = "mvn:com.facebook.fresco:memory-type-java:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -171,8 +171,8 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "memory-type-native-aar",
-    sha1 = "72bb5626d508587cb9d96beb0e2b61ac36a2c63d",
-    url = "mvn:com.facebook.fresco:memory-type-native:aar:2.3.0",
+    sha1 = "7eb7c52ee2a4d40b7f706c90069549410236aaa5",
+    url = "mvn:com.facebook.fresco:memory-type-native:aar:2.5.0",
 )
 
 rn_android_prebuilt_aar(
@@ -183,6 +183,6 @@ rn_android_prebuilt_aar(
 
 remote_file(
     name = "ui-common-aar",
-    sha1 = "0ce37a495f0f37165e3ede1c4cb927b0b55856be",
-    url = "mvn:com.facebook.fresco:ui-common:aar:2.3.0",
+    sha1 = "224851cf4c074aeff5dc42861b557870459a9d28",
+    url = "mvn:com.facebook.fresco:ui-common:aar:2.5.0",
 )

package/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK

@@ -28,17 +28,17 @@ fb_native.android_prebuilt_aar(
 fb_native.remote_file(
     name = "annotation-binary.jar",
     sha1 = "dc58463712cb3e5f03d8ee5ac9743b9ced9afa77",
-    url = "mvn:com.facebook.soloader:annotation:jar:0.9.0",
+    url = "mvn:com.facebook.soloader:annotation:jar:0.10.1",
 )
 
 fb_native.remote_file(
     name = "nativeloader-binary.jar",
-    sha1 = "677c7fbfcc847d7eb6082048d07b10afd4cff898",
-    url = "mvn:com.facebook.soloader:nativeloader:jar:0.9.0",
+    sha1 = "ba1b31b4b9f65494a90de7c2728b57155344a858",
+    url = "mvn:com.facebook.soloader:nativeloader:jar:0.10.1",
 )
 
 fb_native.remote_file(
     name = "soloader-binary-aar",
-    sha1 = "6e138af1dd29ceabf5bace2d24dc4333f304d104",
-    url = "mvn:com.facebook.soloader:soloader:aar:0.9.0",
+    sha1 = "78e5537c0cdf7c190f6cad9a2490f9f84ee8f041",
+    url = "mvn:com.facebook.soloader:soloader:aar:0.10.1",
 )

package/ReactAndroid/src/main/res/devsupport/values/strings.xml

@@ -16,7 +16,8 @@
   <string name="catalyst_hot_reloading_stop" project="catalyst" translatable="false">Disable Fast Refresh</string>
   <string name="catalyst_hot_reloading_auto_disable" project="catalyst" translatable="false">Disabling Fast Refresh because it requires a development bundle.</string>
   <string name="catalyst_hot_reloading_auto_enable" project="catalyst" translatable="false">Switching to development bundle in order to enable Fast Refresh.</string>
-  <string name="catalyst_inspector" project="catalyst" translatable="false">Toggle Inspector</string>
+  <string name="catalyst_inspector" project="catalyst" translatable="false">Show Element Inspector</string>
+  <string name="catalyst_inspector_stop" project="catalyst" translatable="false">Hide Element Inspector</string>
   <string name="catalyst_perf_monitor" project="catalyst" translatable="false">Show Perf Monitor</string>
   <string name="catalyst_perf_monitor_stop" project="catalyst" translatable="false">Hide Perf Monitor</string>
   <string name="catalyst_settings" project="catalyst" translatable="false">Settings</string>

package/ReactAndroid/src/main/res/views/uimanager/values/strings_unlocalized.xml

@@ -4,22 +4,10 @@
     name="link_description"
     translatable="false"
     >Link</string>
-  <string
-    name="search_description"
-    translatable="false"
-    >Search Field</string>
   <string
     name="image_description"
     translatable="false"
     >Image</string>
-  <string
-    name="button_description"
-    translatable="false"
-    >Button</string>
-  <string
-    name="toggle_button_description"
-    translatable="false"
-    >Toggle Button</string>
   <string
     name="imagebutton_description"
     translatable="false"

package/ReactAndroid/src/main/third-party/android/androidx/BUCK

@@ -32,6 +32,15 @@ fb_native.android_library(
     ],
 )
 
+fb_native.android_library(
+    name = "autofill",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":autofill-binary",
+        ":core",
+    ],
+)
+
 fb_native.android_library(
     name = "collection",
     visibility = ["PUBLIC"],
@@ -290,6 +299,25 @@ fb_native.android_library(
     ],
 )
 
+fb_native.android_library(
+    name = "test-runner",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":annotation",
+        ":test-monitor",
+        ":test-runner-binary",
+    ],
+)
+
+fb_native.android_library(
+    name = "test-rules",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":test-rules-binary",
+        ":test-runner",
+    ],
+)
+
 fb_native.android_library(
     name = "vectordrawable",
     visibility = ["PUBLIC"],
@@ -342,6 +370,11 @@ fb_native.android_prebuilt_aar(
     aar = ":asynclayoutinflater-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "autofill-binary",
+    aar = ":autofill-binary-aar",
+)
+
 fb_native.prebuilt_jar(
     name = "collection-binary",
     binary_jar = ":collection-binary.jar",
@@ -462,6 +495,16 @@ fb_native.android_prebuilt_aar(
     aar = ":test-monitor-binary-aar",
 )
 
+fb_native.android_prebuilt_aar(
+    name = "test-rules-binary",
+    aar = ":test-rules-binary-aar",
+)
+
+fb_native.android_prebuilt_aar(
+    name = "test-runner-binary",
+    aar = ":test-runner-binary-aar",
+)
+
 fb_native.android_prebuilt_aar(
     name = "vectordrawable-binary",
     aar = ":vectordrawable-binary-aar",
@@ -501,6 +544,12 @@ fb_native.remote_file(
     url = "mvn:androidx.asynclayoutinflater:asynclayoutinflater:aar:1.0.0",
 )
 
+fb_native.remote_file(
+    name = "autofill-binary-aar",
+    sha1 = "d9cdaa22b9c373ba75a35dcc33ee8871543164e5",
+    url = "mvn:androidx.autofill:autofill:aar:1.1.0",
+)
+
 fb_native.remote_file(
     name = "collection-binary.jar",
     sha1 = "42858b26cafdaa69b6149f45dfc2894007bc2c7a",
@@ -641,8 +690,20 @@ fb_native.remote_file(
 
 fb_native.remote_file(
     name = "test-monitor-binary-aar",
-    sha1 = "d2f75d117c055f35c8ebbd4f96fabc2137df9e4d",
-    url = "mvn:androidx.test:monitor:aar:1.2.0",
+    sha1 = "4f3c15d0a1e0c943b233b0dc5d8f1e690cfe7c0a",
+    url = "mvn:androidx.test:monitor:aar:1.4.0",
+)
+
+fb_native.remote_file(
+    name = "test-rules-binary-aar",
+    sha1 = "0984e8b5505f08489993c783702236af7a4a18c8",
+    url = "mvn:androidx.test:rules:aar:1.4.0",
+)
+
+fb_native.remote_file(
+    name = "test-runner-binary-aar",
+    sha1 = "44d79420baf7ac208e33b35df8756f0e912ced38",
+    url = "mvn:androidx.test:runner:aar:1.4.0",
 )
 
 fb_native.remote_file(

package/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK

@@ -9,6 +9,6 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "infer-annotations.jar",
-    sha1 = "f514ff4ca022a579d9cf7524846988b646ae4491",
-    url = "mvn:com.facebook.infer.annotation:infer-annotation:jar:0.11.2",
+    sha1 = "27539793fe93ed7d92b6376281c16cda8278ab2f",
+    url = "mvn:com.facebook.infer.annotation:infer-annotation:jar:0.18.0",
 )