From e3b274af142f7362b99aaab8141f8d5ec0d6beb0 Mon Sep 17 00:00:00 2001 From: Rajesh Malviya Date: Fri, 7 Mar 2025 18:15:07 +0530 Subject: [PATCH] ios build: Revert workaround for package:firebase_messaging This reverts part of commit a9b20167c (#958), keeping the `Zulip.xcconfig` file and its references. The fix was released in version `3.6.0` of `package:firebase_core` and version `15.1.3` of `package:firebase_messaging`: https://github.com/firebase/flutterfire/commit/d7d2d4b93e7c00226027fffde46699f3d5388a41 We have since then updated Firebase dependencies 3 times: https://github.com/zulip/zulip-flutter/commit/24215f635e569de56ed864597c8f2d565bbf2d2e https://github.com/zulip/zulip-flutter/commit/1abb0a00d1fb21007735e79be80c6d58d3225873 https://github.com/zulip/zulip-flutter/commit/3ba998537ed72d8d3db64e090a8ec29da36f9be2 --- ios/Flutter/Zulip.xcconfig | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ios/Flutter/Zulip.xcconfig b/ios/Flutter/Zulip.xcconfig index 983df5ef51..551f0909db 100644 --- a/ios/Flutter/Zulip.xcconfig +++ b/ios/Flutter/Zulip.xcconfig @@ -1,10 +1,2 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 - -// TODO(firebase/flutterfire#13323): remove this flag -// -// This flag is added to work around the iOS build failing -// on Xcode 16. Remove it when `package:firebase_messaging` -// is patched with a fix to build successfully on Xcode 16: -// https://github.com/firebase/flutterfire/issues/13323 -CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES=YES