From 0738fb7b55864a25c65919c17a3b41f329311083 Mon Sep 17 00:00:00 2001 From: Dylan Nienberg <87150991+Sparowhawk@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:02:56 -0500 Subject: [PATCH] chore/9430-RNUpdate (#9515) Co-authored-by: Rachael Bontrager --- VAMobile/.detoxrc.json | 2 +- VAMobile/android/app/build.gradle | 90 +- .../android/app/src/main/AndroidManifest.xml | 1 + .../java/gov/va/mobileapp/MainApplication.kt | 2 +- .../res/drawable/rn_edit_text_material.xml | 3 +- VAMobile/android/build.gradle | 6 +- VAMobile/android/gradle.properties | 2 - .../gradle/wrapper/gradle-wrapper.properties | 4 +- VAMobile/android/settings.gradle | 4 +- VAMobile/e2e/tests/Messages.e2e.ts | 26 +- VAMobile/ios/Gemfile | 4 +- VAMobile/ios/Podfile | 3 +- VAMobile/ios/Podfile.lock | 1488 ++++++++++++----- VAMobile/ios/PrivacyInfo.xcprivacy | 65 +- .../ios/VAMobile.xcodeproj/project.pbxproj | 45 +- VAMobile/ios/VAMobile/AppDelegate.mm | 4 +- VAMobile/ios/VAMobile/Info.plist | 2 +- VAMobile/metro.config.js | 20 +- VAMobile/package.json | 20 +- VAMobile/src/components/Box.tsx | 4 +- VAMobile/yarn.lock | 783 ++++++--- 21 files changed, 1731 insertions(+), 847 deletions(-) diff --git a/VAMobile/.detoxrc.json b/VAMobile/.detoxrc.json index b307913691d..fd6d707132b 100644 --- a/VAMobile/.detoxrc.json +++ b/VAMobile/.detoxrc.json @@ -20,7 +20,7 @@ "android": { "type": "android.apk", "binaryPath": "android/app/build/outputs/apk/debug/app-debug.apk", - "build": "cd android ; ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug; cd .." + "build": "cd android ; ./gradlew app:assembleDebug app:assembleAndroidTest -DtestBuildType=debug; cd .." } }, "devices": { diff --git a/VAMobile/android/app/build.gradle b/VAMobile/android/app/build.gradle index 8ea0eb22bc2..2b7655c0e89 100644 --- a/VAMobile/android/app/build.gradle +++ b/VAMobile/android/app/build.gradle @@ -13,72 +13,26 @@ apply plugin: 'com.google.firebase.firebase-perf' * bundle directly from the development server. Below you can see all the possible configurations * and their defaults. If you decide to add a configuration block, make sure to add it before the * `apply from: "../../node_modules/react-native/react.gradle"` line. - * - * project.ext.react = [ - * // the name of the generated asset file containing your JS bundle - * bundleAssetName: "index.android.bundle", - * - * // the entry file for bundle generation. If none specified and - * // "index.android.js" exists, it will be used. Otherwise "index.js" is - * // default. Can be overridden with ENTRY_FILE environment variable. - * entryFile: "index.android.js", - * - * // https://reactnative.dev/docs/performance#enable-the-ram-format - * bundleCommand: "ram-bundle", - * - * // whether to bundle JS and assets in debug mode - * bundleInDebug: false, - * - * // whether to bundle JS and assets in release mode - * bundleInRelease: true, - * - * // whether to bundle JS and assets in another build variant (if configured). - * // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants - * // The configuration property can be in the following formats - * // 'bundleIn${productFlavor}${buildType}' - * // 'bundleIn${buildType}' - * // bundleInFreeDebug: true, - * // bundleInPaidRelease: true, - * // bundleInBeta: true, - * - * // whether to disable dev mode in custom build variants (by default only disabled in release) - * // for example: to disable dev mode in the staging build type (if configured) - * devDisabledInStaging: true, - * // The configuration property can be in the following formats - * // 'devDisabledIn${productFlavor}${buildType}' - * // 'devDisabledIn${buildType}' - * - * // the root of your project, i.e. where "package.json" lives - * root: "../../", - * - * // where to put the JS bundle asset in debug mode - * jsBundleDirDebug: "$buildDir/intermediates/assets/debug", - * - * // where to put the JS bundle asset in release mode - * jsBundleDirRelease: "$buildDir/intermediates/assets/release", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in debug mode - * resourcesDirDebug: "$buildDir/intermediates/res/merged/debug", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in release mode - * resourcesDirRelease: "$buildDir/intermediates/res/merged/release", - * - * // by default the gradle tasks are skipped if none of the JS files or assets change; this means - * // that we don't look at files in android/ or ios/ to determine whether the tasks are up to - * // date; if you have any other folders that you want to ignore for performance reasons (gradle - * // indexes the entire tree), add them here. Alternatively, if you have JS files in android/ - * // for example, you might want to remove it from here. - * inputExcludes: ["android/**", "ios/**"], - * - * // override which node gets called and with what additional arguments - * nodeExecutableAndArgs: ["node"], - * - * // supply additional arguments to the packager - * extraPackagerArgs: [] - * ] - */ + **/ +react { + // 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") + + /* Variants */ + // The list of variants to that are debuggable. For those we're going to + // + // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" + // hermesFlags = ["-O", "-output-source-map"] + + /* Autolinking */ + autolinkLibrariesWithApp() +} project.ext.react = [ enableHermes: true, // clean and rebuild if changing @@ -215,7 +169,7 @@ dependencies { implementation jscFlavor } - implementation 'com.android.support:multidex:2.0.1' + implementation "androidx.multidex:multidex:2.0.1" implementation fileTree(dir: "libs", include: ["*.jar"]) @@ -264,8 +218,6 @@ task copyDownloadableDepsToLibs(type: Copy) { into 'libs' } -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) - // fastlane build tasks and defs def readVersion() { def versionFile = new File(project.rootDir, 'version.properties') diff --git a/VAMobile/android/app/src/main/AndroidManifest.xml b/VAMobile/android/app/src/main/AndroidManifest.xml index d3061790723..9deb2da55bd 100644 --- a/VAMobile/android/app/src/main/AndroidManifest.xml +++ b/VAMobile/android/app/src/main/AndroidManifest.xml @@ -42,6 +42,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/${appIconRound}" android:theme="@style/AppTheme" + android:supportsRtl="true" android:networkSecurityConfig="@xml/network_security_config"> + android:insetBottom="@dimen/abc_edit_text_inset_bottom_material" + >