Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/49093

Expensify · Nov 18, 2024 · b6fbe5e · b6fbe5e
2 parents e441bc6 + bd6c90d
commit b6fbe5e
Show file tree

Hide file tree

Showing 52 changed files with 1,176 additions and 815 deletions.
diff --git a/.github/workflows/androidBump.yml b/.github/workflows/androidBump.yml
@@ -1,6 +1,7 @@
 name: Android Rollout Bumper
 
 on:
+  workflow_dispatch:
   schedule:
     # Runs at midnight every day
     - cron: '0 0 * * *'

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 1009006301
-        versionName "9.0.63-1"
+        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,11 +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(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: options[:rollout],
             skip_upload_apk: true,