Merge branch 'main' into revert-52434-revert-PR-51445

Expensify · Nov 18, 2024 · 1dbec4d · 1dbec4d
2 parents e12c200 + 037ac1b
commit 1dbec4d
Show file tree

Hide file tree

Showing 77 changed files with 1,391 additions and 1,196 deletions.
diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
@@ -54,8 +54,6 @@ jobs:
   build:
     name: Build Android app
     runs-on: ubuntu-latest-xl
-    env:
-      RUBYOPT: '-rostruct'
     outputs:
       AAB_FILE_NAME: ${{ steps.build.outputs.AAB_FILE_NAME }}
       APK_FILE_NAME: ${{ steps.build.outputs.APK_FILE_NAME }}

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -81,8 +81,6 @@ jobs:
     name: Upload Android build to Google Play Store
     needs: buildAndroid
     runs-on: ubuntu-latest
-    env:
-      RUBYOPT: '-rostruct'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -121,8 +119,6 @@ jobs:
     needs: prep
     if: ${{ github.ref == 'refs/heads/production' }}
     runs-on: ubuntu-latest
-    env:
-      RUBYOPT: '-rostruct'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -170,8 +166,6 @@ jobs:
     defaults:
       run:
         working-directory: Mobile-Expensify/react-native
-    env:
-      RUBYOPT: '-rostruct'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -93,8 +93,6 @@ jobs:
     name: Upload Android app to S3
     needs: [buildAndroid]
     runs-on: ubuntu-latest
-    env:
-      RUBYOPT: '-rostruct'
     outputs:
       S3_APK_PATH: ${{ steps.exportS3Path.outputs.S3_APK_PATH }}
     steps:

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009006302
-        versionName "9.0.63-2"
+        versionCode 1009006303
+        versionName "9.0.63-3"
         // 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"

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -265,11 +265,15 @@ platform :android do
 
     desc "Submit HybridApp to 100% rollout on Google Play"
     lane :complete_hybrid_rollout do
-        productionVersionCode = google_play_track_version_codes(track: 'production')
+        productionVersionCodes = google_play_track_version_codes(
+                                            track: 'production',
+                                            package_name: "org.me.mobiexpensifyg",
+                                            json_key: './android/app/android-fastlane-json-key.json',
+                                        )
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode,
+            version_code: productionVersionCodes.sort.last, # Get the latest version code
             track: 'production',
             rollout: '1',
             skip_upload_apk: true,
@@ -283,14 +287,15 @@ platform :android do
 
     desc "Update HybridApp rollout percentage on Google Play"
     lane :update_hybrid_rollout do |options|
-        productionVersionCode = google_play_track_version_codes(
+        productionVersionCodes = google_play_track_version_codes(
                                     track: 'production',
+                                    package_name: "org.me.mobiexpensifyg",
                                     json_key: './android/app/android-fastlane-json-key.json',
                                 )
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode,
+            version_code: productionVersionCodes.sort.last, # Get the latest version code
             track: 'production',
             rollout: options[:rollout],
             skip_upload_apk: true,