@react-native-firebase/app 21.8.0 → 21.9.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [21.9.0](https://github.com/invertase/react-native-firebase/compare/v21.8.0...v21.9.0) (2025-02-11)
+
+### Features
+
+- **app, expo:** support rn77 AppDelegate.swift in config plugin ([#8324](https://github.com/invertase/react-native-firebase/issues/8324)) ([6a7867c](https://github.com/invertase/react-native-firebase/commit/6a7867c9366b851a6de62cc37b7834090caad98b))
+
+### Bug Fixes
+
+- firebase-ios-sdk 11.8.0 / firebase-android-sdk 33.9.0 ([67aba08](https://github.com/invertase/react-native-firebase/commit/67aba08c00aa46b72fcb1353bd428fa552b6686a))
+
 ## [21.8.0](https://github.com/invertase/react-native-firebase/compare/v21.7.4...v21.8.0) (2025-02-10)
 
 ### Bug Fixes

package/android/src/reactnative/java/io/invertase/firebase/app/ReactNativeFirebaseVersion.java

@@ -18,5 +18,5 @@ package io.invertase.firebase.app;
  */
 // generated file - do not modify or commit
 public class ReactNativeFirebaseVersion {
-  public static String VERSION = "21.8.0";
+  public static String VERSION = "21.9.0";
 }

package/ios/RNFBApp/RNFBVersion.m

@@ -18,4 +18,4 @@
 #import <React/RCTVersion.h>
 
 // generated file - do not modify or commit
-NSString* const RNFBVersionString = @"21.8.0";
+NSString* const RNFBVersionString = @"21.9.0";

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '21.8.0';
+module.exports = '21.9.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/app",
-  "version": "21.8.0",
+  "version": "21.9.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Admob, Analytics, Auth, Crash Reporting, Cloud Firestore, Database, Dynamic Links, Functions, Messaging (FCM), Remote Config, Storage and more.",
   "main": "lib/index.js",
@@ -57,11 +57,11 @@
     "react-native": "*"
   },
   "dependencies": {
-    "firebase": "11.2.0"
+    "firebase": "11.3.0"
   },
   "devDependencies": {
     "@react-native-async-storage/async-storage": "^2.1.1",
-    "expo": "^52.0.30"
+    "expo": "^52.0.32"
   },
   "peerDependenciesMeta": {
     "expo": {
@@ -73,7 +73,7 @@
   },
   "sdkVersions": {
     "ios": {
-      "firebase": "11.7.0",
+      "firebase": "11.8.0",
       "iosTarget": "13.0",
       "macosTarget": "10.15",
       "tvosTarget": "13.0"
@@ -82,13 +82,13 @@
       "minSdk": 21,
       "targetSdk": 34,
       "compileSdk": 34,
-      "firebase": "33.8.0",
-      "firebaseCrashlyticsGradle": "3.0.2",
+      "firebase": "33.9.0",
+      "firebaseCrashlyticsGradle": "3.0.3",
       "firebasePerfGradle": "1.4.2",
       "gmsGoogleServicesGradle": "4.4.2",
       "playServicesAuth": "21.3.0",
-      "firebaseAppDistributionGradle": "5.1.0"
+      "firebaseAppDistributionGradle": "5.1.1"
     }
   },
-  "gitHead": "14ebd5c2d2e0f284397c331f909e533c47f2ec62"
+  "gitHead": "306d9c766ff5614fff6404be5c3dd4bcdb450754"
 }

package/plugin/build/ios/appDelegate.d.ts

@@ -1,5 +1,6 @@
 import { ConfigPlugin } from '@expo/config-plugins';
 import { AppDelegateProjectFile } from '@expo/config-plugins/build/ios/Paths';
 export declare function modifyObjcAppDelegate(contents: string): string;
+export declare function modifySwiftAppDelegate(contents: string): string;
 export declare function modifyAppDelegateAsync(appDelegateFileInfo: AppDelegateProjectFile): Promise<void>;
 export declare const withFirebaseAppDelegate: ConfigPlugin;

package/plugin/build/ios/appDelegate.js

@@ -5,17 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withFirebaseAppDelegate = void 0;
 exports.modifyObjcAppDelegate = modifyObjcAppDelegate;
+exports.modifySwiftAppDelegate = modifySwiftAppDelegate;
 exports.modifyAppDelegateAsync = modifyAppDelegateAsync;
 const config_plugins_1 = require("@expo/config-plugins");
 const generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
 const fs_1 = __importDefault(require("fs"));
-const methodInvocationBlock = `[FIRApp configure];`;
-// https://regex101.com/r/mPgaq6/1
-const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
-// https://regex101.com/r/nHrTa9/1/
-// if the above regex fails, we can use this one as a fallback:
-const fallbackInvocationLineMatcher = /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
 function modifyObjcAppDelegate(contents) {
+    const methodInvocationBlock = `[FIRApp configure];`;
+    // https://regex101.com/r/mPgaq6/1
+    const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
+    // https://regex101.com/r/nHrTa9/1/
+    // if the above regex fails, we can use this one as a fallback:
+    const fallbackInvocationLineMatcher = /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
     // Add import
     if (!contents.includes('#import <Firebase/Firebase.h>')) {
         contents = contents.replace(/#import "AppDelegate.h"/g, `#import "AppDelegate.h"
@@ -58,16 +59,49 @@ function modifyObjcAppDelegate(contents) {
         }).contents;
     }
 }
+function modifySwiftAppDelegate(contents) {
+    const methodInvocationBlock = `FirebaseApp.configure()`;
+    const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*"([^"]*)")/g;
+    // Add import
+    if (!contents.includes('import FirebaseCore')) {
+        contents = contents.replace(/import ReactAppDependencyProvider/g, `import ReactAppDependencyProvider
+import FirebaseCore`);
+    }
+    // To avoid potential issues with existing changes from older plugin versions
+    if (contents.includes(methodInvocationBlock)) {
+        return contents;
+    }
+    if (!methodInvocationLineMatcher.test(contents)) {
+        config_plugins_1.WarningAggregator.addWarningIOS('@react-native-firebase/app', 'Unable to determine correct Firebase insertion point in AppDelegate.swift. Skipping Firebase addition.');
+        return contents;
+    }
+    // Add invocation
+    return (0, generateCode_1.mergeContents)({
+        tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
+        src: contents,
+        newSrc: methodInvocationBlock,
+        anchor: methodInvocationLineMatcher,
+        offset: 0, // new line will be inserted right above matched anchor
+        comment: '//',
+    }).contents;
+}
 async function modifyAppDelegateAsync(appDelegateFileInfo) {
     const { language, path, contents } = appDelegateFileInfo;
-    if (['objc', 'objcpp'].includes(language)) {
-        const newContents = modifyObjcAppDelegate(contents);
-        await fs_1.default.promises.writeFile(path, newContents);
-    }
-    else {
-        // TODO: Support Swift
-        throw new Error(`Cannot add Firebase code to AppDelegate of language "${language}"`);
+    let newContents = contents;
+    switch (language) {
+        case 'objc':
+        case 'objcpp': {
+            newContents = modifyObjcAppDelegate(contents);
+            break;
+        }
+        case 'swift': {
+            newContents = modifySwiftAppDelegate(contents);
+            break;
+        }
+        default:
+            throw new Error(`Cannot add Firebase code to AppDelegate of language "${language}"`);
     }
+    await fs_1.default.promises.writeFile(path, newContents);
 }
 const withFirebaseAppDelegate = config => {
     return (0, config_plugins_1.withDangerousMod)(config, [

package/plugin/src/ios/appDelegate.ts

@@ -3,17 +3,17 @@ import { AppDelegateProjectFile } from '@expo/config-plugins/build/ios/Paths';
 import { mergeContents } from '@expo/config-plugins/build/utils/generateCode';
 import fs from 'fs';
 
-const methodInvocationBlock = `[FIRApp configure];`;
-// https://regex101.com/r/mPgaq6/1
-const methodInvocationLineMatcher =
-  /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
+export function modifyObjcAppDelegate(contents: string): string {
+  const methodInvocationBlock = `[FIRApp configure];`;
+  // https://regex101.com/r/mPgaq6/1
+  const methodInvocationLineMatcher =
+    /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
 
-// https://regex101.com/r/nHrTa9/1/
-// if the above regex fails, we can use this one as a fallback:
-const fallbackInvocationLineMatcher =
-  /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
+  // https://regex101.com/r/nHrTa9/1/
+  // if the above regex fails, we can use this one as a fallback:
+  const fallbackInvocationLineMatcher =
+    /-\s*\(BOOL\)\s*application:\s*\(UIApplication\s*\*\s*\)\s*\w+\s+didFinishLaunchingWithOptions:/g;
 
-export function modifyObjcAppDelegate(contents: string): string {
   // Add import
   if (!contents.includes('#import <Firebase/Firebase.h>')) {
     contents = contents.replace(
@@ -68,16 +68,63 @@ export function modifyObjcAppDelegate(contents: string): string {
   }
 }
 
+export function modifySwiftAppDelegate(contents: string): string {
+  const methodInvocationBlock = `FirebaseApp.configure()`;
+  const methodInvocationLineMatcher = /(?:self\.moduleName\s*=\s*"([^"]*)")/g;
+
+  // Add import
+  if (!contents.includes('import FirebaseCore')) {
+    contents = contents.replace(
+      /import ReactAppDependencyProvider/g,
+      `import ReactAppDependencyProvider
+import FirebaseCore`,
+    );
+  }
+
+  // To avoid potential issues with existing changes from older plugin versions
+  if (contents.includes(methodInvocationBlock)) {
+    return contents;
+  }
+
+  if (!methodInvocationLineMatcher.test(contents)) {
+    WarningAggregator.addWarningIOS(
+      '@react-native-firebase/app',
+      'Unable to determine correct Firebase insertion point in AppDelegate.swift. Skipping Firebase addition.',
+    );
+    return contents;
+  }
+
+  // Add invocation
+  return mergeContents({
+    tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
+    src: contents,
+    newSrc: methodInvocationBlock,
+    anchor: methodInvocationLineMatcher,
+    offset: 0, // new line will be inserted right above matched anchor
+    comment: '//',
+  }).contents;
+}
+
 export async function modifyAppDelegateAsync(appDelegateFileInfo: AppDelegateProjectFile) {
   const { language, path, contents } = appDelegateFileInfo;
 
-  if (['objc', 'objcpp'].includes(language)) {
-    const newContents = modifyObjcAppDelegate(contents);
-    await fs.promises.writeFile(path, newContents);
-  } else {
-    // TODO: Support Swift
-    throw new Error(`Cannot add Firebase code to AppDelegate of language "${language}"`);
+  let newContents = contents;
+
+  switch (language) {
+    case 'objc':
+    case 'objcpp': {
+      newContents = modifyObjcAppDelegate(contents);
+      break;
+    }
+    case 'swift': {
+      newContents = modifySwiftAppDelegate(contents);
+      break;
+    }
+    default:
+      throw new Error(`Cannot add Firebase code to AppDelegate of language "${language}"`);
   }
+
+  await fs.promises.writeFile(path, newContents);
 }
 
 export const withFirebaseAppDelegate: ConfigPlugin = config => {

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/index.ts","./src/android/applyPlugin.ts","./src/android/buildscriptDependency.ts","./src/android/constants.ts","./src/android/copyGoogleServices.ts","./src/android/index.ts","./src/ios/appDelegate.ts","./src/ios/googleServicesPlist.ts","./src/ios/index.ts"],"version":"5.7.3"}
+{"root":["./src/index.ts","./src/android/applyplugin.ts","./src/android/buildscriptdependency.ts","./src/android/constants.ts","./src/android/copygoogleservices.ts","./src/android/index.ts","./src/ios/appdelegate.ts","./src/ios/googleservicesplist.ts","./src/ios/index.ts"],"version":"5.7.3"}