From 89e01b1744376571bd043e32dd6e6393075e877b Mon Sep 17 00:00:00 2001 From: William Swanson Date: Tue, 20 Apr 2021 14:16:04 -0700 Subject: [PATCH] Upgrade to react-native v0.64.0 --- .flowconfig | 5 +- .gitattributes | 4 +- android/app/build.gradle | 5 +- android/app/src/debug/AndroidManifest.xml | 7 +- android/app/src/main/AndroidManifest.xml | 2 - android/app/src/main/res/values/styles.xml | 2 +- android/build.gradle | 7 +- android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/gradlew | 2 + android/gradlew.bat | 22 +- ios/Podfile | 13 +- ios/Podfile.lock | 629 +- ios/edge.xcodeproj/project.pbxproj | 23 + ios/edge/AppDelegate.m | 6 +- metro.config.js | 2 +- package.json | 18 +- patches/react-native-fast-crypto+2.0.0.patch | 18 +- yarn.lock | 5157 +++++++---------- 19 files changed, 2537 insertions(+), 3389 deletions(-) diff --git a/.flowconfig b/.flowconfig index 6b9fe99c8be..d2dc27bc10f 100644 --- a/.flowconfig +++ b/.flowconfig @@ -1,6 +1,7 @@ [ignore] ; Edge additions .*/node_modules/edge-plugin-bity/.* +.*/node_modules/metro/.* .*/node_modules/react-native-camera/.* .*/node_modules/react-native-keyboard-aware-scroll-view/.* .*/node_modules/react-native-permissions/.* @@ -15,10 +16,6 @@ ; Ignore polyfills node_modules/react-native/Libraries/polyfills/.* -; These should not be required directly -; require from fbjs/lib instead: require('fbjs/lib/warning') -node_modules/warning/.* - ; Flow doesn't support platforms .*/Libraries/Utilities/LoadingView.js diff --git a/.gitattributes b/.gitattributes index d42ff18354d..45a3dcb2a20 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ -*.pbxproj -text +# Windows files should use crlf line endings +# https://help.github.com/articles/dealing-with-line-endings/ +*.bat text eol=crlf diff --git a/android/app/build.gradle b/android/app/build.gradle index e153ca899d3..a61802a8162 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -121,6 +121,8 @@ def jscFlavor = 'org.webkit:android-jsc:+' def enableHermes = project.ext.react.get("enableHermes", false); android { + ndkVersion rootProject.ext.ndkVersion + compileSdkVersion rootProject.ext.compileSdkVersion compileOptions { @@ -163,11 +165,12 @@ android { variant.outputs.each { output -> // For each separate APK per architecture, set a unique version code as described here: // https://developer.android.com/studio/build/configure-apk-splits.html + // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc. def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4] def abi = output.getFilter(OutputFile.ABI) if (abi != null) { // null for the universal-debug, universal-release variants output.versionCodeOverride = - versionCodes.get(abi) * 1048576 + defaultConfig.versionCode + defaultConfig.versionCode * 1000 + versionCodes.get(abi) } } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index fa26aa56e1c..b2f3ad9fce9 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -4,5 +4,10 @@ - + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 4e92b5f742c..81f856b614b 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -123,7 +123,5 @@ - - diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 08f1fba4b76..bb0702ee5a1 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ -