Merge branch 'Expensify:main' into Make-or-track-payments---policy-changelog

Author: rayane-d

.github/workflows/remote-build-android.yml

@@ -59,10 +59,3 @@ jobs:
           variant: ${{ matrix.variant }}
           rock-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
           comment-bot: false
-
-      - name: Verify ELF alignment
-        run: |
-          APK_PATH=$(find android/app/build/outputs/apk -type f -name "*.apk" | head -n 1)
-          echo "Using APK: $APK_PATH"
-
-          scripts/check-elf-alignment.sh "$APK_PATH"

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009025904
-        versionName "9.2.59-4"
+        versionCode 1009026000
+        versionName "9.2.60-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -56,7 +56,7 @@ const config = defineConfig([
         ignores: ['**/libs/**/*.{ts,tsx}'],
         rules: {
             'no-restricted-imports': [
-                'error',
+                'warn',
                 {
                     paths: restrictedIconImportPaths,
                     patterns: restrictedIconImportPatterns,

eslint.changed.config.mjs

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.59</string>
+	<string>9.2.60</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.59.4</string>
+	<string>9.2.60.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.59</string>
+	<string>9.2.60</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.59.4</string>
+	<string>9.2.60.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.59</string>
+	<string>9.2.60</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.59.4</string>
+	<string>9.2.60.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.2.59-4",
+  "version": "9.2.60-0",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

package-lock.json

@@ -1,7 +1,4 @@
 #!/bin/bash
-
-# Original source https://cs.android.com/android/platform/superproject/main/+/main:system/extras/tools/check_elf_alignment.sh
-
 set -o pipefail
 
 progname="${0##*/}"
@@ -114,18 +111,4 @@ if [ "${#unaligned_libs[@]}" -gt 0 ]; then
 elif [ -n "${dir_filename:-}" ]; then
   success "ELF Verification Successful"
 fi
-
-arm64_unaligned=0
-for lib in "${unaligned_libs[@]}"; do
-  if [[ "$lib" == *"arm64-v8a"* ]]; then
-    arm64_unaligned=1
-    break
-  fi
-done
-
-if [ "$arm64_unaligned" -eq 1 ]; then
-  printf "%s arm64-v8a ELF misalignment detected. %s\n" "$RED" "$RESET"
-  exit 1
-fi
-
 echo "====================="