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"> +