Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Infra] Sync messaging with recent 1P infra changes #13793

Merged
merged 1 commit into from
Oct 3, 2024
Merged

[Infra] Sync messaging with recent 1P infra changes #13793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions FirebaseMessaging/Sources/FIRMessaging+ExtensionHelper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ + (FIRMessagingExtensionHelper *)extensionHelper {
return extensionHelper;
}

#if SWIFT_PACKAGE || COCOAPODS || FIREBASE_BUILD_CARTHAGE || FIREBASE_BUILD_ZIP_FILE
ncooke3 marked this conversation as resolved.
Show resolved Hide resolved
/// Stub used to force the linker to include the categories in this file.
void FIRInclude_FIRMessaging_ExtensionHelper_Category(void) {
}
#endif // SWIFT_PACKAGE || COCOAPODS || FIREBASE_BUILD_CARTHAGE || FIREBASE_BUILD_ZIP_FILE

@end
5 changes: 4 additions & 1 deletion FirebaseMessaging/Sources/FIRMessaging.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,8 +1020,9 @@ + (NSString *)FIRMessagingSDKCurrentLocale {
}

#pragma mark - Force Category Linking

#if SWIFT_PACKAGE || COCOAPODS || FIREBASE_BUILD_CARTHAGE || FIREBASE_BUILD_ZIP_FILE
extern void FIRInclude_FIRMessaging_ExtensionHelper_Category(void);
#endif // SWIFT_PACKAGE || COCOAPODS || FIREBASE_BUILD_CARTHAGE || FIREBASE_BUILD_ZIP_FILE
extern void FIRInclude_NSDictionary_FIRMessaging_Category(void);
extern void FIRInclude_NSError_FIRMessaging_Category(void);

Expand All @@ -1030,7 +1031,9 @@ + (NSString *)FIRMessagingSDKCurrentLocale {
/// This method forces the linker to include categories even if
/// users do not include the '-ObjC' linker flag in their project.
+ (void)noop {
#if SWIFT_PACKAGE || COCOAPODS || FIREBASE_BUILD_CARTHAGE || FIREBASE_BUILD_ZIP_FILE
FIRInclude_FIRMessaging_ExtensionHelper_Category();
#endif // SWIFT_PACKAGE || COCOAPODS || FIREBASE_BUILD_CARTHAGE || FIREBASE_BUILD_ZIP_FILE
FIRInclude_NSDictionary_FIRMessaging_Category();
FIRInclude_NSError_FIRMessaging_Category();
}
Expand Down
Loading