Upgrade React Native 0.66.4

package.json

@@ -49,8 +49,8 @@
   },
   "devDependencies": {
     "@actions/github": "^5.0.0",
-    "@babel/core": "^7.8.4",
-    "@babel/runtime": "^7.8.4",
+    "@babel/core": "^7.12.9",
+    "@babel/runtime": "^7.12.5",
     "@types/jest": "^26.0.20",
     "babel-jest": "^26.6.3",
     "codecov": "^3.6.5",

packages/mobile/android/app/build.gradle

@@ -149,6 +149,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+/**
+ * Architectures to build native code for in debug.
+ */
+def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+
 def appVersionCode = Integer.valueOf(System.env.CIRCLE_BUILD_NUM ?: VERSION_CODE)
 
 android {
@@ -209,6 +214,11 @@ android {
             // minifyEnabled true
             // proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro", "devsupport.pro"
             signingConfig signingConfigs.debug
+            if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }
         }
 
         release {
@@ -268,7 +278,9 @@ android {
 
 
 dependencies {
-    androidTestImplementation('com.wix:detox:+')
+    androidTestImplementation('com.wix:detox:+') {
+        exclude group: 'com.google.android.material'
+    }
     androidTestImplementation('com.linkedin.testbutler:test-butler-library:2.2.1')
 
     implementation 'androidx.multidex:multidex:2.0.1'

packages/mobile/android/app/src/debug/AndroidManifest.xml

@@ -4,5 +4,7 @@
 
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-  <application android:usesCleartextTraffic="true" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/network_security_config" />
+  <application android:usesCleartextTraffic="true" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/network_security_config" >
+     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+  </application>
 </manifest>

packages/mobile/android/app/src/main/AndroidManifest.xml

@@ -11,8 +11,6 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.CAMERA" />
 
-  <uses-sdk android:minSdkVersion="21" />
-
   <application android:name=".MainApplication" android:allowBackup="false" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:label="@string/app_name" android:theme="@style/AppTheme" android:networkSecurityConfig="@xml/network_security_config">
     <activity android:name=".MainActivity" android:screenOrientation="portrait" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/AppTheme" android:windowSoftInputMode="adjustResize">
       <intent-filter>
@@ -39,7 +37,6 @@
         <data android:scheme="http" />
     </intent-filter>
     </activity>
-    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
     <!-- Set custom default icon. This is used when no icon is set for incoming notification messages.
      See README(https://goo.gl/l4GJaQ) for more. -->

packages/mobile/android/app/src/main/java/org/celo/mobile/MainApplication.java

@@ -14,7 +14,6 @@
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
-import com.plaid.PlaidPackage;
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 import io.sentry.react.RNSentryPackage;
 import java.lang.reflect.InvocationTargetException;
@@ -38,7 +37,6 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       @SuppressWarnings("UnnecessaryLocalVariable")
       List<ReactPackage> packages = new PackageList(this).getPackages();
-      packages.add(new PlaidPackage());
       return packages;
     }
 

packages/mobile/android/app/src/main/res/values/styles.xml

@@ -2,7 +2,7 @@
   <style name="AppTheme" parent="Base.V0.AppTheme"/>
 
   <!--  Base theme, also see API specific overrides in values-vXX/styles.xml -->
-  <style name="Base.V0.AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+  <style name="Base.V0.AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
     <item name="android:statusBarColor">@android:color/transparent</item>
     <item name="android:navigationBarColor">@android:color/black</item>
     <!-- The window is always allowed to extend into then notch area -->
@@ -11,7 +11,6 @@
     <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     <!-- Without this we briefly see the theme preview before our own splash screen -->
     <item name="android:windowDisablePreview">true</item>
-    <item name="android:textColor">#000000</item>
   </style>
 
   <!-- Theme for the splash screen, based on AppTheme -->

packages/mobile/android/build.gradle

@@ -6,17 +6,18 @@ buildscript {
         minSdkVersion = 21
         compileSdkVersion = 30
         targetSdkVersion = 30
+        ndkVersion = "21.4.7075529"
         supportLibVersion = "30.0.0"
-        kotlinVersion = "1.5.10"
+        kotlinVersion = "1.5.21"
         // Change this to change the geth version
         celoClientDirectory = new File(rootProject.projectDir, '../../../node_modules/@celo/client/build/bin')
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.google.gms:google-services:4.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
@@ -28,6 +29,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -44,7 +46,11 @@ allprojects {
             dirs celoClientDirectory
         }
         google()
-        jcenter()
+        jcenter() {
+            content {
+                includeGroup("com.google.android.exoplayer")
+            }
+        }
         maven { url 'https://www.jitpack.io' }
         maven {
             url 'https://sdk.withpersona.com/android/releases'

packages/mobile/android/gradle.properties

@@ -32,4 +32,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.69.0
+FLIPPER_VERSION=0.99.0

packages/mobile/android/gradle/wrapper/gradle-wrapper.properties

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

packages/mobile/android/gradlew.bat

@@ -21,7 +21,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +45,13 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

packages/mobile/ios/Podfile

@@ -17,6 +17,7 @@ $static_framework = [
   'Flipper-Glog', 
   'Flipper-PeerTalk', 
   'Flipper-RSocket',
+  'Flipper-Fmt',
 ]
 
 require_relative "../../../node_modules/react-native/scripts/react_native_pods"
@@ -49,7 +50,7 @@ target "celo" do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable these next few lines.
-  use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' })
+  use_flipper!()
 end
 
 target 'NotificationService' do
@@ -69,7 +70,8 @@ pre_install do |installer|
 end
 
 post_install do |installer|
-  flipper_post_install(installer)
+  react_native_post_install(installer)
+  __apply_Xcode_12_5_M1_post_install_workaround(installer)
 
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
@@ -80,14 +82,23 @@ post_install do |installer|
     end
   end
 
-  installer.pods_project.build_configurations.each do |config|
-    # Needed for now as Xcode 12 now tries to build/link both arm64 and x86_64 slices for the simulator
-    # but some of our prebuilt deps don't support this
-    # See:
-    # - https://stackoverflow.com/a/63955114/158525
-    # - https://github.com/facebook/react-native/issues/29984
-    # - https://apontious.com/2020/08/23/arm-wrestling-your-ios-simulator-builds/
-    config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
+  projects = installer.aggregate_targets
+    .map{ |t| t.user_project }
+    .uniq{ |p| p.path }
+    .push(installer.pods_project)
+
+  # This block is needed for preserving the EXCLUDED_ARCHS setting on M1 machines
+  projects.each do |project|
+    project.build_configurations.each do |config|
+      # Needed for now as Xcode 12 now tries to build/link both arm64 and x86_64 slices for the simulator
+      # but some of our prebuilt deps don't support this
+      # See:
+      # - https://stackoverflow.com/a/63955114/158525
+      # - https://github.com/facebook/react-native/issues/29984
+      # - https://apontious.com/2020/08/23/arm-wrestling-your-ios-simulator-builds/
+      config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64 "
+    end
+    project.save()
   end
 
   # Include env xccconfig generated by React Native Config