From 73f3b69c9df3588c25f6f323a700f4d8676be81f Mon Sep 17 00:00:00 2001
From: Saurabh Chavan <saurabh.chavan@mendix.com>
Date: Wed, 14 Oct 2026 15:39:49 +0530
Subject: [PATCH 1/2] fix: update the firebase BOM and versions

---
 .mx/known_dependencies.json | 6 +++---
 android/build.gradle        | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.mx/known_dependencies.json b/.mx/known_dependencies.json
index ea74c9c72..6be9983b8 100644
--- a/.mx/known_dependencies.json
+++ b/.mx/known_dependencies.json
@@ -1,7 +1,7 @@
 {
-    "@react-native-firebase/app": "20.1.0",
-    "@react-native-firebase/messaging": "20.1.0",
-    "@react-native-firebase/crashlytics": "20.1.0",
+    "@react-native-firebase/app": "21.14.0",
+    "@react-native-firebase/messaging": "21.14.0",
+    "@react-native-firebase/crashlytics": "21.14.0",
     "react-native-notify-kit": "10.4.7",
     "react-native-maps": "1.20.1"
 }
diff --git a/android/build.gradle b/android/build.gradle
index e08132800..39843172b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -44,13 +44,10 @@ buildscript {
 project.ext {
     set('react-native', [
             versions: [
-                // Override Firebase BOM version to avoid updating to react-native-firebase 20.2.0+,
-                // which adds many new node_modules increasing the size significantly.
-                // Affected dependencies include the entire react-native-firebase suite e.g.:
-                // @react-native-firebase/app, @react-native-firebase/analytics, @react-native-firebase/crashlytics, @react-native-firebase/messaging
-                // NOTE: If updating to react-native-firebase 20.2.0+ is done, this override should be removed.
+                // Firebase BOM used by react-native-firebase and android/app/build.gradle (firebaseBomVersion).
+                // Keep in sync with sdkVersions.android.firebase of the @react-native-firebase/app version in .mx/known_dependencies.json.
                     firebase: [
-                            bom: "33.1.1"
+                            bom: "33.12.0"
                     ],
             ],
     ])

From 7220185ef20a48d2d5db0bccb11e9332059d563f Mon Sep 17 00:00:00 2001
From: Saurabh Chavan <saurabh.chavan@mendix.com>
Date: Wed, 14 Oct 2026 17:31:23 +0530
Subject: [PATCH 2/2] fix: changelog updated

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 432c7c4cb..ff8b98295 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - We fixed an issue on iOS where a deep link that cold started the app was not delivered to React Native, causing `Linking.getInitialURL()` to return `null`.
 - We removed some unused Android Permissions coming in from Manifest mergers.
+- We updated react-native-firebase (`@react-native-firebase/app`, `@react-native-firebase/messaging` and `@react-native-firebase/crashlytics`) from v20.1.0 to v21.14.0, which uses Firebase iOS SDK v11.11.0. This resolves a CocoaPods dependency conflict with react-native-vision-camera-barcode-scanner v5 (GoogleMLKit v9.0.0) on iOS.
+- We updated the Android Firebase BoM from v33.1.1 to v33.12.0 to match react-native-firebase v21.14.0.
 
 ## [19.1.6] - 2026-09-16