Skip to content

Commit

Permalink
Merge branch 'main' into jules-removeRubyWorkaround
Browse files Browse the repository at this point in the history
* main: (52 commits)
  Even more lint fixes
  More lint fixes
  fixing more lint/pretty issues
  Prettied the code
  Fixed a lot of lint errors
  Prettified the JS
  Split up files
  Consolidating search code in prep for splitting out JS/CSS
  More mobile stylings
  Cleaned up mobile nav
  Updating product list
  More moblie tweaks
  Updating mobile layout
  Don't complete onboarding if not an invited user
  Update version to 9.0.63-3
  Remove debug trigger
  Add s
  Sort and grab last version code
  Update with `package_name` and even better debug
  Revert "Fix blank space is shown on iOS safari when magic code screen show"
  ...
  • Loading branch information
Julesssss committed Nov 18, 2024
2 parents 5af15f5 + b0378aa commit 5038171
Show file tree
Hide file tree
Showing 30 changed files with 1,018 additions and 756 deletions.
1 change: 1 addition & 0 deletions .github/workflows/androidBump.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Android Rollout Bumper

on:
workflow_dispatch:
schedule:
# Runs at midnight every day
- cron: '0 0 * * *'
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 12 additions & 4 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Loading

0 comments on commit 5038171

Please sign in to comment.