From ba2f7796dec8925d9de74e8a63a00221bc174a5f Mon Sep 17 00:00:00 2001 From: MrRefactor Date: Thu, 11 Apr 2024 15:33:06 +0800 Subject: [PATCH 001/134] Initial upgrade --- .gitignore | 12 +- Gemfile | 6 +- Gemfile.lock | 4 +- android/app/build.gradle | 1 - .../res/drawable/rn_edit_text_material.xml | 4 +- android/build.gradle | 6 +- android/gradle-wrapper.properties | 7 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/gradlew | 14 +- android/gradlew.bat | 20 +- ios/NewExpensify.xcodeproj/project.pbxproj | 68 +- ios/NewExpensify/AppDelegate.mm | 4 +- ios/Podfile | 19 +- ios/Podfile.lock | 1208 ++++---- ios/tmp.xcconfig | 11 +- metro.config.js | 2 +- package-lock.json | 2519 ++++++++++++----- package.json | 20 +- ...ify+react-native-live-markdown+0.1.5.patch | 13 + patches/expo-modules-core+1.11.12.patch | 13 + patches/react-native-quick-sqlite+8.0.6.patch | 21 + 21 files changed, 2557 insertions(+), 1417 deletions(-) create mode 100644 android/gradle-wrapper.properties create mode 100644 patches/@expensify+react-native-live-markdown+0.1.5.patch create mode 100644 patches/expo-modules-core+1.11.12.patch create mode 100644 patches/react-native-quick-sqlite+8.0.6.patch diff --git a/.gitignore b/.gitignore index aeee5f730bfc..603000ca904c 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ DerivedData *.p12 *.mobileprovision ios-fastlane-json-key.json -ios/.xcode.env.local +**/.xcode.env.local # Android/IntelliJ # @@ -73,7 +73,7 @@ android/app/android-fastlane-json-key.json *.jsbundle # Ruby / CocoaPods -/ios/Pods/ +**/Pods/ /vendor/bundle/ # Local DEV config @@ -125,3 +125,11 @@ config/webpack/*.pem .expo dist/ web-build/ + +# Yarn +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions diff --git a/Gemfile b/Gemfile index 751e05d2d32b..c080a2d4d0fa 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,10 @@ source "https://rubygems.org" # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version ruby ">= 2.6.10" -gem "cocoapods", "~> 1.13" -gem "activesupport", ">= 6.1.7.3", "< 7.1.0" +# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper +# bound in the template on Cocoapods with next React Native release. +gem 'cocoapods', '>= 1.13', '< 1.15' +gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' gem "fastlane", "~> 2" gem "xcpretty", "~> 0" diff --git a/Gemfile.lock b/Gemfile.lock index beb2c1762936..3c4ea4be1cd8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,8 +282,8 @@ PLATFORMS x86_64-linux DEPENDENCIES - activesupport (>= 6.1.7.3, < 7.1.0) - cocoapods (~> 1.13) + activesupport (>= 6.1.7.5, < 7.1.0) + cocoapods (>= 1.13, < 1.15) fastlane (~> 2) fastlane-plugin-aws_s3 xcpretty (~> 0) diff --git a/android/app/build.gradle b/android/app/build.gradle index e285d0bff26f..fc7d5e310059 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -181,7 +181,6 @@ android { dependencies { // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - implementation("com.facebook.react:flipper-integration") if (hermesEnabled.toBoolean()) { implementation("com.facebook.react:hermes-android") diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml index 73b37e4d9963..fd2f6544048e 100644 --- a/android/app/src/main/res/drawable/rn_edit_text_material.xml +++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -17,8 +17,8 @@ android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material" android:insetRight="@dimen/abc_edit_text_inset_horizontal_material" android:insetTop="@dimen/abc_edit_text_inset_top_material" - android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"> - + android:insetBottom="@dimen/abc_edit_text_inset_bottom_material" + >