react-native 0.69.3 → 0.70.0-rc.2

package/React/Views/SafeAreaView/RCTSafeAreaView.m

@@ -21,7 +21,6 @@
 {
   if (self = [super initWithFrame:CGRectZero]) {
     _bridge = bridge;
-    _emulateUnlessSupported = YES; // The default.
   }
 
   return self;
@@ -41,48 +40,10 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 
   return [NSString stringWithFormat:@"%@; safeAreaInsets = %@; appliedSafeAreaInsets = %@>",
                                     superDescription,
-                                    NSStringFromUIEdgeInsets([self safeAreaInsetsIfSupportedAndEnabled]),
+                                    NSStringFromUIEdgeInsets(self.safeAreaInsets),
                                     NSStringFromUIEdgeInsets(_currentSafeAreaInsets)];
 }
 
-- (BOOL)isSupportedByOS
-{
-  return [self respondsToSelector:@selector(safeAreaInsets)];
-}
-
-- (UIEdgeInsets)safeAreaInsetsIfSupportedAndEnabled
-{
-  if (self.isSupportedByOS) {
-    return self.safeAreaInsets;
-  }
-  return self.emulateUnlessSupported ? self.emulatedSafeAreaInsets : UIEdgeInsetsZero;
-}
-
-- (UIEdgeInsets)emulatedSafeAreaInsets
-{
-  UIViewController *vc = self.reactViewController;
-
-  if (!vc) {
-    return UIEdgeInsetsZero;
-  }
-
-  CGFloat topLayoutOffset = vc.topLayoutGuide.length;
-  CGFloat bottomLayoutOffset = vc.bottomLayoutGuide.length;
-  CGRect safeArea = vc.view.bounds;
-  safeArea.origin.y += topLayoutOffset;
-  safeArea.size.height -= topLayoutOffset + bottomLayoutOffset;
-  CGRect localSafeArea = [vc.view convertRect:safeArea toView:self];
-  UIEdgeInsets safeAreaInsets = UIEdgeInsetsMake(0, 0, 0, 0);
-  if (CGRectGetMinY(localSafeArea) > CGRectGetMinY(self.bounds)) {
-    safeAreaInsets.top = CGRectGetMinY(localSafeArea) - CGRectGetMinY(self.bounds);
-  }
-  if (CGRectGetMaxY(localSafeArea) < CGRectGetMaxY(self.bounds)) {
-    safeAreaInsets.bottom = CGRectGetMaxY(self.bounds) - CGRectGetMaxY(localSafeArea);
-  }
-
-  return safeAreaInsets;
-}
-
 static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIEdgeInsets insets2, CGFloat threshold)
 {
   return ABS(insets1.left - insets2.left) <= threshold && ABS(insets1.right - insets2.right) <= threshold &&
@@ -91,21 +52,7 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
 
 - (void)safeAreaInsetsDidChange
 {
-  [self invalidateSafeAreaInsets];
-}
-
-- (void)invalidateSafeAreaInsets
-{
-  [self setSafeAreaInsets:self.safeAreaInsetsIfSupportedAndEnabled];
-}
-
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-
-  if (!self.isSupportedByOS && self.emulateUnlessSupported) {
-    [self invalidateSafeAreaInsets];
-  }
+  [self setSafeAreaInsets:self.safeAreaInsets];
 }
 
 - (void)setSafeAreaInsets:(UIEdgeInsets)safeAreaInsets
@@ -120,19 +67,4 @@ static BOOL UIEdgeInsetsEqualToEdgeInsetsWithThreshold(UIEdgeInsets insets1, UIE
   [_bridge.uiManager setLocalData:localData forView:self];
 }
 
-- (void)setEmulateUnlessSupported:(BOOL)emulateUnlessSupported
-{
-  if (_emulateUnlessSupported == emulateUnlessSupported) {
-    return;
-  }
-
-  _emulateUnlessSupported = emulateUnlessSupported;
-
-  if ([self isSupportedByOS]) {
-    return;
-  }
-
-  [self invalidateSafeAreaInsets];
-}
-
 @end

package/React/Views/SafeAreaView/RCTSafeAreaViewManager.m

@@ -15,8 +15,6 @@
 
 RCT_EXPORT_MODULE()
 
-RCT_EXPORT_VIEW_PROPERTY(emulateUnlessSupported, BOOL)
-
 - (UIView *)view
 {
   return [[RCTSafeAreaView alloc] initWithBridge:self.bridge];

package/React/third-party.xcconfig

@@ -8,5 +8,5 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_76_0 $(SRCROOT)/../third-party/folly-2021.06.28.00 $(SRCROOT)/../third-party/glog-0.3.5/src
+HEADER_SEARCH_PATHS = $(SRCROOT)/../third-party/boost_1_76_0 $(SRCROOT)/../third-party/folly-2021.07.22.00 $(SRCROOT)/../third-party/glog-0.3.5/src
 OTHER_CFLAGS = -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1

package/React-Core.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 header_subspecs = {
@@ -47,7 +47,13 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"${PODS_ROOT}/Headers/Public/FlipperKit\" \"$(PODS_ROOT)/Headers/Public/ReactCommon\" \"$(PODS_ROOT)/Headers/Public/React-RCTFabric\"", "DEFINES_MODULE" => "YES" }
+  s.pod_target_xcconfig    = {
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"${PODS_ROOT}/Headers/Public/FlipperKit\" \"$(PODS_ROOT)/Headers/Public/ReactCommon\" \"$(PODS_ROOT)/Headers/Public/React-RCTFabric\"",
+    "FRAMEWORK_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes\"",
+    "DEFINES_MODULE" => "YES",
+    "GCC_PREPROCESSOR_DEFINITIONS" => "RCT_METRO_PORT=${RCT_METRO_PORT}",
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+  }
   s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
   s.default_subspec        = "Default"
 

package/ReactAndroid/.npmignore

@@ -5,3 +5,6 @@ build/
 .cxx/
 # Exclude buck config/jars for third-party libraries
 src/main/third-party/
+# Exclude Android & JVM tests
+src/test/
+src/androidTest/

package/ReactAndroid/README.md

@@ -1,7 +1,8 @@
 # Building React Native for Android
 
-See the [docs on the wiki](https://github.com/facebook/react-native/wiki/Building-from-source#prerequisites).
+See the [Building from Source guide](https://reactnative.dev/contributing/how-to-build-from-source#prerequisites) on the React Native website.
 
 # Running tests
 
-When you submit a pull request CircleCI will automatically run all tests. To run tests locally, see [Testing](https://github.com/facebook/react-native/wiki/Tests).
+When you submit a pull request CircleCI will automatically run all tests.
+To run tests locally, see [Testing guide](https://reactnative.dev/contributing/how-to-run-and-write-tests) on the React Native website.

package/ReactAndroid/build.gradle

@@ -283,6 +283,7 @@ android {
             cmake {
                 arguments "-DREACT_COMMON_DIR=${reactNativeRootDir}/ReactCommon",
                         "-DREACT_ANDROID_DIR=$projectDir",
+                        "-DREACT_BUILD_DIR=$buildDir",
                         "-DANDROID_STL=c++_shared",
                         "-DANDROID_TOOLCHAIN=clang",
                         "-DANDROID_PLATFORM=android-21"
@@ -365,42 +366,44 @@ android {
     publishing {
         multipleVariants {
             withSourcesJar()
-            withJavadocJar()
             allVariants()
         }
     }
 }
 
 dependencies {
-    api("com.facebook.infer.annotation:infer-annotation:0.18.0")
-    api("com.facebook.yoga:proguard-annotations:1.19.0")
-    api("javax.inject:javax.inject:1")
-    api("androidx.appcompat:appcompat:${APPCOMPAT_VERSION}")
-    api("androidx.appcompat:appcompat-resources:${APPCOMPAT_VERSION}")
-    api("androidx.autofill:autofill:1.1.0")
-    api("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
+    api("androidx.appcompat:appcompat-resources:${ANDROIDX_APPCOMPAT_VERSION}")
+    api("androidx.appcompat:appcompat:${ANDROIDX_APPCOMPAT_VERSION}")
+    api("androidx.autofill:autofill:${ANDROIDX_AUTOFILL_VERSION}")
+    api("androidx.swiperefreshlayout:swiperefreshlayout:${SWIPEREFRESH_LAYOUT_VERSION}")
+
+    api("com.facebook.fbjni:fbjni-java-only:${FBJNI_VERSION}")
     api("com.facebook.fresco:fresco:${FRESCO_VERSION}")
     api("com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}")
     api("com.facebook.fresco:ui-common:${FRESCO_VERSION}")
+    api("com.facebook.infer.annotation:infer-annotation:${INFER_ANNOTATIONS_VERSION}")
     api("com.facebook.soloader:soloader:${SO_LOADER_VERSION}")
-    api("com.google.code.findbugs:jsr305:3.0.2")
-    api("com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}")
+    api("com.facebook.yoga:proguard-annotations:${PROGUARD_ANNOTATIONS_VERSION}")
+
+    api("com.google.code.findbugs:jsr305:${JSR305_VERSION}")
     api("com.squareup.okhttp3:okhttp-urlconnection:${OKHTTP_VERSION}")
-    api("com.squareup.okio:okio:2.9.0")
-    api("com.facebook.fbjni:fbjni-java-only:0.2.2")
-    extractHeaders("com.facebook.fbjni:fbjni:0.2.2:headers")
-    extractJNI("com.facebook.fbjni:fbjni:0.2.2")
+    api("com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}")
+    api("com.squareup.okio:okio:${OKIO_VERSION}")
+    api("javax.inject:javax.inject:${JAVAX_INJECT_VERSION}")
+
+    extractHeaders("com.facebook.fbjni:fbjni:${FBJNI_VERSION}:headers")
+    extractJNI("com.facebook.fbjni:fbjni:${FBJNI_VERSION}")
 
     // 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"))
 
     testImplementation("junit:junit:${JUNIT_VERSION}")
+    testImplementation("org.assertj:assertj-core:${ASSERTJ_VERSION}")
+    testImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")
     testImplementation("org.powermock:powermock-api-mockito2:${POWERMOCK_VERSION}")
-    testImplementation("org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}")
     testImplementation("org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}")
-    testImplementation("org.mockito:mockito-core:${MOCKITO_CORE_VERSION}")
-    testImplementation("org.assertj:assertj-core:3.21.0")
+    testImplementation("org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}")
     testImplementation("org.robolectric:robolectric:${ROBOLECTRIC_VERSION}")
 
     androidTestImplementation(fileTree(dir: "src/main/third-party/java/buck-android-support/", include: ["*.jar"]))
@@ -413,6 +416,7 @@ 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/..")
     useJavaGenerator = System.getenv("USE_CODEGEN_JAVAPOET")?.toBoolean() ?: false

package/ReactAndroid/cmake-utils/Android-prebuilt.cmake

@@ -0,0 +1,231 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# This configuration provides access to most common React Native prebuilt .so files
+# to avoid recompiling each of the libraries outside of ReactAndroid NDK compilation.
+# Hosting app's/library's CMakeLists.txt can include this Android-prebuilt.cmake file to
+# get access to those libraries to depend on.
+# NOTES:
+# * Currently, it assumes building React Native from source.
+# * Not every .so is listed here (yet).
+# * Static libs are not covered here (yet).
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+# FIRST_PARTY_NDK_DIR contains vendored source code from other FB frameworks
+# like Yoga, FBJNI, etc.
+set(FIRST_PARTY_NDK_DIR ${REACT_ANDROID_DIR}/src/main/jni/first-party)
+# THIRD_PARTY_NDK_DIR is where we're downloading third-party native
+# frameworks such as libevent, boost, etc.
+set(THIRD_PARTY_NDK_DIR ${REACT_ANDROID_BUILD_DIR}/third-party-ndk)
+# REACT_ANDROID_SRC_DIR is the root of ReactAndroid source code (Java & JNI)
+set(REACT_ANDROID_SRC_DIR ${REACT_ANDROID_DIR}/src/main)
+# REACT_COMMON_DIR is the root of ReactCommon source code (C++ only)
+set(REACT_COMMON_DIR ${REACT_ANDROID_DIR}/../ReactCommon)
+# REACT_GENERATED_SRC_DIR is the folder where the codegen for rncore will output
+set(REACT_GENERATED_SRC_DIR ${REACT_ANDROID_BUILD_DIR}/generated/source)
+# REACT_NDK_EXPORT_DIR is the folder where the .so will be copied for being inported
+# in the local project by the packageReactDebugNdkLibs/packageReactReleaseNdkLibs
+set(REACT_NDK_EXPORT_DIR ${PROJECT_BUILD_DIR}/react-ndk/exported)
+
+## fb
+add_library(fb SHARED IMPORTED GLOBAL)
+set_target_properties(fb
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfb.so)
+target_include_directories(fb
+        INTERFACE
+        ${FIRST_PARTY_NDK_DIR}/fb/include)
+
+## folly_runtime
+add_library(folly_runtime SHARED IMPORTED GLOBAL)
+set_target_properties(folly_runtime
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfolly_runtime.so)
+target_include_directories(folly_runtime
+        INTERFACE
+        ${THIRD_PARTY_NDK_DIR}/boost/boost_1_76_0
+        ${THIRD_PARTY_NDK_DIR}/double-conversion
+        ${THIRD_PARTY_NDK_DIR}/folly)
+target_compile_options(folly_runtime
+        INTERFACE
+        -DFOLLY_NO_CONFIG=1
+        -DFOLLY_HAVE_CLOCK_GETTIME=1
+        -DFOLLY_HAVE_MEMRCHR=1
+        -DFOLLY_USE_LIBCPP=1
+        -DFOLLY_MOBILE=1
+        -DFOLLY_HAVE_XSI_STRERROR_R=1)
+
+## glog
+add_library(glog SHARED IMPORTED GLOBAL)
+set_target_properties(glog
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libglog.so)
+target_include_directories(glog INTERFACE ${THIRD_PARTY_NDK_DIR}/glog/exported)
+
+## yoga
+add_library(yoga SHARED IMPORTED GLOBAL)
+set_target_properties(yoga
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libyoga.so)
+target_include_directories(yoga
+        INTERFACE
+        ${FIRST_PARTY_NDK_DIR}/yogajni/jni
+        ${REACT_COMMON_DIR}/yoga)
+target_compile_options(yoga
+        INTERFACE
+        -fvisibility=hidden
+        -fexceptions
+        -frtti
+        -O3)
+target_link_libraries(yoga INTERFACE log android)
+
+## react_nativemodule_core
+add_library(react_nativemodule_core SHARED IMPORTED GLOBAL)
+set_target_properties(react_nativemodule_core
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_nativemodule_core.so)
+target_include_directories(react_nativemodule_core
+        INTERFACE
+        ${REACT_ANDROID_SRC_DIR}/jni
+        ${REACT_COMMON_DIR}
+        ${REACT_COMMON_DIR}/callinvoker
+        ${REACT_COMMON_DIR}/jsi
+        ${REACT_COMMON_DIR}/react/nativemodule/core
+        ${REACT_COMMON_DIR}/react/nativemodule/core/platform/android)
+target_link_libraries(react_nativemodule_core INTERFACE folly_runtime)
+
+## turbomodulejsijni
+add_library(turbomodulejsijni SHARED IMPORTED GLOBAL)
+set_target_properties(turbomodulejsijni
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libturbomodulejsijni.so)
+target_include_directories(turbomodulejsijni
+        INTERFACE
+        ${REACT_ANDROID_SRC_DIR}/java/com/facebook/react/turbomodule/core/jni)
+
+## react_render_core
+add_library(react_render_core SHARED IMPORTED GLOBAL)
+set_target_properties(react_render_core
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_core.so)
+target_include_directories(react_render_core
+        INTERFACE
+        ${REACT_COMMON_DIR}
+        ${REACT_COMMON_DIR}/react/renderer/core)
+
+## react_render_debug
+add_library(react_render_debug SHARED IMPORTED GLOBAL)
+set_target_properties(react_render_debug
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_debug.so)
+target_include_directories(react_render_debug INTERFACE ${REACT_COMMON_DIR}/react/renderer/debug)
+
+## react_debug
+add_library(react_debug SHARED IMPORTED GLOBAL)
+set_target_properties(react_debug
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_debug.so)
+target_include_directories(react_debug INTERFACE ${REACT_COMMON_DIR}/react/debug)
+target_link_libraries(react_nativemodule_core INTERFACE folly_runtime)
+
+## react_render_graphics
+add_library(react_render_graphics SHARED IMPORTED GLOBAL)
+set_target_properties(react_render_graphics
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_graphics.so)
+target_include_directories(react_render_graphics
+        INTERFACE
+        ${REACT_COMMON_DIR}/react/renderer/graphics
+        ${REACT_COMMON_DIR}/react/renderer/graphics/platform/cxx)
+
+## react_render_imagemanager
+add_library(react_render_imagemanager SHARED IMPORTED GLOBAL)
+set_target_properties(react_render_imagemanager
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_imagemanager.so)
+target_include_directories(react_render_imagemanager
+        INTERFACE
+        ${REACT_COMMON_DIR}/react/renderer/imagemanager
+        ${REACT_COMMON_DIR}/react/renderer/imagemanager/platform/cxx)
+
+## react_render_mounting
+add_library(react_render_mounting SHARED IMPORTED GLOBAL)
+set_target_properties(react_render_mounting
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_mounting.so)
+target_include_directories(react_render_mounting INTERFACE ${REACT_COMMON_DIR}/react/renderer/mounting)
+
+## react_render_mapbuffer
+add_library(react_render_mapbuffer SHARED IMPORTED GLOBAL)
+set_target_properties(react_render_mapbuffer
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_mapbuffer.so)
+target_include_directories(react_render_mapbuffer INTERFACE ${REACT_COMMON_DIR}/react/renderer/mapbuffer)
+
+## rrc_view
+add_library(rrc_view SHARED IMPORTED GLOBAL)
+set_target_properties(rrc_view
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/librrc_view.so)
+target_include_directories(rrc_view INTERFACE ${REACT_COMMON_DIR}/react/renderer/components/view)
+
+## fabricjni
+add_library(fabricjni SHARED IMPORTED GLOBAL)
+set_target_properties(fabricjni
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libfabricjni.so)
+target_include_directories(fabricjni INTERFACE ${REACT_ANDROID_SRC_DIR}/java/com/facebook/react/fabric/jni)
+
+## react_render_componentregistry
+add_library(react_render_componentregistry SHARED IMPORTED GLOBAL)
+set_target_properties(react_render_componentregistry
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_render_componentregistry.so)
+target_include_directories(react_render_componentregistry INTERFACE ${REACT_COMMON_DIR}/react/renderer/componentregistry)
+
+## jsi
+add_library(jsi SHARED IMPORTED GLOBAL)
+set_target_properties(jsi
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libjsi.so)
+target_include_directories(jsi INTERFACE ${REACT_COMMON_DIR}/jsi)
+
+## react_codegen_rncore
+add_library(react_codegen_rncore SHARED IMPORTED GLOBAL)
+set_target_properties(react_codegen_rncore
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libreact_codegen_rncore.so)
+target_include_directories(react_codegen_rncore INTERFACE ${REACT_GENERATED_SRC_DIR}/codegen/jni)
+
+## runtimeexecutor
+add_library(runtimeexecutor SHARED IMPORTED GLOBAL)
+set_target_properties(runtimeexecutor
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${REACT_NDK_EXPORT_DIR}/${ANDROID_ABI}/libruntimeexecutor.so)
+target_include_directories(runtimeexecutor INTERFACE ${REACT_COMMON_DIR}/runtimeexecutor)
+
+## fbjni
+add_subdirectory(${FIRST_PARTY_NDK_DIR}/fbjni fbjni_build)

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

@@ -0,0 +1,56 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# This CMake file takes care of creating everything you need to build and link
+# your C++ source code in a React Native Application for Android.
+# You just need to call `project(<my_project_name>)` and import this file.
+# Specifically this file will:
+# - Take care of creating a shared library called as your project
+# - Take care of setting the correct compile options
+# - Include all the pre-built libraries in your build graph
+# - Link your library against those prebuilt libraries so you can access JSI, Fabric, etc.
+# - Link your library against any autolinked library.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+include(${REACT_ANDROID_DIR}/cmake-utils/Android-prebuilt.cmake)
+
+file(GLOB input_SRC CONFIGURE_DEPENDS 
+        *.cpp
+        ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/*.cpp)
+
+add_library(${CMAKE_PROJECT_NAME} SHARED ${input_SRC})
+
+target_include_directories(${CMAKE_PROJECT_NAME} 
+        PUBLIC 
+                ${CMAKE_CURRENT_SOURCE_DIR}
+                ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni)
+
+target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Werror -fexceptions -frtti -std=c++17 -DWITH_INSPECTOR=1 -DLOG_TAG=\"ReactNative\")
+
+target_link_libraries(${CMAKE_PROJECT_NAME}
+        fabricjni
+        fbjni
+        folly_runtime
+        glog
+        jsi
+        react_codegen_rncore
+        react_debug
+        react_nativemodule_core
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        rrc_view
+        runtimeexecutor
+        turbomodulejsijni
+        yoga)
+
+# If project is on RN CLI v9, then we can use the following lines to link against the autolinked 3rd party libraries.
+if(EXISTS ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
+        include(${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
+        target_link_libraries(${CMAKE_PROJECT_NAME} ${AUTOLINKED_LIBRARIES})
+endif()

package/ReactAndroid/gradle.properties

@@ -1,27 +1,37 @@
-VERSION_NAME=0.69.3
+VERSION_NAME=0.70.0-rc.2
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
 POM_ARTIFACT_ID=react-native
 POM_PACKAGING=aar
 
-MOCKITO_CORE_VERSION=2.26.0
-POWERMOCK_VERSION=2.0.2
-ROBOLECTRIC_VERSION=4.4
-JUNIT_VERSION=4.12
-
+# JVM Versions
+ASSERTJ_VERSION=3.21.0
 ANDROIDX_TEST_VERSION=1.1.0
-APPCOMPAT_VERSION=1.4.1
+ANDROIDX_APPCOMPAT_VERSION=1.4.1
+ANDROIDX_AUTOFILL_VERSION=1.1.0
+FBJNI_VERSION=0.2.2
 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
+OKIO_VERSION=2.9.0
 OKHTTP_VERSION=4.9.2
-SO_LOADER_VERSION=0.10.3
+POWERMOCK_VERSION=2.0.2
+PROGUARD_ANNOTATIONS_VERSION=1.19.0
+ROBOLECTRIC_VERSION=4.4
+SO_LOADER_VERSION=0.10.4
+SWIPEREFRESH_LAYOUT_VERSION=1.0.0
 
+# Native Dependency Versions
 BOOST_VERSION=1_76_0
 DOUBLE_CONVERSION_VERSION=1.1.6
-FOLLY_VERSION=2021.06.28.00
 FMT_VERSION=6.2.1
-LIBEVENT_VERSION=2.1.12
+FOLLY_VERSION=2021.07.22.00
 GLOG_VERSION=0.3.5
+LIBEVENT_VERSION=2.1.12
 
 android.useAndroidX=true
 android.enableJetifier=true

package/ReactAndroid/hermes-engine/build.gradle

@@ -213,7 +213,6 @@ android {
     publishing {
         multipleVariants {
             withSourcesJar()
-            withJavadocJar()
             allVariants()
         }
     }

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

@@ -4,6 +4,7 @@ rn_android_library(
     name = "yoga",
     srcs = glob(["yoga/*.java"]),
     autoglob = False,
+    language = "JAVA",
     visibility = ["PUBLIC"],
     deps = [
         react_native_dep("libraries/fbjni:java"),

package/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK

@@ -4,6 +4,7 @@ rn_android_library(
     name = "model",
     srcs = glob(["*.java"]),
     autoglob = False,
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

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

@@ -8,6 +8,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

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

@@ -8,6 +8,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

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

@@ -4,6 +4,7 @@ rn_android_library(
     name = "instrumentation",
     srcs = ["HermesMemoryDumper.java"],
     autoglob = False,
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],
@@ -17,6 +18,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     visibility = ["PUBLIC"],
     deps = [
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),

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

@@ -7,6 +7,7 @@ rn_android_library(
         "HermesExecutorFactory.java",
     ],
     autoglob = False,
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],
@@ -27,6 +28,7 @@ rn_android_library(
         "RuntimeConfig.java",
     ],
     autoglob = False,
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

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

@@ -4,6 +4,7 @@ rn_android_library(
     name = "unicode",
     srcs = glob(["**/*.java"]),
     autoglob = False,
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],