From 423bce25ab6166a1c2cf54c8587bfd7cddd08290 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Fri, 1 Nov 2024 09:48:14 -0600
Subject: [PATCH] Use explicit app_identifier to prevent build errors

---
 fastlane/Appfile  |  7 -------
 fastlane/Fastfile | 10 +++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fastlane/Appfile b/fastlane/Appfile
index 20a2bff92bfc..42f887a827d1 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -2,10 +2,3 @@
 apple_id("ios@expensify.com")
 itc_team_id("152696")
 team_id("368M544MTT")
-
-for_lane :build_hybrid, :build_unsigned_hybrid, :upload_testflight_hybrid do
-  # For HybridApp build tasks, use the OldApp bundle identifier
-  app_identifier("com.expensify.expensifylite")
-else
-  app_identifier("com.expensify.expensify")
-end
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a9bd6d5b1928..94f7eadd9feb 100644
--- a/fastlane/Fastfile
+++ b/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