react-native 0.71.3 → 0.72.0-rc.0

package/React/Views/ScrollView/RCTScrollView.m

@@ -29,7 +29,7 @@
 @interface RCTCustomScrollView : UIScrollView <UIGestureRecognizerDelegate>
 
 @property (nonatomic, assign) BOOL centerContent;
-@property (nonatomic, strong) UIView<RCTCustomRefreshContolProtocol> *customRefreshControl;
+@property (nonatomic, strong) UIView<RCTCustomRefreshControlProtocol> *customRefreshControl;
 @property (nonatomic, assign) BOOL pinchGestureEnabled;
 
 @end
@@ -215,14 +215,14 @@
   }
 }
 
-- (void)setCustomRefreshControl:(UIView<RCTCustomRefreshContolProtocol> *)refreshControl
+- (void)setCustomRefreshControl:(UIView<RCTCustomRefreshControlProtocol> *)refreshControl
 {
   if (_customRefreshControl) {
     [_customRefreshControl removeFromSuperview];
   }
   _customRefreshControl = refreshControl;
   // We have to set this because we can't always guarantee the
-  // `RCTCustomRefreshContolProtocol`'s superview will always be of class
+  // `RCTCustomRefreshControlProtocol`'s superview will always be of class
   // `UIScrollView` like we were previously
   if ([_customRefreshControl respondsToSelector:@selector(setScrollView:)]) {
     _customRefreshControl.scrollView = self;
@@ -331,6 +331,16 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     newContentOffset.y -= contentDiff;
   }
 
+  if (@available(iOS 14.0, *)) {
+    // On iOS when Prefer Cross-Fade Transitions is enabled, the keyboard position
+    // & height is reported differently (0 instead of Y position value matching height of frame)
+    // Fixes similar issue we saw with https://github.com/facebook/react-native/pull/34503
+    if (UIAccessibilityPrefersCrossFadeTransitions() && endFrame.size.height == 0) {
+      newContentOffset.y = 0;
+      newEdgeInsets.bottom = 0;
+    }
+  }
+
   [UIView animateWithDuration:duration
                         delay:0.0
                       options:animationOptionsWithCurve(curve)
@@ -402,8 +412,8 @@ static inline void RCTApplyTransformationAccordingLayoutDirection(
 - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
 {
   [super insertReactSubview:view atIndex:atIndex];
-  if ([view conformsToProtocol:@protocol(RCTCustomRefreshContolProtocol)]) {
-    [_scrollView setCustomRefreshControl:(UIView<RCTCustomRefreshContolProtocol> *)view];
+  if ([view conformsToProtocol:@protocol(RCTCustomRefreshControlProtocol)]) {
+    [_scrollView setCustomRefreshControl:(UIView<RCTCustomRefreshControlProtocol> *)view];
     if (![view isKindOfClass:[UIRefreshControl class]] && [view conformsToProtocol:@protocol(UIScrollViewDelegate)]) {
       [self addScrollListener:(UIView<UIScrollViewDelegate> *)view];
     }
@@ -421,7 +431,7 @@ static inline void RCTApplyTransformationAccordingLayoutDirection(
 - (void)removeReactSubview:(UIView *)subview
 {
   [super removeReactSubview:subview];
-  if ([subview conformsToProtocol:@protocol(RCTCustomRefreshContolProtocol)]) {
+  if ([subview conformsToProtocol:@protocol(RCTCustomRefreshControlProtocol)]) {
     [_scrollView setCustomRefreshControl:nil];
     if (![subview isKindOfClass:[UIRefreshControl class]] &&
         [subview conformsToProtocol:@protocol(UIScrollViewDelegate)]) {
@@ -476,7 +486,7 @@ static inline void RCTApplyTransformationAccordingLayoutDirection(
 
 #if !TARGET_OS_TV
   // Adjust the refresh control frame if the scrollview layout changes.
-  UIView<RCTCustomRefreshContolProtocol> *refreshControl = _scrollView.customRefreshControl;
+  UIView<RCTCustomRefreshControlProtocol> *refreshControl = _scrollView.customRefreshControl;
   if (refreshControl && refreshControl.isRefreshing && ![refreshControl isKindOfClass:UIRefreshControl.class]) {
     refreshControl.frame =
         (CGRect){_scrollView.contentOffset, {_scrollView.frame.size.width, refreshControl.frame.size.height}};

package/React/Views/ScrollView/RCTScrollableProtocol.h

@@ -33,7 +33,7 @@
 /**
  * Denotes a view which implements custom pull to refresh functionality.
  */
-@protocol RCTCustomRefreshContolProtocol
+@protocol RCTCustomRefreshControlProtocol
 
 @property (nonatomic, copy) RCTDirectEventBlock onRefresh;
 @property (nonatomic, readonly, getter=isRefreshing) BOOL refreshing;
@@ -42,3 +42,7 @@
 @property (nonatomic, weak) UIScrollView *scrollView;
 
 @end
+
+__attribute__((deprecated("Use RCTCustomRefreshControlProtocol instead")))
+@protocol RCTCustomRefreshContolProtocol<RCTCustomRefreshControlProtocol>
+@end

package/React-Core.podspec

@@ -18,9 +18,11 @@ end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 folly_version = '2021.07.22.00'
+socket_rocket_version = '0.6.0'
 boost_compiler_flags = '-Wno-documentation'
 
 use_hermes = ENV['USE_HERMES'] == '1'
+use_frameworks = ENV['USE_FRAMEWORKS'] != nil
 
 header_subspecs = {
   'CoreModulesHeaders'          => 'React/CoreModules/**/*.h',
@@ -36,6 +38,11 @@ header_subspecs = {
   'RCTVibrationHeaders'         => 'Libraries/Vibration/*.h',
 }
 
+frameworks_search_paths = []
+frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\"" if use_hermes
+frameworks_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon\"" if use_frameworks
+frameworks_search_paths << "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric\"" if use_frameworks
+
 header_search_paths = [
   "$(PODS_TARGET_SRCROOT)/ReactCommon",
   "$(PODS_ROOT)/boost",
@@ -47,6 +54,10 @@ header_search_paths = [
 ].concat(use_hermes ? [
   "$(PODS_ROOT)/Headers/Public/React-hermes",
   "$(PODS_ROOT)/Headers/Public/hermes-engine"
+] : []).concat(use_frameworks ? [
+  "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers",
+  "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core",
+  "$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers"
 ] : []).map{|p| "\"#{p}\""}.join(" ")
 
 Pod::Spec.new do |s|
@@ -55,7 +66,7 @@ Pod::Spec.new do |s|
   s.summary                = "The core of React Native."
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.resource_bundle        = { "AccessibilityResources" => ["React/AccessibilityResources/*.lproj"]}
@@ -67,9 +78,8 @@ Pod::Spec.new do |s|
                                "DEFINES_MODULE" => "YES",
                                "GCC_PREPROCESSOR_DEFINITIONS" => "RCT_METRO_PORT=${RCT_METRO_PORT}",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
-                             }.merge!(use_hermes ? {
-                               "FRAMEWORK_SEARCH_PATHS" => "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-hermes\""
-                             } : {})
+                               "FRAMEWORK_SEARCH_PATHS" => frameworks_search_paths.join(" ")
+                             }
   s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
   s.default_subspec        = "Default"
 
@@ -120,6 +130,7 @@ Pod::Spec.new do |s|
   s.dependency "React-perflogger", version
   s.dependency "React-jsi", version
   s.dependency "React-jsiexecutor", version
+  s.dependency "SocketRocket", socket_rocket_version
   s.dependency "Yoga"
   s.dependency "glog"
 

package/React.podspec

@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
                              DESC
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"

package/ReactAndroid/build.gradle

@@ -5,17 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-buildscript {
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.hasProperty("kotlinVersion") ? rootProject.ext.kotlinVersion : KOTLIN_VERSION}"
-    }
-}
-
 plugins {
     id("com.android.library")
     id("com.facebook.react")
     id("de.undercouch.download")
     id("maven-publish")
+    id("org.jetbrains.kotlin.android")
 }
 
 import com.facebook.react.tasks.internal.*
@@ -117,10 +112,18 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
                     new Pair("../ReactCommon/react/renderer/graphics/platform/cxx/", ""),
                 ]
             ),
+            new PrefabPreprocessingEntry(
+                "rrc_root",
+                new Pair("../ReactCommon/react/renderer/components/root/", "react/renderer/components/root/")
+            ),
             new PrefabPreprocessingEntry(
                 "rrc_view",
                 new Pair("../ReactCommon/react/renderer/components/view/", "react/renderer/components/view/")
             ),
+            new PrefabPreprocessingEntry(
+                "rrc_legacyviewmanagerinterop",
+                new Pair("../ReactCommon/react/renderer/components/legacyviewmanagerinterop/", "react/renderer/components/legacyviewmanagerinterop/")
+            ),
             new PrefabPreprocessingEntry(
                 "jsi",
                 new Pair("../ReactCommon/jsi/", "")
@@ -131,10 +134,7 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
             ),
             new PrefabPreprocessingEntry(
                 "fabricjni",
-                [
-                    new Pair("src/main/jni/react/fabric", "react/fabric/"),
-                    new Pair("src/main/jni/react/cxxcomponents", "react/cxxcomponents/")
-                ]
+                new Pair("src/main/jni/react/fabric", "react/fabric/")
             ),
             new PrefabPreprocessingEntry(
                 "react_render_mapbuffer",
@@ -164,6 +164,7 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
                     new Pair(new File(buildDir, "third-party-ndk/glog/exported/").absolutePath, ""),
                     new Pair("../ReactCommon/butter/", "butter/"),
                     new Pair("../ReactCommon/callinvoker/", ""),
+                    new Pair("../ReactCommon/cxxreact/", "cxxreact/"),
                     new Pair("../ReactCommon/react/bridging/", "react/bridging/"),
                     new Pair("../ReactCommon/react/config/", "react/config/"),
                     new Pair("../ReactCommon/react/nativemodule/core/", ""),
@@ -243,22 +244,24 @@ task createNativeDepsDirectories {
 
 task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
-    onlyIfNewer(true)
+    onlyIfModified(true)
     overwrite(false)
+    retries(5)
     dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))
 }
 
 final def prepareBoost = tasks.register("prepareBoost", PrepareBoostTask) {
     it.dependsOn(boostPath ? [] : [downloadBoost])
-    it.boostPath.setFrom(boostPath ?: tarTree(resources.gzip(downloadBoost.dest)))
+    it.boostPath.setFrom(boostPath ?: tarTree(downloadBoost.dest))
     it.boostVersion.set(BOOST_VERSION)
     it.outputDir.set(new File(thirdPartyNdkDir, "boost"))
 }
 
 task downloadDoubleConversion(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://github.com/google/double-conversion/archive/v${DOUBLE_CONVERSION_VERSION}.tar.gz")
-    onlyIfNewer(true)
+    onlyIfModified(true)
     overwrite(false)
+    retries(5)
     dest(new File(downloadsDir, "double-conversion-${DOUBLE_CONVERSION_VERSION}.tar.gz"))
 }
 
@@ -273,8 +276,9 @@ task prepareDoubleConversion(dependsOn: dependenciesPath ? [] : [downloadDoubleC
 
 task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://github.com/facebook/folly/archive/v${FOLLY_VERSION}.tar.gz")
-    onlyIfNewer(true)
+    onlyIfModified(true)
     overwrite(false)
+    retries(5)
     dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
 }
 
@@ -289,8 +293,9 @@ task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy
 
 task downloadFmt(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://github.com/fmtlib/fmt/archive/${FMT_VERSION}.tar.gz")
-    onlyIfNewer(true)
+    onlyIfModified(true)
     overwrite(false)
+    retries(5)
     dest(new File(downloadsDir, "fmt-${FMT_VERSION}.tar.gz"))
 }
 
@@ -305,8 +310,9 @@ task prepareFmt(dependsOn: dependenciesPath ? [] : [downloadFmt], type: Copy) {
 
 task downloadLibevent(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://github.com/libevent/libevent/releases/download/release-${LIBEVENT_VERSION}-stable/libevent-${LIBEVENT_VERSION}-stable.tar.gz")
-    onlyIfNewer(true)
+    onlyIfModified(true)
     overwrite(false)
+    retries(5)
     dest(new File(downloadsDir, "libevent-${LIBEVENT_VERSION}.tar.gz"))
 }
 
@@ -320,8 +326,9 @@ final def prepareLibevent = tasks.register("prepareLibevent", PrepareLibeventTas
 
 task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
     src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz")
-    onlyIfNewer(true)
+    onlyIfModified(true)
     overwrite(false)
+    retries(5)
     dest(new File(downloadsDir, "glog-${GLOG_VERSION}.tar.gz"))
 }
 
@@ -415,9 +422,18 @@ task installArchives {
     dependsOn("publishAllPublicationsToNpmRepository")
 }
 
+repositories {
+    // Normally RNGP will set repositories for all modules,
+    // but when consumed from source, we need to re-declare
+    // those repositories as there is no app module there.
+    mavenCentral()
+    google()
+}
+
 android {
     buildToolsVersion = "33.0.0"
     compileSdkVersion 33
+    namespace "com.facebook.react"
 
     // Used to override the NDK path/version on internal CI or by allowing
     // users to customize the NDK path/version from their root project (e.g. for M1 support)
@@ -471,7 +487,9 @@ android {
                     "react_render_core",
                     "react_render_graphics",
                     "rrc_image",
+                    "rrc_root",
                     "rrc_view",
+                    "rrc_legacyviewmanagerinterop",
                     "jsi",
                     "glog",
                     "fabricjni",
@@ -500,6 +518,17 @@ android {
         }
     }
 
+    buildTypes {
+        debug {
+            externalNativeBuild {
+                cmake {
+                    // We want to build Gtest suite only for the debug variant.
+                    targets "reactnative_unittest"
+                }
+            }
+        }
+    }
+
     preBuild.dependsOn(prepareJSC, prepareBoost, prepareDoubleConversion, prepareFmt, prepareFolly, prepareGlog, prepareLibevent)
     preBuild.dependsOn("generateCodegenArtifactsFromSchema")
     preBuild.dependsOn(preparePrefab)
@@ -567,9 +596,15 @@ android {
         rrc_image {
             headers(new File(prefabHeadersDir, "rrc_image").absolutePath)
         }
+        rrc_root {
+            headers(new File(prefabHeadersDir, "rrc_root").absolutePath)
+        }
         rrc_view {
             headers(new File(prefabHeadersDir, "rrc_view").absolutePath)
         }
+        rrc_legacyviewmanagerinterop {
+            headers(new File(prefabHeadersDir, "rrc_legacyviewmanagerinterop").absolutePath)
+        }
         jsi {
             headers(new File(prefabHeadersDir, "jsi").absolutePath)
         }
@@ -623,6 +658,17 @@ android {
             includeBuildTypeValues('debug', 'release')
         }
     }
+
+    testOptions {
+        unitTests.all {
+            // Robolectric tests are downloading JARs at runtime. This allows to specify
+            // a local file mirror with REACT_NATIVE_ROBOLECTRIC_MIRROR to go in offline more.
+            if (System.getenv("REACT_NATIVE_ROBOLECTRIC_MIRROR") != null) {
+                systemProperty 'robolectric.offline', 'true'
+                systemProperty 'robolectric.dependency.dir', System.getenv("REACT_NATIVE_ROBOLECTRIC_MIRROR")
+            }
+        }
+    }
 }
 
 dependencies {
@@ -648,7 +694,7 @@ dependencies {
 
     // It's up to the consumer to decide if hermes should be included or not.
     // Therefore hermes-engine is a compileOnly dependency.
-    compileOnly(project(":ReactAndroid:hermes-engine"))
+    compileOnly(project(":packages:react-native:ReactAndroid:hermes-engine"))
 
     testImplementation("junit:junit:${JUNIT_VERSION}")
     testImplementation("org.assertj:assertj-core:${ASSERTJ_VERSION}")
@@ -657,23 +703,45 @@ dependencies {
     testImplementation("org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}")
     testImplementation("org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}")
     testImplementation("org.robolectric:robolectric:${ROBOLECTRIC_VERSION}")
+    testImplementation("com.thoughtworks.xstream:xstream:1.4.20")
 
     androidTestImplementation(fileTree(dir: "src/main/third-party/java/buck-android-support/", include: ["*.jar"]))
     androidTestImplementation("androidx.test:runner:${ANDROIDX_TEST_VERSION}")
     androidTestImplementation("androidx.test:rules:${ANDROIDX_TEST_VERSION}")
     androidTestImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")
+
+    // This compileOnly dependency is needed to be able to update the offline
+    // mirror from a non-linux machine, while still executing inside a Linux CI
+    // as we declare a dependency on aap2 @linux so we're sure the linux artifact
+    // gets downloaded at some point.
+    compileOnly("com.android.tools.build:aapt2:7.4.2-8841542:linux")
 }
 
 react {
     // TODO: The library name is chosen for parity with Fabric components & iOS
     // This should be changed to a more generic name, e.g. `ReactCoreSpec`.
     libraryName = "rncore"
-    root = file("..")
     jsRootDir = file("../Libraries")
-    reactNativeDir = file("$projectDir/..")
-    // We search for the codegen in either one of the `node_modules` folder or in the
-    // root packages folder (that's for when we build from source without calling `yarn install`).
-    codegenDir = file(findNodeModulePath(projectDir, "react-native-codegen") ?: "../packages/react-native-codegen/")
+}
+
+tasks.withType(Test).all {
+    // We add --add-opens flags to make sure we can run PowerMock tests on JDK >= 17
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+        jvmArgs += [
+            "-XX:+AllowRedefinitionToAddDeleteMethods",
+            "--illegal-access=permit",
+            "--add-opens=java.base/java.lang=ALL-UNNAMED",
+            "--add-opens=java.base/java.xml.internal=ALL-UNNAMED",
+            "--add-opens=java.base/java.util=ALL-UNNAMED",
+            "--add-opens=java.base/java.util.concurrent=ALL-UNNAMED",
+            "--add-opens=java.base/java.net=ALL-UNNAMED",
+            "--add-opens=java.base/java.security=ALL-UNNAMED",
+            "--add-opens=java.base/java.io=ALL-UNNAMED",
+            "--add-opens=java.base/java.nio=ALL-UNNAMED",
+            "--add-opens=java.base/java.nio.charset=ALL-UNNAMED",
+            "--add-opens=java.base/jdk.xml.internal=ALL-UNNAMED",
+        ]
+    }
 }
 
 apply plugin: "org.jetbrains.kotlin.android"

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

@@ -69,6 +69,7 @@ add_library(folly_runtime ALIAS ReactAndroid::folly_runtime)
 add_library(react_nativemodule_core ALIAS ReactAndroid::react_nativemodule_core)
 add_library(react_render_imagemanager ALIAS ReactAndroid::react_render_imagemanager)
 add_library(rrc_image ALIAS ReactAndroid::rrc_image)
+add_library(rrc_legacyviewmanagerinterop ALIAS ReactAndroid::rrc_legacyviewmanagerinterop)
 
 find_package(fbjni REQUIRED CONFIG)
 add_library(fbjni ALIAS fbjni::fbjni)
@@ -91,6 +92,7 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
         react_render_mapbuffer              # prefab ready
         rrc_image                           # prefab ready
         rrc_view                            # prefab ready
+        rrc_legacyviewmanagerinterop        # prefab ready
         runtimeexecutor                     # prefab ready
         turbomodulejsijni                   # prefab ready
         yoga)                               # prefab ready

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.71.3
+VERSION_NAME=0.72.0-rc.0
 GROUP=com.facebook.react
 
 # JVM Versions
@@ -12,14 +12,14 @@ FRESCO_VERSION=2.5.0
 INFER_ANNOTATIONS_VERSION=0.18.0
 JAVAX_INJECT_VERSION=1
 JSR305_VERSION=3.0.2
-JUNIT_VERSION=4.12
-MOCKITO_CORE_VERSION=2.26.0
+JUNIT_VERSION=4.13.2
+MOCKITO_CORE_VERSION=2.28.2
 OKHTTP_VERSION=4.9.2
 OKIO_VERSION=2.9.0
-POWERMOCK_VERSION=2.0.2
+POWERMOCK_VERSION=2.0.9
 PROGUARD_ANNOTATIONS_VERSION=1.19.0
-ROBOLECTRIC_VERSION=4.4
-SO_LOADER_VERSION=0.10.4
+ROBOLECTRIC_VERSION=4.9.2
+SO_LOADER_VERSION=0.10.5
 SWIPEREFRESH_LAYOUT_VERSION=1.0.0
 
 # Native Dependency Versions
@@ -30,8 +30,5 @@ FOLLY_VERSION=2021.07.22.00
 GLOG_VERSION=0.3.5
 LIBEVENT_VERSION=2.1.12
 
-# Plugins Versions
-KOTLIN_VERSION=1.6.10
-
 android.useAndroidX=true
 android.enableJetifier=true

package/ReactAndroid/hermes-engine/build.gradle

@@ -33,7 +33,7 @@ def findCmakePath(cmakeVersion) {
     return "cmake"
 }
 
-def reactNativeRootDir = project(':ReactAndroid').projectDir.parent;
+def reactNativeRootDir = project(':packages:react-native:ReactAndroid').projectDir.parent;
 def customDownloadDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
 def downloadsDir = customDownloadDir ? new File(customDownloadDir) : new File(reactNativeRootDir, "sdks/download")
 
@@ -60,8 +60,10 @@ def jsiDir = new File(reactNativeRootDir, "ReactCommon/jsi")
 
 task downloadHermes(type: Download) {
     src("https://github.com/facebook/hermes/tarball/${hermesVersion}")
-    onlyIfNewer(true)
-    overwrite(false)
+    onlyIfModified(true)
+    overwrite(true)
+    useETag("all")
+    retries(5)
     dest(new File(downloadsDir, "hermes.tar.gz"))
 }
 
@@ -114,9 +116,18 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
+repositories {
+    // Normally RNGP will set repositories for all modules,
+    // but when consumed from source, we need to re-declare
+    // those repositories as there is no app module there.
+    mavenCentral()
+    google()
+}
+
 android {
     compileSdkVersion 31
     buildToolsVersion = "31.0.0"
+    namespace "com.facebook.hermes"
 
     // Used to override the NDK path/version on internal CI or by allowing
     // users to customize the NDK path/version from their root project (e.g. for M1 support)
@@ -135,7 +146,6 @@ android {
                 arguments "-DHERMES_IS_ANDROID=True"
                 arguments "-DANDROID_STL=c++_shared"
                 arguments "-DANDROID_PIE=True"
-                arguments "-DANDROID_LD=lld"
                 arguments "-DIMPORT_HERMESC=${new File(hermesBuildDir, "ImportHermesc.cmake").toString()}"
                 arguments "-DJSI_DIR=${jsiDir}"
                 arguments "-DHERMES_SLOW_DEBUG=False"
@@ -174,7 +184,6 @@ android {
         release {
             externalNativeBuild {
                 cmake {
-                    arguments "-DHERMES_ENABLE_DEBUGGER=False"
                     arguments "-DCMAKE_BUILD_TYPE=MinSizeRel"
                 }
             }

package/ReactAndroid/libs/BUCK

@@ -4,7 +4,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar")
 rn_android_prebuilt_aar(
     name = "appcompat",
     aar = ":appcompat-binary-aar",
-    visibility = ["//ReactAndroid/..."],
+    visibility = ["//packages/react-native/ReactAndroid/..."],
 )
 
 fb_native.remote_file(

package/ReactAndroid/proguard-rules.pro

@@ -60,3 +60,10 @@
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
+
+# yoga
+-keep,allowobfuscation @interface com.facebook.yoga.annotations.DoNotStrip
+-keep @com.facebook.yoga.annotations.DoNotStrip class *
+-keepclassmembers class * {
+    @com.facebook.yoga.annotations.DoNotStrip *;
+}

package/ReactAndroid/publish.gradle

@@ -12,7 +12,7 @@ def isNightly = findProperty("isNightly")?.toBoolean()
 def signingKey = findProperty("SIGNING_KEY")
 def signingPwd = findProperty("SIGNING_PWD")
 
-def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+def reactAndroidProjectDir = project(':packages:react-native:ReactAndroid').projectDir
 def androidOutputUrl = "file://${reactAndroidProjectDir}/../android"
 def mavenTempLocalUrl = "file:///tmp/maven-local"
 

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

@@ -2,13 +2,11 @@ load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_libra
 
 rn_android_library(
     name = "yoga",
-    srcs = glob(["yoga/*.java"]),
+    srcs = glob(["yoga/**/*.java"]),
     autoglob = False,
     language = "JAVA",
     visibility = ["PUBLIC"],
     deps = [
-        react_native_dep("libraries/fbjni:java"),
-        react_native_dep("java/com/facebook/proguard/annotations:annotations"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
         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/BUCK

@@ -1,5 +1,7 @@
 load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
+oncall("react_native")
+
 rn_android_library(
     name = "react",
     srcs = glob(["*.java"]),
@@ -8,49 +10,48 @@ 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:appcompat"),
-        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"),
-        react_native_dep("third-party/android/androidx:autofill"),
-    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
+        react_native_dep("java/com/facebook/hermes/reactexecutor:reactexecutor"),
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/android/androidx:appcompat"),
+        react_native_dep("third-party/android/androidx:autofill"),
+        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("java/com/facebook/hermes/reactexecutor:reactexecutor"),
         react_native_target("java/com/facebook/debug/holder:holder"),
         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/config:config"),
         react_native_target("java/com/facebook/react/devsupport:devsupport"),
         react_native_target("java/com/facebook/react/devsupport:interfaces"),
         react_native_target("java/com/facebook/react/jscexecutor:jscexecutor"),
         react_native_target("java/com/facebook/react/jstasks:jstasks"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/module/model:model"),
-        react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
         react_native_target("java/com/facebook/react/modules/appearance:appearance"),
+        react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
         react_native_target("java/com/facebook/react/modules/bundleloader:bundleloader"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
-        react_native_target("java/com/facebook/react/modules/fabric:fabric"),
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
+        react_native_target("java/com/facebook/react/modules/devtoolssettings:devtoolssettings"),
+        react_native_target("java/com/facebook/react/modules/fabric:fabric"),
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
         react_native_target("java/com/facebook/react/modules/toast:toast"),
         react_native_target("java/com/facebook/react/surface:surface"),
-        react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
-        react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/turbomodule/core:core"),
         react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
+        react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
+        react_native_target("java/com/facebook/react/views/traceupdateoverlay:traceupdateoverlay"),
     ],
     exported_deps = [
         react_native_target("java/com/facebook/react/modules/core:core"),