[Infra] Simplify Client app schemes

.github/workflows/client_app.yml

@@ -30,9 +30,7 @@ jobs:
       matrix:
         #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
         platform: [iOS]
-        scheme: [ClientApp-iOS13]
-        # TODO(ncooke3): Re-enable after updating Firestore binary.
-        #scheme: [ClientApp, ClientApp-iOS13]
+        scheme: [ClientApp]
     steps:
       - uses: actions/checkout@v4
       - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -53,7 +51,7 @@ jobs:
         matrix:
           #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
           platform: [iOS]
-          scheme: [ClientApp, ClientApp-iOS13]
+          scheme: [ClientApp]
       steps:
         - uses: actions/checkout@v4
         - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -70,7 +68,7 @@ jobs:
     runs-on: macos-14
     strategy:
       matrix:
-        scheme: [ClientApp-CocoaPods, ClientApp-CocoaPods-iOS13]
+        scheme: [ClientApp-CocoaPods]
     steps:
       - uses: actions/checkout@v4
       - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

IntegrationTesting/ClientApp/Podfile

@@ -18,6 +18,8 @@ target 'ClientApp-CocoaPods' do
   pod 'FirebaseRemoteConfig', :path => '../../'
   pod 'FirebaseRemoteConfigInterop', :path => '../../'
   pod 'FirebaseAppDistribution', :path => '../../'
+  pod 'FirebaseAuthInterop', :path => '../../'
+  pod 'FirebaseAuth', :path => '../../'
   pod 'FirebaseCrashlytics', :path => '../../'
   pod 'FirebaseDatabase', :path => '../../'
   pod 'FirebaseDynamicLinks', :path => '../../'
@@ -27,19 +29,8 @@ target 'ClientApp-CocoaPods' do
   pod 'FirebaseInAppMessaging', :path => '../../'
   pod 'FirebaseMessaging', :path => '../../'
   pod 'FirebaseSessions', :path => '../../'
+  pod 'FirebaseStorage', :path => '../../'
   pod 'FirebasePerformance', :path => '../../'
   pod 'FirebaseMLModelDownloader', :path => '../../'
   pod 'Firebase', :path => '../../'
 end
-
-target 'ClientApp-CocoaPods-iOS13' do
-  platform :ios, '13.0'
-
-  use_frameworks!
-
-  pod 'FirebaseAnalytics' # Binary pods don't work with `:path`.
-  pod 'FirebaseAuth', :path => '../../' # Requires iOS 13.0+
-  pod 'FirebaseAuthInterop', :path => '../../'
-  pod 'FirebaseInAppMessaging', :path => '../../'
-  pod 'FirebaseStorage', :path => '../../'
-end

IntegrationTesting/ClientApp/Shared-iOS12+/objc-header-import-test.m → IntegrationTesting/ClientApp/Shared/objc-header-import-test.m

@@ -21,10 +21,9 @@
 #import <FirebaseABTesting/FirebaseABTesting.h>
 #import <FirebaseAnalytics/FirebaseAnalytics.h>
 #import <FirebaseAppCheck/FirebaseAppCheck.h>
-#import "Firebase.h"
-#import "FirebaseABTesting/FirebaseABTesting.h"
-#import "FirebaseAnalytics/FirebaseAnalytics.h"
+#import <FirebaseAuth/FirebaseAuth.h>
 #import "FirebaseAppCheck/FirebaseAppCheck.h"
+#import "FirebaseAuth/FirebaseAuth.h"
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 #import <FirebaseAppDistribution/FirebaseAppDistribution.h>
 #import "FirebaseAppDistribution/FirebaseAppDistribution.h"
@@ -53,3 +52,16 @@
 #endif
 #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
 #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
+
+#ifdef COCOAPODS
+#import "FirebaseStorage/FIRStorageTypedefs.h"
+
+@interface TestImports : NSObject
+@end
+
+@implementation TestImports
+- (FIRAuth *)testImports {
+  return [FIRAuth auth];
+}
+@end
+#endif

IntegrationTesting/ClientApp/Shared-iOS12+/objc-module-import-test.m → IntegrationTesting/ClientApp/Shared/objc-module-import-test.m

@@ -24,18 +24,19 @@
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 @import FirebaseAppDistribution;
 #endif
+@import FirebaseAuth;
 @import FirebaseCore;
 @import FirebaseCrashlytics;
-@import FirebaseDatabase;
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 @import FirebaseDynamicLinks;
 #endif
-@import FirebaseFirestore;
-@import FirebaseFunctions;
-@import FirebaseInstallations;
-@import FirebaseMessaging;
 #if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV
 @import FirebasePerformance;
 @import FirebaseInAppMessaging;
 #endif
+@import FirebaseFirestore;
+@import FirebaseFunctions;
+@import FirebaseInstallations;
+@import FirebaseMessaging;
+@import FirebaseStorage;
 @import FirebaseRemoteConfig;

IntegrationTesting/ClientApp/Shared-iOS12+/objcxx-header-import-test.mm → IntegrationTesting/ClientApp/Shared/objcxx-header-import-test.mm

@@ -21,10 +21,12 @@
 #import <FirebaseABTesting/FirebaseABTesting.h>
 #import <FirebaseAnalytics/FirebaseAnalytics.h>
 #import <FirebaseAppCheck/FirebaseAppCheck.h>
+#import <FirebaseAuth/FirebaseAuth.h>
 #import "Firebase.h"
 #import "FirebaseABTesting/FirebaseABTesting.h"
 #import "FirebaseAnalytics/FirebaseAnalytics.h"
 #import "FirebaseAppCheck/FirebaseAppCheck.h"
+#import "FirebaseAuth/FirebaseAuth.h"
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 #import <FirebaseAppDistribution/FirebaseAppDistribution.h>
 #import "FirebaseAppDistribution/FirebaseAppDistribution.h"
@@ -53,3 +55,16 @@
 #endif
 #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
 #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
+
+#ifdef COCOAPODS
+#import "FirebaseStorage/FIRStorageTypedefs.h"
+
+@interface TestImportsCxx : NSObject
+@end
+
+@implementation TestImportsCxx
+- (FIRAuth *)testImports {
+  return [FIRAuth auth];
+}
+@end
+#endif

IntegrationTesting/ClientApp/Shared-iOS12+/swift-import-test.swift → IntegrationTesting/ClientApp/Shared/swift-import-test.swift

@@ -18,10 +18,14 @@
   // TODO(ncooke3): Figure out why this isn't working on CocoaPods.
   import Firebase
 #endif // !COCOAPODS
+#if SWIFT_PACKAGE
+  import FirebaseAuthCombineSwift
+#endif // SWIFT_PACKAGE
 // NOTE(ncooke3): `FirebaseABTesting` is not listed as a library.
 import FirebaseABTesting
 import FirebaseAnalytics
 import FirebaseAppCheck
+import FirebaseAuth
 #if os(iOS) && !targetEnvironment(macCatalyst)
   import FirebaseAppDistribution
 #endif
@@ -47,6 +51,7 @@ import FirebaseMLModelDownloader
   import FirebasePerformance
 #endif
 import FirebaseRemoteConfig
+import FirebaseStorage
 #if SWIFT_PACKAGE
   import FirebaseStorageCombineSwift
 #endif // SWIFT_PACKAGE