[InAppMessaging] Fix #12882 (#12910)

firebase · May 7, 2024 · ab94a58 · paulb777 · May 8, 2024 · ab94a58
1 parent b414bfc
commit ab94a58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/FirebaseInAppMessaging/CHANGELOG.md b/FirebaseInAppMessaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Unreleased
+- [fixed] Fixed crash at app start that affected SwiftPM users and CocoaPods
+  users using static frameworks (#12882).
+
 # 10.25.0
 - [changed] Removed usages of user defaults API to eliminate required reason
   impact.

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m
@@ -72,10 +72,12 @@ + (NSBundle *)getViewResourceBundle {
            [NSBundle mainBundle],
            // Dynamically linked.
            [NSBundle bundleForClass:myClass],
+#if FIREBASE_BUILD_ZIP_FILE
            // Embedded static framework (zip distribution).
            [NSBundle bundleWithURL:[NSBundle.mainBundle.bundleURL
                                        URLByAppendingPathComponent:
                                            @"Frameworks/FirebaseInAppMessaging.framework"]]
+#endif  // FIREBASE_BUILD_ZIP_FILE
          ]) {
       bundleURL = [containingBundle URLForResource:bundledResource withExtension:@"bundle"];
       if (bundleURL != nil) break;