Merge pull request #45398 from Expensify/Julesssss-cherry-pick-stagin…

…g-45332-1 🍒 Cherry pick PR #45332 to staging 🍒
Expensify · Jul 15, 2024 · bb0a66d · bb0a66d
2 parents 87c06d2 + 0496817
commit bb0a66d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -84,13 +84,15 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android beta
         env:
+          RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
       - name: Run Fastlane production
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android production
         env:
+          RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released
           VERSION: ${{ env.VERSION_CODE }}
 
       - name: Archive Android sourcemaps

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
@@ -1,3 +1,4 @@
+
 name: Build and deploy apps for testing
 
 on:

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000604
-        versionName "9.0.6-4"
+        versionCode 1009000605
+        versionName "9.0.6-5"
         // 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/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.6.4</string>
+	<string>9.0.6.5</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.6.4</string>
+	<string>9.0.6.5</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.6.4</string>
+	<string>9.0.6.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.6-4",
+  "version": "9.0.6-5",
   "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.",
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@

		name: Build and deploy apps for testing

		on:
Expand Down