Merge pull request #51877 from Expensify/AndrewGable-cherry-pick-staging-51873-1

Author: mountiny

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009005604
-        versionName "9.0.56-4"
+        versionCode 1009005605
+        versionName "9.0.56-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"

fastlane/Appfile

@@ -1,9 +1,4 @@
-app_identifier("com.chat.expensify.chat") # The bundle identifier of your app
-apple_id("ios@expensify.com") # Your Apple email address
-
-itc_team_id("152696") # App Store Connect Team ID
-team_id("368M544MTT") # Developer Portal Team ID
-
-for_lane :build_hybrid, :build_unsigned_hybrid, :upload_testflight_hybrid do
-  app_identifier("com.expensify.expensifylite")
-end
+# See https://docs.fastlane.tools/advanced/Appfile/
+apple_id("ios@expensify.com")
+itc_team_id("152696")
+team_id("368M544MTT")

fastlane/Fastfile

@@ -274,6 +274,7 @@ platform :ios do
     )
 
     build_app(
+      app_identifier: "com.chat.expensify.chat",
       workspace: "./ios/NewExpensify.xcworkspace",
       scheme: "New Expensify",
       output_name: "New Expensify.ipa",
@@ -304,6 +305,7 @@ platform :ios do
       )
 
       build_app(
+        app_identifier: "com.expensify.expensifylite",
         workspace: "../iOS/Expensify.xcworkspace",
         scheme: "Expensify",
         output_name: "Expensify.ipa",
@@ -324,6 +326,7 @@ platform :ios do
   lane :build_unsigned do
     ENV["ENVFILE"]=".env.production"
     build_app(
+        app_identifier: "com.chat.expensify.chat",
         workspace: "./ios/NewExpensify.xcworkspace",
         scheme: "New Expensify"
     )
@@ -334,6 +337,7 @@ platform :ios do
     lane :build_unsigned_hybrid do
       ENV["ENVFILE"]="../Mobile-Expensify/.env.production.hybridapp"
       build_app(
+          app_identifier: "com.expensify.expensifylite",
           workspace: "../Mobile-Expensify/iOS/Expensify.xcworkspace",
           scheme: "Expensify"
       )
@@ -355,6 +359,7 @@ platform :ios do
     )
 
     build_app(
+      app_identifier: "com.chat.expensify.chat",
       workspace: "./ios/NewExpensify.xcworkspace",
       skip_profile_detection: true,
       scheme: "New Expensify AdHoc",
@@ -388,6 +393,7 @@ platform :ios do
   desc "Upload app to TestFlight"
   lane :upload_testflight do
     upload_to_testflight(
+      app_identifier: "com.chat.expensify.chat",
       api_key_path: "./ios/ios-fastlane-json-key.json",
       distribute_external: true,
       notify_external_testers: true,
@@ -421,6 +427,7 @@ platform :ios do
   desc "Upload HybridApp to TestFlight"
     lane :upload_testflight_hybrid do
       upload_to_testflight(
+        app_identifier: "com.expensify.expensifylite",
         api_key_path: "./ios/ios-fastlane-json-key.json",
         distribute_external: true,
         notify_external_testers: true,
@@ -452,9 +459,10 @@ platform :ios do
     )
     end
 
-  desc "Submit app to App Store Review"
+  desc "Submit app for production App Store Review"
   lane :submit_for_review do
     deliver(
+      app_identifier: "com.chat.expensify.chat",
       api_key_path: "./ios/ios-fastlane-json-key.json",
 
       # Skip HTMl report verification

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.56.4</string>
+	<string>9.0.56.5</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.56.4</string>
+	<string>9.0.56.5</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.56</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.56.4</string>
+	<string>9.0.56.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.56-4",
+  "version": "9.0.56-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.",