From aa30721cd86e190755cf66ee393011f976cfd361 Mon Sep 17 00:00:00 2001 From: Situ Chandra Shil <108292595+situchan@users.noreply.github.com> Date: Mon, 26 Aug 2024 12:29:48 -0700 Subject: [PATCH] Revert "RN 0.75 upgrade" --- .../createOrUpdateStagingDeploy/index.js | 7 +- .../getDeployPullRequestList/index.js | 1 - .../javascript/getPreviousVersion/index.js | 1 - .../validateReassureOutput.ts | 6 +- .github/libs/GitUtils.ts | 1 - .github/scripts/removeInvalidJson.rb | 15 - .github/scripts/verifyPodfile.sh | 4 +- .gitignore | 12 +- Gemfile | 2 +- Gemfile.lock | 4 +- android/app/build.gradle | 17 +- .../com/expensify/chat/MainApplication.kt | 4 +- .../res/drawable/rn_edit_text_material.xml | 4 +- android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/gradlew | 16 +- android/gradlew.bat | 20 +- android/settings.gradle | 8 +- ios/NewExpensify.xcodeproj/project.pbxproj | 83 +- ios/NewExpensify/AppDelegate.mm | 9 +- ios/NewExpensify/PrivacyInfo.xcprivacy | 39 - ios/Podfile | 4 +- ios/Podfile.lock | 1809 +- lib/react-compiler-runtime/package.json | 2 +- metro.config.js | 2 +- package-lock.json | 39302 ++++++++-------- package.json | 53 +- ...ive-live-markdown+0.1.117+001+intial.patch | 48 - ...down+0.1.117+002+text-layout-manager.patch | 102 - ...ive-markdown+0.1.117+003+shadow-node.patch | 72 - ...live-markdown+0.1.117+004+hybrid-app.patch | 18 - .../@expo+cli+0.18.21+001+rn-75-fixes.patch | 12 - patches/@onfido+react-native-sdk+10.6.0.patch | 6 +- ...react-native+assets-registry+0.73.1.patch} | 0 .../@react-native+gradle-plugin+0.73.4.patch | 21 + .../@react-native+gradle-plugin+0.75.2.patch | 21 - ...ized-lists+0.73.4+001+onStartReched.patch} | 0 ...ed-lists+0.73.4+002+osr-improvement.patch} | 0 ...oll+camera-roll+7.4.0+001+hybrid-app.patch | 15 - ...ative-camera-roll+camera-roll+7.4.0.patch} | 15 + ...mmunity+cli-platform-android+12.3.2.patch} | 28 +- ...e-community+cli-platform-ios+12.3.2.patch} | 0 ...unity+netinfo+11.2.1+002+turbomodule.patch | 17 +- ...ct-native-firebase+analytics+12.9.3.patch} | 0 ...> @react-native-firebase+app+12.9.3.patch} | 0 ...-native-firebase+crashlytics+12.9.3.patch} | 0 ... @react-native-firebase+perf+12.9.3.patch} | 0 patches/@rnmapbox+maps+10.1.20.patch | 131 + ...nmapbox+maps+10.1.26+001+rn-75-fixes.patch | 188 - ...001+hybrid-app.patch => expo+50.0.4.patch} | 14 +- patches/expo+51.0.17+002+rn-75-fixes.patch | 40 - patches/expo-asset+10.0.10.patch | 25 - ...hybrid-app.patch => expo-av+13.10.4.patch} | 18 +- patches/expo-av+14.0.6+002+rn-75-fixes.patch | 14 - .../expo-image+1.12.12+001+rn-75-fixes.patch | 52 - ...ch => expo-image-manipulator+11.8.0.patch} | 0 ... => expo-modules-autolinking+1.10.2.patch} | 12 +- ...xpo-modules-core+1.11.8+001+initial.patch} | 17 +- ...ore+1.11.8+002+disableViewRecycling.patch} | 4 +- ...-modules-core+1.12.18+002+rn75-fixes.patch | 63 - ... => react-native+0.73.4+001+initial.patch} | 0 .../react-native+0.73.4+002+SuspenseFix.patch | 74 + ...native+0.73.4+003+iOSFontResolution.patch} | 11 +- ...t-native+0.73.4+004+AndroidModalSize.patch | 142 + ... react-native+0.73.4+005+TextInputs.patch} | 23 +- patches/react-native+0.73.4+006+Codegen.patch | 21 + ....73.4+007+disableTextInputRecycling.patch} | 0 ...ct-native+0.73.4+008+checkForHashMap.patch | 16 + ...+0.73.4+009+properEventDispatchOrder.patch | 16 + ...+0.73.4+010+resetAutoresizingOnView.patch} | 0 ...ive+0.73.4+011+optionalViewRecycling.patch | 62 + ...+012+disableNonTranslucentStatusBar.patch} | 0 ...eact-native+0.73.4+013+exposePrefabs.patch | 95 + ...ive+0.73.4+014+fix-inverted-flatlist.patch | 23 + patches/react-native+0.73.4+015+fixPath.patch | 13 + ...016+iOSCoreAnimationBorderRendering.patch} | 0 ...-native+0.73.4+017+copyStateOnClone.patch} | 16 +- ...native+0.73.4+018+fixIOSWebViewCrash.patch | 24 + ...-native+0.73.4+019+fixClippedEmojis.patch} | 11 +- ...3.4+020+iOS-textinput-onscroll-event.patch | 70 + ...iOS-fix-whitespace-support-sourcemap.patch | 37 + ...adjustFontSizeToFit-new-architecture.patch | 16 + ...+0.73.4+023+textinput-clear-command.patch} | 87 +- ...0.73.4+024+Add-onPaste-to-TextInput.patch} | 192 +- ...act-native+0.73.4+024+fixMVCPAndroid.patch | 334 + ...act-native+0.75.2+001+fixMVCPAndroid.patch | 175 - ...t-native+0.75.2+003+AndroidModalSize.patch | 141 - .../react-native+0.75.2+013+alert-style.patch | 18 - ...e+0.75.2+014+fixNavigationAnimations.patch | 39 - ...native+0.75.2+015+fixScrollViewState.patch | 13 - .../react-native+0.75.2+016+hybrid-app.patch | 19 - ...-native-animatable+1.3.3+001+initial.patch | 23 - ...atable+1.3.3+002+fixAnimationFlicker.patch | 49 - ...e-device-info+10.3.1+002+turbomodule.patch | 11 +- .../react-native-document-picker+9.1.1.patch | 43 - .../react-native-gesture-handler+2.14.1.patch | 72 + ...-gesture-handler+2.18.0+001+fixTests.patch | 21 - ...ure-handler+2.18.0+002+fixTypeExport.patch | 43 - .../react-native-haptic-feedback+2.2.0.patch | 30 - ...ge-picker+7.0.3+001+allowedMimeTypes.patch | 25 +- ...rd-controller+1.12.2+002+rn-75-fixes.patch | 13 - ...t-native-keyboard-controller+1.12.2.patch} | 2 +- ...native-pager-view+6.3.4+001+add-view.patch | 13 - ...ive-pager-view+6.3.4+002+rn-75-fixes.patch | 22 - ...ger-view+6.3.4+003+position-absolute.patch | 19 - ...tive-pager-view+6.3.4+004+hybrid-app.patch | 13 - patches/react-native-quick-sqlite+8.0.6.patch | 13 - ...ve-reanimated+3.13.0+002+rn-75-fixes.patch | 142 - ...ted+3.13.0+003+dontWhitelistTextProp.patch | 12 - ...reanimated+3.13.0+004+fixNullViewTag.patch | 15 - ...ed+3.13.0+005+proper-navigator-types.patch | 29 - ...mated+3.13.0+006+fixNoExportedMember.patch | 24 - ...native-reanimated+3.8.1+001+initial.patch} | 0 ...mated+3.8.1+002+fix-boost-dependency.patch | 13 + ...tive-reanimated+3.8.1+003+copy-state.patch | 12 + ...reanimated+3.8.1+004+fix-strict-mode.patch | 36 + patches/react-native-render-html+6.3.1.patch | 25 - ...native-screens+3.34.0+001+hybrid-app.patch | 16 - ...t-native-share+10.0.2+001+hybrid-app.patch | 26 - ...-native-svg+15.4.0+001+rn75-delegate.patch | 45 - ...t-native-vision-camera+4.0.0-beta.13.patch | 23 +- ...atch => react-native-webview+13.6.4.patch} | 30 +- .../AttachmentCarousel/Pager/index.tsx | 8 +- .../CustomStatusBarAndBackground/index.tsx | 24 +- src/components/FeatureTrainingModal.tsx | 92 +- src/components/PopoverMenu.tsx | 1 - .../VolumeButton/index.tsx | 2 +- src/libs/shouldUseNewPager/index.android.ts | 3 - src/libs/shouldUseNewPager/index.ts | 4 - .../report/ReportActionCompose/SendButton.tsx | 38 +- src/styles/utils/cursor/index.ts | 23 +- tsconfig.json | 2 +- 132 files changed, 21199 insertions(+), 23932 deletions(-) delete mode 100755 .github/scripts/removeInvalidJson.rb delete mode 100644 ios/NewExpensify/PrivacyInfo.xcprivacy delete mode 100644 patches/@expensify+react-native-live-markdown+0.1.117+001+intial.patch delete mode 100644 patches/@expensify+react-native-live-markdown+0.1.117+002+text-layout-manager.patch delete mode 100644 patches/@expensify+react-native-live-markdown+0.1.117+003+shadow-node.patch delete mode 100644 patches/@expensify+react-native-live-markdown+0.1.117+004+hybrid-app.patch delete mode 100644 patches/@expo+cli+0.18.21+001+rn-75-fixes.patch rename patches/{@react-native+assets-registry+0.75.2.patch => @react-native+assets-registry+0.73.1.patch} (100%) create mode 100644 patches/@react-native+gradle-plugin+0.73.4.patch delete mode 100644 patches/@react-native+gradle-plugin+0.75.2.patch rename patches/{@react-native+virtualized-lists+0.75.2+001+onStartReched.patch => @react-native+virtualized-lists+0.73.4+001+onStartReched.patch} (100%) rename patches/{@react-native+virtualized-lists+0.75.2+002+osr-improvement.patch => @react-native+virtualized-lists+0.73.4+002+osr-improvement.patch} (100%) delete mode 100644 patches/@react-native-camera-roll+camera-roll+7.4.0+001+hybrid-app.patch rename patches/{@react-native-camera-roll+camera-roll+7.4.0+002+asset.patch => @react-native-camera-roll+camera-roll+7.4.0.patch} (53%) rename patches/{@react-native-community+cli-platform-android+14.0.0+001+hybrid-app.patch => @react-native-community+cli-platform-android+12.3.2.patch} (68%) rename patches/{@react-native-community+cli-platform-ios+14.0.0+001+hybrid-app.patch => @react-native-community+cli-platform-ios+12.3.2.patch} (100%) rename patches/{@react-native-firebase+analytics+12.9.3+001+hybrid-app.patch => @react-native-firebase+analytics+12.9.3.patch} (100%) rename patches/{@react-native-firebase+app+12.9.3+001+hybrid-app.patch => @react-native-firebase+app+12.9.3.patch} (100%) rename patches/{@react-native-firebase+crashlytics+12.9.3+001+hybrid-app.patch => @react-native-firebase+crashlytics+12.9.3.patch} (100%) rename patches/{@react-native-firebase+perf+12.9.3+001+hybrid-app.patch => @react-native-firebase+perf+12.9.3.patch} (100%) create mode 100644 patches/@rnmapbox+maps+10.1.20.patch delete mode 100644 patches/@rnmapbox+maps+10.1.26+001+rn-75-fixes.patch rename patches/{expo+51.0.17+001+hybrid-app.patch => expo+50.0.4.patch} (63%) delete mode 100644 patches/expo+51.0.17+002+rn-75-fixes.patch delete mode 100644 patches/expo-asset+10.0.10.patch rename patches/{expo-av+14.0.6+001+hybrid-app.patch => expo-av+13.10.4.patch} (59%) delete mode 100644 patches/expo-av+14.0.6+002+rn-75-fixes.patch delete mode 100644 patches/expo-image+1.12.12+001+rn-75-fixes.patch rename patches/{expo-image-manipulator+12.0.5.patch => expo-image-manipulator+11.8.0.patch} (100%) rename patches/{expo-modules-autolinking+1.11.1+001+hybrid-app.patch => expo-modules-autolinking+1.10.2.patch} (95%) rename patches/{expo-modules-core+1.12.18+003+hybrid-app.patch => expo-modules-core+1.11.8+001+initial.patch} (50%) rename patches/{expo-modules-core+1.12.18+001+disableViewRecycling.patch => expo-modules-core+1.11.8+002+disableViewRecycling.patch} (84%) delete mode 100644 patches/expo-modules-core+1.12.18+002+rn75-fixes.patch rename patches/{react-native+0.75.2+001+initial.patch => react-native+0.73.4+001+initial.patch} (100%) create mode 100644 patches/react-native+0.73.4+002+SuspenseFix.patch rename patches/{react-native+0.75.2+002+iOSFontResolution.patch => react-native+0.73.4+003+iOSFontResolution.patch} (91%) create mode 100644 patches/react-native+0.73.4+004+AndroidModalSize.patch rename patches/{react-native+0.75.2+007+TextInput.patch => react-native+0.73.4+005+TextInputs.patch} (80%) create mode 100644 patches/react-native+0.73.4+006+Codegen.patch rename patches/{react-native+0.75.2+004+disableTextInputRecycling.patch => react-native+0.73.4+007+disableTextInputRecycling.patch} (100%) create mode 100644 patches/react-native+0.73.4+008+checkForHashMap.patch create mode 100644 patches/react-native+0.73.4+009+properEventDispatchOrder.patch rename patches/{react-native+0.75.2+005+resetAutoresizingOnView.patch => react-native+0.73.4+010+resetAutoresizingOnView.patch} (100%) create mode 100644 patches/react-native+0.73.4+011+optionalViewRecycling.patch rename patches/{react-native+0.75.2+006+disableNonTranslucentStatusBar.patch => react-native+0.73.4+012+disableNonTranslucentStatusBar.patch} (100%) create mode 100644 patches/react-native+0.73.4+013+exposePrefabs.patch create mode 100644 patches/react-native+0.73.4+014+fix-inverted-flatlist.patch create mode 100644 patches/react-native+0.73.4+015+fixPath.patch rename patches/{react-native+0.75.2+008+iOSCoreAnimationBorderRendering.patch => react-native+0.73.4+016+iOSCoreAnimationBorderRendering.patch} (100%) rename patches/{react-native+0.75.2+009+copyStateOnClone.patch => react-native+0.73.4+017+copyStateOnClone.patch} (53%) create mode 100644 patches/react-native+0.73.4+018+fixIOSWebViewCrash.patch rename patches/{react-native+0.75.2+010+fixClippedEmojis.patch => react-native+0.73.4+019+fixClippedEmojis.patch} (91%) create mode 100644 patches/react-native+0.73.4+020+iOS-textinput-onscroll-event.patch create mode 100644 patches/react-native+0.73.4+021+iOS-fix-whitespace-support-sourcemap.patch create mode 100644 patches/react-native+0.73.4+022+iOS-fix-adjustFontSizeToFit-new-architecture.patch rename patches/{react-native+0.75.2+011+textinput-clear-command.patch => react-native+0.73.4+023+textinput-clear-command.patch} (82%) rename patches/{react-native+0.75.2+012+Add-onPaste-to-TextInput.patch => react-native+0.73.4+024+Add-onPaste-to-TextInput.patch} (83%) create mode 100644 patches/react-native+0.73.4+024+fixMVCPAndroid.patch delete mode 100644 patches/react-native+0.75.2+001+fixMVCPAndroid.patch delete mode 100644 patches/react-native+0.75.2+003+AndroidModalSize.patch delete mode 100644 patches/react-native+0.75.2+013+alert-style.patch delete mode 100644 patches/react-native+0.75.2+014+fixNavigationAnimations.patch delete mode 100644 patches/react-native+0.75.2+015+fixScrollViewState.patch delete mode 100644 patches/react-native+0.75.2+016+hybrid-app.patch delete mode 100644 patches/react-native-animatable+1.3.3+001+initial.patch delete mode 100644 patches/react-native-animatable+1.3.3+002+fixAnimationFlicker.patch delete mode 100644 patches/react-native-document-picker+9.1.1.patch create mode 100644 patches/react-native-gesture-handler+2.14.1.patch delete mode 100644 patches/react-native-gesture-handler+2.18.0+001+fixTests.patch delete mode 100644 patches/react-native-gesture-handler+2.18.0+002+fixTypeExport.patch delete mode 100644 patches/react-native-haptic-feedback+2.2.0.patch delete mode 100644 patches/react-native-keyboard-controller+1.12.2+002+rn-75-fixes.patch rename patches/{react-native-keyboard-controller+1.12.2+001+initial.patch => react-native-keyboard-controller+1.12.2.patch} (98%) delete mode 100644 patches/react-native-pager-view+6.3.4+001+add-view.patch delete mode 100644 patches/react-native-pager-view+6.3.4+002+rn-75-fixes.patch delete mode 100644 patches/react-native-pager-view+6.3.4+003+position-absolute.patch delete mode 100644 patches/react-native-pager-view+6.3.4+004+hybrid-app.patch delete mode 100644 patches/react-native-quick-sqlite+8.0.6.patch delete mode 100644 patches/react-native-reanimated+3.13.0+002+rn-75-fixes.patch delete mode 100644 patches/react-native-reanimated+3.13.0+003+dontWhitelistTextProp.patch delete mode 100644 patches/react-native-reanimated+3.13.0+004+fixNullViewTag.patch delete mode 100644 patches/react-native-reanimated+3.13.0+005+proper-navigator-types.patch delete mode 100644 patches/react-native-reanimated+3.13.0+006+fixNoExportedMember.patch rename patches/{react-native-reanimated+3.13.0+001+hybrid-app.patch => react-native-reanimated+3.8.1+001+initial.patch} (100%) create mode 100644 patches/react-native-reanimated+3.8.1+002+fix-boost-dependency.patch create mode 100644 patches/react-native-reanimated+3.8.1+003+copy-state.patch create mode 100644 patches/react-native-reanimated+3.8.1+004+fix-strict-mode.patch delete mode 100644 patches/react-native-render-html+6.3.1.patch delete mode 100644 patches/react-native-screens+3.34.0+001+hybrid-app.patch delete mode 100644 patches/react-native-share+10.0.2+001+hybrid-app.patch delete mode 100644 patches/react-native-svg+15.4.0+001+rn75-delegate.patch rename patches/{react-native-webview+13.8.6.patch => react-native-webview+13.6.4.patch} (82%) delete mode 100644 src/libs/shouldUseNewPager/index.android.ts delete mode 100644 src/libs/shouldUseNewPager/index.ts diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js index d3e249ee6f47..6e7237e7cd93 100644 --- a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js +++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js @@ -14543,7 +14543,6 @@ function getCommitHistoryAsJSON(fromTag, toTag) { }); spawnedProcess.on('close', (code) => { if (code !== 0) { - console.log('code: ', code); return reject(new Error(`${stderr}`)); } resolve(stdout); @@ -15370,9 +15369,9 @@ module.exports = require("zlib"); /***/ 3286: /***/ ((module) => { -function _interopRequireDefault(e) { - return e && e.__esModule ? e : { - "default": e +function _interopRequireDefault(obj) { + return obj && obj.__esModule ? obj : { + "default": obj }; } module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports; diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js index 300cb1edc0ed..e8bd7057d40e 100644 --- a/.github/actions/javascript/getDeployPullRequestList/index.js +++ b/.github/actions/javascript/getDeployPullRequestList/index.js @@ -11881,7 +11881,6 @@ function getCommitHistoryAsJSON(fromTag, toTag) { }); spawnedProcess.on('close', (code) => { if (code !== 0) { - console.log('code: ', code); return reject(new Error(`${stderr}`)); } resolve(stdout); diff --git a/.github/actions/javascript/getPreviousVersion/index.js b/.github/actions/javascript/getPreviousVersion/index.js index 9938951d6768..7b7ff20ef426 100644 --- a/.github/actions/javascript/getPreviousVersion/index.js +++ b/.github/actions/javascript/getPreviousVersion/index.js @@ -2959,7 +2959,6 @@ function getCommitHistoryAsJSON(fromTag, toTag) { }); spawnedProcess.on('close', (code) => { if (code !== 0) { - console.log('code: ', code); return reject(new Error(`${stderr}`)); } resolve(stdout); diff --git a/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts b/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts index 7e5cfd0bd9f9..d843caf61518 100644 --- a/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts +++ b/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts @@ -1,5 +1,5 @@ import * as core from '@actions/core'; -import type {CompareResult, MeasureEntry} from '@callstack/reassure-compare'; +import type {CompareResult, PerformanceEntry} from '@callstack/reassure-compare/src/types'; import fs from 'fs'; const run = (): boolean => { @@ -16,8 +16,8 @@ const run = (): boolean => { for (let i = 0; i < regressionOutput.countChanged.length; i++) { const measurement = regressionOutput.countChanged[i]; - const baseline: MeasureEntry = measurement.baseline; - const current: MeasureEntry = measurement.current; + const baseline: PerformanceEntry = measurement.baseline; + const current: PerformanceEntry = measurement.current; console.log(`Processing measurement ${i + 1}: ${measurement.name}`); diff --git a/.github/libs/GitUtils.ts b/.github/libs/GitUtils.ts index 89950613bc2e..ab4a81f96adf 100644 --- a/.github/libs/GitUtils.ts +++ b/.github/libs/GitUtils.ts @@ -135,7 +135,6 @@ function getCommitHistoryAsJSON(fromTag: string, toTag: string): Promise { if (code !== 0) { - console.log('code: ', code); return reject(new Error(`${stderr}`)); } diff --git a/.github/scripts/removeInvalidJson.rb b/.github/scripts/removeInvalidJson.rb deleted file mode 100755 index 4cf2a40d4cc3..000000000000 --- a/.github/scripts/removeInvalidJson.rb +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env ruby -require 'json' - -# List of JSON strings -json_strings = ARGV - -# Parse each JSON string and remove any that couldn't be parsed -valid_jsons = json_strings.select do |json_string| - begin - JSON.parse(json_string) - true - rescue JSON::ParserError - false - end -end diff --git a/.github/scripts/verifyPodfile.sh b/.github/scripts/verifyPodfile.sh index 8f8534a4d54f..ff67b11c8657 100755 --- a/.github/scripts/verifyPodfile.sh +++ b/.github/scripts/verifyPodfile.sh @@ -69,11 +69,9 @@ if ! read_lines_into_array PODSPEC_PATHS < <(npx react-native config | jq --raw- cleanupAndExit 1 fi -PODSPECS=$(./.github/scripts/printPodspec.rb "${PODSPEC_PATHS[@]}") - # Format a list of Pods based on the output of the config command if ! FORMATTED_PODS=$( \ - jq --raw-output --slurp 'map((.name + " (" + .version + ")")) | .[]' <<< "$(./.github/scripts/removeInvalidJson.rb "${PODSPECS}")" \ + jq --raw-output --slurp 'map((.name + " (" + .version + ")")) | .[]' <<< "$(./.github/scripts/printPodspec.rb "${PODSPEC_PATHS[@]}")" \ ); then error "Error: could not parse podspecs at paths parsed from react-native config" cleanupAndExit 1 diff --git a/.gitignore b/.gitignore index f9d74fe950bd..a964cdef2fbd 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ DerivedData *.p12 *.mobileprovision ios-fastlane-json-key.json -**/.xcode.env.local +ios/.xcode.env.local # Android/IntelliJ # @@ -78,7 +78,7 @@ android/app/android-fastlane-json-key.json *.jsbundle # Ruby / CocoaPods -**/Pods/ +/ios/Pods/ /vendor/bundle/ # Local DEV config @@ -127,14 +127,6 @@ config/webpack/*.pem dist/ web-build/ -# Yarn -.yarn/* -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions - # Storage location for downloaded app source maps (see scripts/symbolicate-profile.ts) .sourcemaps/ diff --git a/Gemfile b/Gemfile index 2739d835b4e0..d774392dbcb7 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" ruby ">= 2.6.10" gem "cocoapods", "= 1.15.2" -gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' +gem "activesupport", ">= 6.1.7.3", "< 7.1.0" gem "fastlane", "~> 2", ">= 2.222.0" gem "xcpretty", "~> 0" diff --git a/Gemfile.lock b/Gemfile.lock index b386f59b5c11..12cae5d0eb21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,7 +292,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - activesupport (>= 6.1.7.5, != 7.1.0) + activesupport (>= 6.1.7.3, < 7.1.0) cocoapods (= 1.15.2) fastlane (~> 2, >= 2.222.0) fastlane-plugin-aws_s3 @@ -302,4 +302,4 @@ RUBY VERSION ruby 2.6.10p210 BUNDLED WITH - 2.4.19 + 2.4.14 diff --git a/android/app/build.gradle b/android/app/build.gradle index 94e811f3bf2c..cfd339b4c7da 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -21,13 +21,13 @@ fullstory { react { /* Folders */ // The root of your project, i.e. where "package.json" lives. Default is '..' - // root = file("../../") - // The folder where the react-native NPM package is. Default is ../../node_modules/react-native - // reactNativeDir = file("../../node_modules/react-native") - // The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen - // codegenDir = file("../../node_modules/@react-native/codegen") - // The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js - // cliFile = file("../../node_modules/react-native/cli.js") + // root = file("../") + // The folder where the react-native NPM package is. Default is ../node_modules/react-native + // reactNativeDir = file("../node_modules/react-native") + // The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen + // codegenDir = file("../node_modules/@react-native/codegen") + // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js + // cliFile = file("../node_modules/react-native/cli.js") /* Variants */ // The list of variants to that are debuggable. For those we're going to @@ -62,8 +62,6 @@ react { // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" // hermesFlags = ["-O", "-output-source-map"] // - /* Autolinking */ - autolinkLibrariesWithApp() // Added by install-expo-modules entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim()) cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim()) @@ -248,5 +246,6 @@ dependencies { implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0") } +apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply plugin: 'com.google.gms.google-services' // Google Play services Gradle plugin apply plugin: 'com.google.firebase.crashlytics' diff --git a/android/app/src/main/java/com/expensify/chat/MainApplication.kt b/android/app/src/main/java/com/expensify/chat/MainApplication.kt index 26a28d9955a0..dac9e68b705b 100644 --- a/android/app/src/main/java/com/expensify/chat/MainApplication.kt +++ b/android/app/src/main/java/com/expensify/chat/MainApplication.kt @@ -57,14 +57,14 @@ class MainApplication : MultiDexApplication(), ReactApplication { SoLoader.init(this, /* native exopackage */false) if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { // If you opted-in for the New Architecture, we load the native entry point for this app. - load(bridgelessEnabled = false) + load() } if (BuildConfig.DEBUG) { FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false) } // Force the app to LTR mode. - val sharedI18nUtilInstance = I18nUtil.instance + val sharedI18nUtilInstance = I18nUtil.getInstance() sharedI18nUtilInstance.allowRTL(applicationContext, false) // Start the "js_load" custom performance tracing metric. This timer is stopped by a native 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 fd2f6544048e..73b37e4d9963 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"> +