Merge pull request #2360 from wmathurin/rn0701

Move to React Native 0.70.1

Author: wmathurin

libs/SalesforceReact/build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
   api project(':libs:MobileSync')
-  api 'com.facebook.react:react-native:0.67.1'
+  api 'com.facebook.react:react-native:0.70.1'
   androidTestImplementation 'androidx.test:runner:1.4.0'
   androidTestImplementation 'androidx.test:rules:1.4.0'
   androidTestImplementation 'androidx.test.ext:junit:1.1.3'

libs/SalesforceReact/package.json

@@ -7,27 +7,27 @@
     },
     "dependencies": {
         "create-react-class": "^15.7.0",
-        "react": "17.0.2",
-        "react-native": "0.67.1",
+        "react": "18.1.0",
+        "react-native": "0.70.1",
         "react-native-force": "git+https://github.com/forcedotcom/SalesforceMobileSDK-ReactNative.git#dev"
     },
     "devDependencies": {
         "@babel/core": "^7.12.9",
-        "@babel/preset-env": "^7.1.6",
         "@babel/runtime": "^7.12.5",
+        "@babel/preset-env": "^7.1.6",
         "@react-native-community/cli": "^6.0.0",
         "@react-native-community/eslint-config": "^2.0.0",
         "@types/jest": "^26.0.18",
-        "@types/react": "^17.0.19",
-        "@types/react-native": "^0.66.12",
+        "@types/react": "^18.0.20",
+        "@types/react-native": "^0.70.1",
         "@types/react-test-renderer": "^17.0.1",
         "babel-jest": "^26.6.3",
         "chai": "4.2.0",
         "eslint": "^7.15.0",
         "jest": "^26.6.3",
-        "metro-react-native-babel-preset": "^0.66.2",
+        "metro-react-native-babel-preset": "^0.72.1",
         "react-native-codegen": "^0.0.7",
-        "react-test-renderer": "17.0.2",
-        "typescript": "^4.1.2"
+        "react-test-renderer": "18.1.0",
+        "typescript": "^4.8.3"
     }
 }

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

@@ -29,14 +29,10 @@
 
 import android.app.Application;
 
-import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactInstanceManagerBuilder;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
-import com.facebook.react.bridge.ReactMarker;
-import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.shell.MainReactPackage;
 import com.salesforce.androidsdk.reactnative.app.SalesforceReactSDKManager;
@@ -87,27 +83,12 @@ protected ReactInstanceManager createReactInstanceManager() {
                 // NB: Bundle is generated during build
                 .setBundleAssetName("index.android.bundle")
                 .setJSIModulesPackage(getJSIModulePackage())
-                .setUseDeveloperSupport(false)
-                .setNativeModuleCallExceptionHandler(new NativeModuleCallExceptionTestHandler());
+                .setUseDeveloperSupport(false);
 
         for (ReactPackage reactPackage : getPackages()) {
             builder.addPackage(reactPackage);
         }
 
         return builder.build();
     }
-
-
-    /**
-     * Implementation of NativeModuleCallExceptionHandler used for testing (when using bundle)
-     *
-     * Marks the current test running is marked as failed if any javascript error takes place
-     */
-    static class NativeModuleCallExceptionTestHandler implements NativeModuleCallExceptionHandler {
-
-        @Override
-        public void handleException(Exception e) {
-            TestResult.recordTestResult(TestResult.failure(e.getMessage()));
-        }
-    }
 }