Skip to content

Commit eaa09ea

Browse files
committed
fix(ios): address Cursor Bugbot review findings on PR invertase#8933
- analytics: include FirebaseAnalytics/IdentitySupport when $RNFirebaseDisableSPM forces CocoaPods on RN >= 0.75. The previous `unless defined?(spm_dependency)` guard skipped the IdentitySupport block even when the user explicitly opted out of SPM. - installations: remove redundant `#import "FirebaseInstallations/ FIRInstallations.h"` from RNFBInstallationsModule.m. The symbols are already provided by the conditional import block above (via <Firebase/Firebase.h> on CocoaPods or @import FirebaseInstallations on SPM). The quoted header path was a CocoaPods-only artifact that could fail to resolve in SPM mode.
1 parent 2725045 commit eaa09ea

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

packages/analytics/RNFBAnalytics.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Pod::Spec.new do |s|
6262
firebase_dependency(s, firebase_sdk_version, ['FirebaseAnalytics'], 'FirebaseAnalytics/Core')
6363
end
6464

65-
unless defined?(spm_dependency)
65+
unless defined?(spm_dependency) && !defined?($RNFirebaseDisableSPM)
6666
# CocoaPods-only: conditional IdentitySupport subspec
6767
if defined?($RNFirebaseAnalyticsWithoutAdIdSupport) && ($RNFirebaseAnalyticsWithoutAdIdSupport == true)
6868
Pod::UI.puts "#{s.name}: Not installing FirebaseAnalytics/IdentitySupport Pod, no IDFA will be collected."

packages/installations/ios/RNFBInstallations/RNFBInstallationsModule.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
#import "RNFBApp/RNFBSharedUtils.h"
2727
#import "RNFBInstallationsModule.h"
2828

29-
#import "FirebaseInstallations/FIRInstallations.h"
30-
3129
@implementation RNFBInstallationsModule
3230
#pragma mark -
3331
#pragma mark Module Setup

0 commit comments

Comments
 (0)