[No QA] Upgrade RN to 0.70.4 (aka 0.70.1)

.gitignore

@@ -35,6 +35,7 @@ local.properties
 *.iml
 android/*.hprof
 android/app/src/main/java/com/expensify/chat/generated/
+.cxx/
 
 # Vscode
 .vscode

android/app/build.gradle

@@ -3,6 +3,7 @@ apply plugin: "com.google.firebase.firebase-perf"
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
 import com.android.build.OutputFile
+import org.apache.tools.ant.taskdefs.condition.Os
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -160,22 +161,14 @@ android {
  buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
  if (isNewArchitectureEnabled()) {
- // We configure the NDK build only if you decide to opt-in for the New Architecture.
+ // We configure the CMake build only if you decide to opt-in for the New Architecture.
  externalNativeBuild {
- ndkBuild {
- arguments "APP_PLATFORM=android-21",
- "APP_STL=c++_shared",
- "NDK_TOOLCHAIN_VERSION=clang",
- "GENERATED_SRC_DIR=$buildDir/generated/source",
- "PROJECT_BUILD_DIR=$buildDir",
- "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
- "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
- "NODE_MODULES_DIR=$rootDir/../node_modules"
- cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
- cppFlags "-std=c++17"
- // Make sure this target name is the same you specify inside the
- // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
- targets "rndiffapp_appmodules"
+ cmake {
+ arguments "-DPROJECT_BUILD_DIR=$buildDir",
+ "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+ "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+ "-DNODE_MODULES_DIR=$rootDir/../node_modules",
+ "-DANDROID_STL=c++_shared"
  }
  }
  if (!enableSeparateBuildPerCPUArchitecture) {
@@ -189,8 +182,8 @@ android {
  if (isNewArchitectureEnabled()) {
  // We configure the NDK build only if you decide to opt-in for the New Architecture.
  externalNativeBuild {
- ndkBuild {
- path "$projectDir/src/main/jni/Android.mk"
+ cmake {
+ path "$projectDir/src/main/jni/CMakeLists.txt"
  }
  }
  def reactAndroidProjectDir = project(':ReactAndroid').projectDir
@@ -211,15 +204,15 @@ android {
  preDebugBuild.dependsOn(packageReactNdkDebugLibs)
  preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
  // Due to a bug inside AGP, we have to explicitly set a dependency
- // between configureNdkBuild* tasks and the preBuild tasks.
+ // between configureCMakeDebug* tasks and the preBuild tasks.
  // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
- configureNdkBuildRelease.dependsOn(preReleaseBuild)
- configureNdkBuildDebug.dependsOn(preDebugBuild)
+ configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild)
+ configureCMakeDebug.dependsOn(preDebugBuild)
  reactNativeArchitectures().each { architecture ->
- tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+ tasks.findByName("configureCMakeDebug[${architecture}]")?.configure {
  dependsOn("preDebugBuild")
  }
- tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+ tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure {
  dependsOn("preReleaseBuild")
  }
  }

android/app/src/main/java/com/expensify/chat/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java

@@ -41,7 +41,7 @@ protected synchronized void maybeLoadOtherSoLibraries() {
  if (!sIsSoLibraryLoaded) {
  // If you change the name of your application .so file in the Android.mk file,
  // make sure you update the name here as well.
- SoLoader.loadLibrary("rndiffapp_appmodules");
+ SoLoader.loadLibrary("newexpensify_appmodules");
  sIsSoLibraryLoaded = true;
  }
  }

android/app/src/main/jni/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.13)
+
+# Define the library name here.
+project(newexpensify_appmodules)
+
+# This file includes all the necessary to let you build your application with the New Architecture.
+include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)
+

android/app/src/main/jni/MainApplicationModuleProvider.cpp

@@ -8,16 +8,22 @@ namespace react {
 std::shared_ptr<TurboModule> MainApplicationModuleProvider(
  const std::string moduleName,
  const JavaTurboModule::InitParams &params) {
- // Here you can provide your own module provider for TurboModules coming from
- // either your application or from external libraries. The approach to follow
- // is similar to the following (for a library called `samplelibrary`:
- //
- // auto module = samplelibrary_ModuleProvider(moduleName, params);
- // if (module != nullptr) {
- // return module;
- // }
- // return rncore_ModuleProvider(moduleName, params);
- return rncore_ModuleProvider(moduleName, params);
+ // Here you can provide your own module provider for TurboModules coming from
+ // either your application or from external libraries. The approach to follow
+ // is similar to the following (for a library called `samplelibrary`:
+ //
+ // auto module = samplelibrary_ModuleProvider(moduleName, params);
+ // if (module != nullptr) {
+ // return module;
+ // }
+ // return rncore_ModuleProvider(moduleName, params);
+ return rncore_ModuleProvider(moduleName, params);
+
+ // Module providers autolinked by RN CLI
+ auto rncli_module = rncli_ModuleProvider(moduleName, params);
+ if (rncli_module != nullptr) {
+ return rncli_module;
+ }
 }
 
 } // namespace react

android/app/src/main/jni/MainApplicationModuleProvider.h

@@ -9,7 +9,7 @@ namespace facebook {
 namespace react {
 
 std::shared_ptr<TurboModule> MainApplicationModuleProvider(
- const std::string moduleName,
+ const std::string &moduleName,
  const JavaTurboModule::InitParams &params);
 
 } // namespace react

android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp

@@ -22,21 +22,21 @@ void MainApplicationTurboModuleManagerDelegate::registerNatives() {
 
 std::shared_ptr<TurboModule>
 MainApplicationTurboModuleManagerDelegate::getTurboModule(
- const std::string name,
- const std::shared_ptr<CallInvoker> jsInvoker) {
+ const std::string &name,
+ const std::shared_ptr<CallInvoker> &jsInvoker) {
  // Not implemented yet: provide pure-C++ NativeModules here.
  return nullptr;
 }
 
 std::shared_ptr<TurboModule>
 MainApplicationTurboModuleManagerDelegate::getTurboModule(
- const std::string name,
+ const std::string &name,
  const JavaTurboModule::InitParams &params) {
  return MainApplicationModuleProvider(name, params);
 }
 
 bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
- std::string name) {
+ const std::string &name) {
  return getTurboModule(name, nullptr) != nullptr ||
  getTurboModule(name, {.moduleName = name}) != nullptr;
 }

android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h

@@ -21,17 +21,17 @@ class MainApplicationTurboModuleManagerDelegate
  static void registerNatives();
 
  std::shared_ptr<TurboModule> getTurboModule(
- const std::string name,
- const std::shared_ptr<CallInvoker> jsInvoker) override;
+ const std::string &name,
+ const std::shared_ptr<CallInvoker> &jsInvoker) override;
  std::shared_ptr<TurboModule> getTurboModule(
- const std::string name,
+ const std::string &name,
  const JavaTurboModule::InitParams &params) override;
 
  /**
  * Test-only method. Allows user to verify whether a TurboModule can be
  * created by instances of this class.
  */
- bool canCreateTurboModule(std::string name);
+ bool canCreateTurboModule(const std::string &name);
 };
 
 } // namespace react

android/app/src/main/jni/MainComponentsRegistry.cpp

@@ -4,6 +4,7 @@
 #include <fbjni/fbjni.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <react/renderer/components/rncore/ComponentDescriptors.h>
+#include <rncli.h>
 
 namespace facebook {
 namespace react {
@@ -14,6 +15,9 @@ std::shared_ptr<ComponentDescriptorProviderRegistry const>
 MainComponentsRegistry::sharedProviderRegistry() {
  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
 
+ // Autolinked providers registered by RN CLI
+ rncli_registerProviders(providerRegistry);
+
  // Custom Fabric Components go here. You can register custom
  // components coming from your App or from 3rd party libraries here.
  //

android/build.gradle

@@ -1,5 +1,3 @@
-import org.apache.tools.ant.taskdefs.condition.Os
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
@@ -28,7 +26,7 @@ buildscript {
  mavenCentral()
  }
  dependencies {
- classpath("com.android.tools.build:gradle:7.1.1")
+ classpath("com.android.tools.build:gradle:7.2.1")
  classpath("com.facebook.react:react-native-gradle-plugin")
  classpath("de.undercouch:gradle-download-task:5.0.1")
  classpath("com.google.gms:google-services:4.3.4")

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists