[Crashlytics] Fix missing Swift header error (#12659)

Author: ncooke3

.github/workflows/crashlytics.yml

@@ -26,6 +26,10 @@ jobs:
       matrix:
         target: [ios, tvos, macos, watchos --skip-tests]
         os: [macos-12, macos-13]
+        flags: [
+          '--use-modular-headers',
+          ''
+        ]
         include:
           - os: macos-12
             xcode: Xcode_14.2
@@ -47,7 +51,7 @@ jobs:
         max_attempts: 3
         retry_on: error
         retry_wait_seconds: 120
-        command: scripts/pod_lib_lint.rb FirebaseCrashlytics.podspec --platforms=${{ matrix.target }} ${{ matrix.tests }}
+        command: scripts/pod_lib_lint.rb FirebaseCrashlytics.podspec --platforms=${{ matrix.target }} ${{ matrix.tests }} ${{ matrix.flags }}
 
   spm:
     # Don't run on private repo unless it is a PR.

Crashlytics/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Unreleased
+- [fixed] Fix `'FirebaseCrashlytics/FirebaseCrashlytics-Swift.h' file not found`
+  errors (#12611).
+
 # 10.23.0
 - [added] Updated upload-symbols to 13.7 with VisionPro build phase support. (#12306)
 - [changed] Added support for Crashlytics to report metadata about Remote Config keys and values.

Crashlytics/Crashlytics/Controllers/FIRCLSRolloutsPersistenceManager.h

@@ -14,9 +14,14 @@
 
 #if SWIFT_PACKAGE
 @import FirebaseCrashlyticsSwift;
-#else  // Swift Package Manager
+#elif __has_include(<FirebaseCrashlytics/FirebaseCrashlytics-Swift.h>)
 #import <FirebaseCrashlytics/FirebaseCrashlytics-Swift.h>
-#endif  // CocoaPods
+#elif __has_include("FirebaseCrashlytics-Swift.h")
+// If frameworks are not available, fall back to importing the header as it
+// should be findable from a header search path pointing to the build
+// directory. See #12611 for more context.
+#import "FirebaseCrashlytics-Swift.h"
+#endif
 
 @interface FIRCLSRolloutsPersistenceManager : NSObject <FIRCLSPersistenceLog>
 

Crashlytics/Crashlytics/Controllers/FIRCLSRolloutsPersistenceManager.m

@@ -21,9 +21,14 @@
 
 #if SWIFT_PACKAGE
 @import FirebaseCrashlyticsSwift;
-#else  // Swift Package Manager
+#elif __has_include(<FirebaseCrashlytics/FirebaseCrashlytics-Swift.h>)
 #import <FirebaseCrashlytics/FirebaseCrashlytics-Swift.h>
-#endif  // CocoaPods
+#elif __has_include("FirebaseCrashlytics-Swift.h")
+// If frameworks are not available, fall back to importing the header as it
+// should be findable from a header search path pointing to the build
+// directory. See #12611 for more context.
+#import "FirebaseCrashlytics-Swift.h"
+#endif
 
 @interface FIRCLSRolloutsPersistenceManager : NSObject <FIRCLSPersistenceLog>
 @property(nonatomic, readonly) FIRCLSFileManager *fileManager;

Crashlytics/Crashlytics/FIRCrashlytics.m

@@ -63,9 +63,14 @@
 @import FirebaseRemoteConfigInterop;
 #if SWIFT_PACKAGE
 @import FirebaseCrashlyticsSwift;
-#else  // Swift Package Manager
+#elif __has_include(<FirebaseCrashlytics/FirebaseCrashlytics-Swift.h>)
 #import <FirebaseCrashlytics/FirebaseCrashlytics-Swift.h>
-#endif  // CocoaPods
+#elif __has_include("FirebaseCrashlytics-Swift.h")
+// If frameworks are not available, fall back to importing the header as it
+// should be findable from a header search path pointing to the build
+// directory. See #12611 for more context.
+#import "FirebaseCrashlytics-Swift.h"
+#endif
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>