@W-16556387: [ReactNative][Android] Upgrade to React Native 0.79 (#2725)

Author: JohnsonEricAtSalesforce

build.gradle.kts

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.6.1")
+        classpath("com.android.tools.build:gradle:8.8.2")
         classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
         classpath("org.jacoco:org.jacoco.core:0.8.12")

buildSrc/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:8.6.1")
+    implementation("com.android.tools.build:gradle:8.8.2")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

libs/SalesforceReact/babel.config.js

@@ -1,6 +1,7 @@
 module.exports = {
-    presets: ['module:metro-react-native-babel-preset'],
-    plugins: [
-	["@babel/plugin-transform-private-methods", { "loose": true }]
-    ]    
+  presets: ['module:@react-native/babel-preset'],
+  plugins: [
+    ["@babel/plugin-transform-class-static-block", { "loose": true }],
+  	["@babel/plugin-transform-private-methods", { "loose": true }]
+  ]
 };

libs/SalesforceReact/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 dependencies {
     api(project(":libs:MobileSync"))
-    api("com.facebook.react:react-android:0.74.7")
+    api("com.facebook.react:react-android:0.79.3")
     implementation("androidx.core:core-ktx:1.15.0")
     androidTestImplementation("androidx.test:runner:1.6.2")
     androidTestImplementation("androidx.test:rules:1.6.1")
@@ -124,7 +124,7 @@ task<Exec>("buildReactTestBundle") {
             "cmd",
             "/c",
             "node",
-            "node_modules/react-native/local-cli/cli.js",
+            "node_modules/react-native/cli.js",
             "bundle",
             "--platform",
             "android",
@@ -139,8 +139,8 @@ task<Exec>("buildReactTestBundle") {
         )
     } else {
         commandLine(
-            "/usr/local/bin/node",
-            "node_modules/react-native/local-cli/cli.js",
+            "node",
+            "node_modules/react-native/cli.js",
             "bundle",
             "--platform",
             "android",

libs/SalesforceReact/metro.config.js

@@ -1,10 +1,10 @@
 const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
 
 /**
- * Metro configuration for React Native
- * https://facebook.github.io/metro/docs/configuration
+ * Metro configuration
+ * https://reactnative.dev/docs/metro
  *
- * @type {import('metro-config').MetroConfig}
+ * @type {import('@react-native/metro-config').MetroConfig}
  */
 const config = {};
 

libs/SalesforceReact/package.json

@@ -3,32 +3,37 @@
   "version": "13.1.0",
   "private": true,
   "scripts": {
-    "start": "node node_modules/react-native/local-cli/cli.js start"
+    "start": "react-native start"
   },
   "dependencies": {
     "@babel/plugin-transform-private-property-in-object": "^7.24.7",
     "create-react-class": "^15.7.0",
-    "react": "18.2.0",
-    "react-native": "0.74.7",
+    "jsc-android": "^250231.0.0",
+    "react": "19.0.0",
+    "react-native": "0.79.3",
     "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#dev"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.0",
-    "@babel/preset-env": "^7.20.0",
-    "@babel/runtime": "^7.20.0",
-    "@react-native/babel-preset": "0.74.89",
-    "@react-native/eslint-config": "0.74.89",
-    "@react-native/metro-config": "0.74.89",
-    "@react-native/typescript-config": "0.74.89",
-    "@types/react": "^18.2.6",
-    "@types/react-test-renderer": "^18.0.0",
-    "babel-jest": "^29.6.3",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/runtime": "^7.25.0",
+    "@react-native-community/cli": "18.0.0",
+    "@react-native-community/cli-platform-android": "18.0.0",
+    "@react-native-community/cli-platform-ios": "18.0.0",
+    "@react-native/babel-preset": "0.79.3",
+    "@react-native/eslint-config": "0.79.3",
+    "@react-native/metro-config": "0.79.3",
+    "@react-native/typescript-config": "0.79.3",
+    "@types/jest": "^29.5.13",
+    "@types/react": "^19.0.0",
+    "@types/react-test-renderer": "^19.0.0",
+    "babel-jest": "^30.0.0",
     "chai": "4.4.1",
     "eslint": "^8.19.0",
     "jest": "^29.6.3",
     "metro-react-native-babel-preset": "0.77.0",
     "prettier": "2.8.8",
-    "react-test-renderer": "18.2.0",
+    "react-test-renderer": "19.0.0",
     "typescript": "5.0.4"
   },
   "engines": {

libs/test/SalesforceReactTest/src/com/salesforce/androidsdk/reactnative/ReactMobileSyncTest.java

@@ -52,10 +52,10 @@ public class ReactMobileSyncTest extends ReactTestCase {
     @Parameterized.Parameters(name = "{0}")
     public static List<String> data() {
         return Arrays.asList(
+                "testCleanResyncGhosts",
                 "testSyncUp",
                 "testSyncDown",
                 "testReSync",
-                "testCleanResyncGhosts",
                 "testGetSyncStatusDeleteSync");
     }
 

libs/test/SalesforceReactTest/src/com/salesforce/androidsdk/reactnative/util/ReactActivityTestDelegate.java

@@ -62,7 +62,7 @@ protected void loadApp(String appKey) {
     }
 
     @Override
-    protected void onDestroy() {
+    public void onDestroy() {
         getReactNativeHost().getReactInstanceManager().destroy();
         super.onDestroy();
     }

libs/test/SalesforceReactTest/src/com/salesforce/androidsdk/reactnative/util/SalesforceReactTestApp.java

@@ -31,11 +31,14 @@
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
+import com.facebook.react.soloader.OpenSourceMergedSoMapping;
 import com.facebook.soloader.SoLoader;
 import com.salesforce.androidsdk.analytics.EventBuilderHelper;
 import com.salesforce.androidsdk.reactnative.app.SalesforceReactSDKManager;
 import com.salesforce.androidsdk.util.test.TestCredentials;
 
+import java.io.IOException;
+
 /**
  * Test application for Salesforce react native modules.
  */
@@ -51,7 +54,11 @@ public ReactNativeHost getReactNativeHost() {
     @Override
     public void onCreate() {
         super.onCreate();
-        SoLoader.init(this, /* native exopackage */ false);
+        try {
+            SoLoader.init(this, OpenSourceMergedSoMapping.INSTANCE);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         EventBuilderHelper.enableDisable(false);
         SalesforceReactSDKManager.initReactNative(getApplicationContext(), ReactTestActivity.class);
         TestCredentials.init(this);