From 299ab6618249f1e62be48cdf3a944ddb59b3d6cd Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 20 Nov 2023 10:58:52 +0100
Subject: [PATCH] Explicit linking to prevent some issues

---
 firebase-firestore/build.gradle.kts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
index 79c5b3788..64e0c5ea3 100644
--- a/firebase-firestore/build.gradle.kts
+++ b/firebase-firestore/build.gradle.kts
@@ -92,15 +92,16 @@ kotlin {
                 baseName = "FirebaseFirestore"
             }
             noPodspec()
-            pod("FirebaseFirestore") {
-                version = "10.17.0"
-                extraOpts += listOf("-compiler-option", "-fmodules")
-            }
             // As of Firebase 10.17 Firestore has moved all ObjC headers to FirebaseFirestoreInternal and the kotlin cocoapods plugin does not handle this well
             // Adding it manually seems to resolve the issue
             pod("FirebaseFirestoreInternal") {
                 version = "10.17.0"
             }
+            pod("FirebaseFirestore") {
+                version = "10.17.0"
+                extraOpts += listOf("-compiler-option", "-fmodules")
+                useInteropBindingFrom("FirebaseFirestoreInternal")
+            }
         }
     }