fix(ios): address PR review feedback — revert spacing, add Expo docs, improve SPM comments

jsnavarroc · jsnavarroc · commit 496d97c9e456 · 2026-04-22T16:41:01.000-05:00
diff --git a/.github/workflows/tests_e2e_ios.yml b/.github/workflows/tests_e2e_ios.yml
@@ -218,8 +218,8 @@ jobs:
         continue-on-error: true
         with:
           path: tests/ios/Pods
-          key: ${{ runner.os }}-ios-pods-v3-${{ matrix.dep-resolution }}-${{ hashFiles('tests/ios/Podfile.lock') }}
-          restore-keys: ${{ runner.os }}-ios-pods-v3-${{ matrix.dep-resolution }}
+          key: ${{ runner.os }}-${{ matrix.dep-resolution }}-ios-pods-v3-${{ hashFiles('tests/ios/Podfile.lock') }}
+          restore-keys: ${{ runner.os }}-${{ matrix.dep-resolution }}-ios-pods-v3
 
       - name: Configure Dependency Resolution Mode
         run: |
diff --git a/DOCUMENTACION_SPM_IMPLEMENTACION.md b/DOCUMENTACION_SPM_IMPLEMENTACION.md
diff --git a/packages/analytics/RNFBAnalytics.podspec b/packages/analytics/RNFBAnalytics.podspec
@@ -47,8 +47,9 @@ Pod::Spec.new do |s|
 
   # Firebase dependencies
   # Analytics has conditional dependencies that vary between SPM and CocoaPods.
-  # SPM: use FirebaseAnalyticsWithoutAdIdSupport when $RNFirebaseAnalyticsWithoutAdIdSupport = true
-  #      to avoid GoogleAppMeasurement APM symbols that require FirebaseRemoteConfig (linker error).
+  # SPM: use FirebaseAnalyticsCore when $RNFirebaseAnalyticsWithoutAdIdSupport = true
+  #      to avoid GoogleAppMeasurement APM symbols (APMETaskManager, APMMeasurement)
+  #      that require FirebasePerformance at link time.
   # CocoaPods: IdentitySupport is a separate subspec controlled by $RNFirebaseAnalyticsWithoutAdIdSupport.
   if defined?(spm_dependency) && !defined?($RNFirebaseDisableSPM) &&
      defined?($RNFirebaseAnalyticsWithoutAdIdSupport) && $RNFirebaseAnalyticsWithoutAdIdSupport
@@ -80,10 +81,21 @@ Pod::Spec.new do |s|
     s.frameworks =       'AdSupport'
   end
 
-  # GoogleAdsOnDeviceConversion (CocoaPods only, not available in firebase-ios-sdk SPM)
+  # GoogleAdsOnDeviceConversion (CocoaPods only)
+  # This is a static xcframework distributed separately from firebase-ios-sdk.
+  # It is NOT available as an SPM product in the firebase-ios-sdk Package.swift.
+  # When using SPM (dynamic linkage), this static xcframework causes duplicate
+  # symbol errors. Use CocoaPods mode ($RNFirebaseDisableSPM = true) if you need
+  # on-device conversion measurement.
+  # See: https://developers.google.com/google-ads/api/docs/conversions/upload-identifiers
   if defined?($RNFirebaseAnalyticsGoogleAppMeasurementOnDeviceConversion) && ($RNFirebaseAnalyticsGoogleAppMeasurementOnDeviceConversion == true)
-    Pod::UI.puts "#{s.name}: GoogleAdsOnDeviceConversion pod added"
-    s.dependency          'GoogleAdsOnDeviceConversion'
+    if defined?(spm_dependency) && !defined?($RNFirebaseDisableSPM)
+      Pod::UI.warn "#{s.name}: GoogleAdsOnDeviceConversion is not available in SPM mode. " \
+        "Set $RNFirebaseDisableSPM = true in your Podfile to use this feature."
+    else
+      Pod::UI.puts "#{s.name}: GoogleAdsOnDeviceConversion pod added"
+      s.dependency          'GoogleAdsOnDeviceConversion'
+    end
   end
 
   if defined?($RNFirebaseAsStaticFramework)
diff --git a/packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m b/packages/app-check/ios/RNFBAppCheck/RNFBAppCheckModule.m
@@ -60,8 +60,7 @@ + (instancetype)sharedInstance {
                   : (BOOL)isTokenAutoRefreshEnabled
                   : (RCTPromiseResolveBlock)resolve rejecter
                   : (RCTPromiseRejectBlock)reject) {
-  DLog(@"deprecated API, provider will be deviceCheck / token refresh %d for "
-       @"app %@",
+  DLog(@"deprecated API, provider will be deviceCheck / token refresh %d for app %@",
        isTokenAutoRefreshEnabled, firebaseApp.name);
   [[RNFBAppCheckModule sharedInstance].providerFactory configure:firebaseApp
                                                     providerName:@"deviceCheck"
@@ -94,8 +93,8 @@ + (instancetype)sharedInstance {
   appCheck.isTokenAutoRefreshEnabled = isTokenAutoRefreshEnabled;
 }
 
-// Not present in JS or Android - it is iOS-specific so we only call this in
-// testing - it is not in index.d.ts
+// Not present in JS or Android - it is iOS-specific so we only call this in testing - it is not in
+// index.d.ts
 RCT_EXPORT_METHOD(isTokenAutoRefreshEnabled
                   : (FIRApp *)firebaseApp
                   : (RCTPromiseResolveBlock)resolve rejecter
@@ -113,36 +112,33 @@ + (instancetype)sharedInstance {
                   : (RCTPromiseRejectBlock)reject) {
   FIRAppCheck *appCheck = [FIRAppCheck appCheckWithApp:firebaseApp];
   DLog(@"appName %@", firebaseApp.name);
-  [appCheck tokenForcingRefresh:forceRefresh
-                     completion:^(FIRAppCheckToken *_Nullable token, NSError *_Nullable error) {
-                       if (error != nil) {
-                         // Handle any errors if the token was not retrieved.
-                         DLog(@"RNFBAppCheck - getToken - Unable to retrieve App "
-                              @"Check token: %@",
-                              error);
-                         [RNFBSharedUtils
-                             rejectPromiseWithUserInfo:reject
-                                              userInfo:(NSMutableDictionary *)@{
-                                                @"code" : @"token-error",
-                                                @"message" : [error localizedDescription],
-                                              }];
-                         return;
-                       }
-                       if (token == nil) {
-                         DLog(@"RNFBAppCheck - getToken - Unable to retrieve App "
-                              @"Check token.");
-                         [RNFBSharedUtils rejectPromiseWithUserInfo:reject
-                                                           userInfo:(NSMutableDictionary *)@{
-                                                             @"code" : @"token-null",
-                                                             @"message" : @"no token fetched",
-                                                           }];
-                         return;
-                       }
-
-                       NSMutableDictionary *tokenResultDictionary = [NSMutableDictionary new];
-                       tokenResultDictionary[@"token"] = token.token;
-                       resolve(tokenResultDictionary);
-                     }];
+  [appCheck
+      tokenForcingRefresh:forceRefresh
+               completion:^(FIRAppCheckToken *_Nullable token, NSError *_Nullable error) {
+                 if (error != nil) {
+                   // Handle any errors if the token was not retrieved.
+                   DLog(@"RNFBAppCheck - getToken - Unable to retrieve App Check token: %@", error);
+                   [RNFBSharedUtils rejectPromiseWithUserInfo:reject
+                                                     userInfo:(NSMutableDictionary *)@{
+                                                       @"code" : @"token-error",
+                                                       @"message" : [error localizedDescription],
+                                                     }];
+                   return;
+                 }
+                 if (token == nil) {
+                   DLog(@"RNFBAppCheck - getToken - Unable to retrieve App Check token.");
+                   [RNFBSharedUtils rejectPromiseWithUserInfo:reject
+                                                     userInfo:(NSMutableDictionary *)@{
+                                                       @"code" : @"token-null",
+                                                       @"message" : @"no token fetched",
+                                                     }];
+                   return;
+                 }
+
+                 NSMutableDictionary *tokenResultDictionary = [NSMutableDictionary new];
+                 tokenResultDictionary[@"token"] = token.token;
+                 resolve(tokenResultDictionary);
+               }];
 }
 
 RCT_EXPORT_METHOD(getLimitedUseToken
@@ -151,35 +147,32 @@ + (instancetype)sharedInstance {
                   : (RCTPromiseRejectBlock)reject) {
   FIRAppCheck *appCheck = [FIRAppCheck appCheckWithApp:firebaseApp];
   DLog(@"appName %@", firebaseApp.name);
-  [appCheck
-      limitedUseTokenWithCompletion:^(FIRAppCheckToken *_Nullable token, NSError *_Nullable error) {
-        if (error != nil) {
-          // Handle any errors if the token was not retrieved.
-          DLog(@"RNFBAppCheck - getLimitedUseToken - Unable to retrieve App Check "
-               @"token: %@",
-               error);
-          [RNFBSharedUtils rejectPromiseWithUserInfo:reject
-                                            userInfo:(NSMutableDictionary *)@{
-                                              @"code" : @"token-error",
-                                              @"message" : [error localizedDescription],
-                                            }];
-          return;
-        }
-        if (token == nil) {
-          DLog(@"RNFBAppCheck - getLimitedUseToken - Unable to retrieve App Check "
-               @"token.");
-          [RNFBSharedUtils rejectPromiseWithUserInfo:reject
-                                            userInfo:(NSMutableDictionary *)@{
-                                              @"code" : @"token-null",
-                                              @"message" : @"no token fetched",
-                                            }];
-          return;
-        }
-
-        NSMutableDictionary *tokenResultDictionary = [NSMutableDictionary new];
-        tokenResultDictionary[@"token"] = token.token;
-        resolve(tokenResultDictionary);
-      }];
+  [appCheck limitedUseTokenWithCompletion:^(FIRAppCheckToken *_Nullable token,
+                                            NSError *_Nullable error) {
+    if (error != nil) {
+      // Handle any errors if the token was not retrieved.
+      DLog(@"RNFBAppCheck - getLimitedUseToken - Unable to retrieve App Check token: %@", error);
+      [RNFBSharedUtils rejectPromiseWithUserInfo:reject
+                                        userInfo:(NSMutableDictionary *)@{
+                                          @"code" : @"token-error",
+                                          @"message" : [error localizedDescription],
+                                        }];
+      return;
+    }
+    if (token == nil) {
+      DLog(@"RNFBAppCheck - getLimitedUseToken - Unable to retrieve App Check token.");
+      [RNFBSharedUtils rejectPromiseWithUserInfo:reject
+                                        userInfo:(NSMutableDictionary *)@{
+                                          @"code" : @"token-null",
+                                          @"message" : @"no token fetched",
+                                        }];
+      return;
+    }
+
+    NSMutableDictionary *tokenResultDictionary = [NSMutableDictionary new];
+    tokenResultDictionary[@"token"] = token.token;
+    resolve(tokenResultDictionary);
+  }];
 }
 
 @end
diff --git a/packages/app/.npmignore b/packages/app/.npmignore
@@ -69,5 +69,8 @@ type-test.ts
 scripts
 __tests__
 
-# Force include generated version file (needed for linking)
+# Force include generated version file (needed for linking).
+# This file is in .gitignore but must be in the published npm package.
+# Note: this package does not use a "files" array in package.json,
+# so .npmignore is the sole mechanism controlling published file set.
 !ios/RNFBApp/RNFBVersion.m
diff --git a/packages/app/README.md b/packages/app/README.md
@@ -38,21 +38,23 @@ yarn add @react-native-firebase/app
 
 ## iOS Dependency Resolution: SPM vs CocoaPods
 
-Starting with React Native >= 0.75, `@react-native-firebase` supports **Swift Package Manager (SPM)** for resolving Firebase iOS SDK dependencies. SPM is enabled by default — no configuration needed.
+Starting with React Native 0.75+, `@react-native-firebase` supports **Swift Package Manager (SPM)** for resolving Firebase iOS SDK dependencies. SPM is enabled by default when the `spm_dependency` macro is available (injected by React Native >= 0.75) — no configuration needed.
 
 ### How it works
 
 Each RNFB module uses `firebase_dependency()` (defined in `firebase_spm.rb`) to declare its Firebase dependencies. This helper automatically chooses between:
 
 | Condition | Resolution | When to use |
 |-----------|-----------|-------------|
-| React Native >= 0.75 and `$RNFirebaseDisableSPM` **not set** | **SPM** (default) | Dynamic linkage (`use_frameworks! :linkage => :dynamic`) |
-| `$RNFirebaseDisableSPM = true` in Podfile | **CocoaPods** | Static linkage or projects that need CocoaPods-only resolution |
-| React Native < 0.75 | **CocoaPods** (automatic fallback) | Older React Native versions without `spm_dependency` support |
+| RN >= 0.75 and `$RNFirebaseDisableSPM` **not set** | **SPM** (default) | Dynamic linkage / pre-built RN core (`use_frameworks! :linkage => :dynamic`) |
+| `$RNFirebaseDisableSPM = true` in Podfile | **CocoaPods** | Static linkage / no pre-built RN core (`use_frameworks! :linkage => :static`) |
+| RN < 0.75 | **CocoaPods** (automatic fallback) | Older React Native versions without `spm_dependency` support |
+
+> **Note on linkage:** firebase-ios-sdk SPM products use dynamic linkage. When using `use_frameworks! :linkage => :static`, each pod embeds its own copy of Firebase SPM products, causing duplicate symbol errors. Use CocoaPods mode (`$RNFirebaseDisableSPM = true`) with static linkage.
 
 ### Configuration
 
-**Option A — SPM (default, recommended for Xcode 26+)**
+#### Option A — SPM (default, recommended for Xcode 26+)
 
 No changes needed. Just make sure your Podfile uses dynamic linkage:
 
@@ -69,7 +71,7 @@ use_frameworks! :linkage => :dynamic
 > This does NOT disable SPM — it only tells the Swift compiler to use implicit module discovery
 > (the Xcode 16 default) so transitive SPM targets are resolved automatically.
 
-**Option B — CocoaPods only**
+#### Option B — CocoaPods only
 
 Add this line at the top of your Podfile (before any `target` block):
 
@@ -81,6 +83,52 @@ $RNFirebaseDisableSPM = true
 This forces all RNFB modules to use traditional `s.dependency` CocoaPods declarations.
 You can use either static or dynamic linkage with this option.
 
+#### Expo
+
+For Expo managed projects, use `expo-build-properties` to configure linkage and Podfile directives:
+
+```json
+// app.json
+{
+  "expo": {
+    "plugins": [
+      [
+        "expo-build-properties",
+        {
+          "ios": {
+            "useFrameworks": "dynamic"
+          }
+        }
+      ]
+    ]
+  }
+}
+```
+
+To disable SPM in Expo, add a Podfile directive via a config plugin or `app.json`:
+
+```json
+// app.json
+{
+  "expo": {
+    "plugins": [
+      [
+        "expo-build-properties",
+        {
+          "ios": {
+            "useFrameworks": "static",
+            "extraPods": []
+          }
+        }
+      ]
+    ]
+  }
+}
+```
+
+Then create a small [config plugin](https://docs.expo.dev/config-plugins/introduction/) to prepend
+`$RNFirebaseDisableSPM = true` to the generated Podfile, or add it manually if you have ejected.
+
 ### How to verify
 
 During `pod install`, you will see messages indicating which resolution mode is active:
@@ -94,6 +142,14 @@ During `pod install`, you will see messages indicating which resolution mode is
 [react-native-firebase] RNFBApp: SPM disabled ($RNFirebaseDisableSPM = true), using CocoaPods for Firebase dependencies
 ```
 
+### Monorepo / pnpm notes
+
+The `firebase_spm.rb` helper is loaded by each RNFB podspec via `require '../app/firebase_spm'`.
+This relative path assumes the standard `node_modules/@react-native-firebase/` layout. If your
+package manager hoists dependencies differently (e.g., pnpm strict mode), you may need to verify
+that the require path resolves correctly. The SPM URL is read from
+`@react-native-firebase/app/package.json` at the location of `firebase_spm.rb`.
+
 ## License
 
 - See [LICENSE](/LICENSE)
diff --git a/packages/app/firebase_spm.rb b/packages/app/firebase_spm.rb
@@ -18,7 +18,12 @@
 
 require 'json'
 
-# Read Firebase SPM URL from app package.json (single source of truth)
+# Read Firebase SPM URL from app package.json (single source of truth).
+# __dir__ resolves to the directory of this file (packages/app/).
+# In monorepos with hoisted dependencies or pnpm, the path from other packages
+# (e.g., `require '../app/firebase_spm'`) must resolve correctly to this location.
+# If your package manager hoists differently, you may need to adjust the require
+# path in individual podspecs.
 $firebase_spm_url ||= begin
   app_package_path = File.join(__dir__, 'package.json')
   app_package = JSON.parse(File.read(app_package_path))
@@ -32,10 +37,15 @@
 # the traditional CocoaPods `s.dependency` declaration.
 #
 # Set `$RNFirebaseDisableSPM = true` in your Podfile to force CocoaPods-only
-# dependency resolution. This is required when using `use_frameworks! :linkage => :static`
+# dependency resolution. You must disable SPM when using `use_frameworks! :linkage => :static`
 # because static frameworks cause each pod to embed Firebase SPM products,
 # resulting in duplicate symbol linker errors.
 #
+# firebase-ios-sdk SPM requires dynamic linkage. There is no upstream statement
+# from Google that SPM+static is supported. See:
+# https://github.com/firebase/firebase-ios-sdk/blob/main/Package.swift
+# (all products use .library(type: .dynamic))
+#
 # @param spec [Pod::Specification] The podspec object (the `s` in podspec DSL)
 # @param version [String] Firebase SDK version (e.g., '12.10.0')
 # @param spm_products [Array<String>] SPM product names (e.g., ['FirebaseAuth'])
diff --git a/packages/crashlytics/ios_config.sh b/packages/crashlytics/ios_config.sh
@@ -23,12 +23,20 @@ elif [[ -f "${PROJECT_DIR}/FirebaseCrashlytics.framework/run" ]]; then
   echo "info: Exec FirebaseCrashlytics Run from framework"
   "${PROJECT_DIR}/FirebaseCrashlytics.framework/run"
 else
-  # SPM: upload-symbols is in the SourcePackages checkout
-  SPM_UPLOAD_SYMBOLS=$(find "${BUILD_DIR%Build/*}SourcePackages/checkouts/firebase-ios-sdk/Crashlytics" -name "upload-symbols" -type f 2>/dev/null | head -1)
-  if [[ -n "${SPM_UPLOAD_SYMBOLS}" ]]; then
+  # SPM: upload-symbols is at a known path in the SourcePackages checkout.
+  # BUILD_DIR is typically DerivedData/Project-hash/Build/Products — strip from /Build onward
+  # to get the DerivedData project root where SourcePackages lives.
+  SPM_CRASHLYTICS_DIR="${BUILD_DIR%Build/*}SourcePackages/checkouts/firebase-ios-sdk/Crashlytics"
+  SPM_UPLOAD_SYMBOLS="${SPM_CRASHLYTICS_DIR}/upload-symbols"
+  if [[ -x "${SPM_UPLOAD_SYMBOLS}" ]]; then
     echo "info: Exec FirebaseCrashlytics upload-symbols from SPM"
     "${SPM_UPLOAD_SYMBOLS}" -gsp "${PROJECT_DIR}/GoogleService-Info.plist" -p ios "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}"
+  elif [[ -f "${SPM_UPLOAD_SYMBOLS}" ]]; then
+    echo "info: Exec FirebaseCrashlytics upload-symbols from SPM (chmod +x)"
+    chmod +x "${SPM_UPLOAD_SYMBOLS}"
+    "${SPM_UPLOAD_SYMBOLS}" -gsp "${PROJECT_DIR}/GoogleService-Info.plist" -p ios "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}"
   else
-    echo "warning: FirebaseCrashlytics run script not found, skipping dSYM upload"
+    echo "warning: FirebaseCrashlytics run script not found at CocoaPods, framework, or SPM paths. Skipping dSYM upload."
+    echo "warning: Checked: \${PODS_ROOT}/FirebaseCrashlytics/run, \${PROJECT_DIR}/FirebaseCrashlytics.framework/run, ${SPM_UPLOAD_SYMBOLS}"
   fi
 fi
diff --git a/packages/ml/RNFBML.podspec b/packages/ml/RNFBML.podspec
@@ -47,16 +47,15 @@ Pod::Spec.new do |s|
   end
 
   # Firebase dependencies
-  # NOTE: Firebase/MLModelDownloader dependency is currently disabled
-  # When re-enabled, use: firebase_dependency(s, firebase_sdk_version,
-  #   ['FirebaseMLModelDownloader'], 'Firebase/MLModelDownloader')
-  # s.dependency          'Firebase/MLModelDownloader', firebase_sdk_version
+  # NOTE: Firebase/MLModelDownloader dependency is currently disabled.
+  # When re-enabled, use:
+  #   firebase_dependency(s, firebase_sdk_version,
+  #     ['FirebaseMLModelDownloader'], 'Firebase/MLModelDownloader')
 
   if defined?($RNFirebaseAsStaticFramework)
     Pod::UI.puts "#{s.name}: Using overridden static_framework value of '#{$RNFirebaseAsStaticFramework}'"
     s.static_framework = $RNFirebaseAsStaticFramework
   else
-    # raise "#{s.name}: Underlying Firebase/MLModelDownloader requires $RNFirebaseAsStaticFrameworks = true and !use_frameworks in your Podfile"
     s.static_framework = false
   end
 end
