Minor fixes

splendo · Nov 20, 2023 · 51e201b · 51e201b
1 parent 897d9b5
commit 51e201b
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 27 deletions.
diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-app",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-app.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-common": "1.10.4",
+    "@gitlive/firebase-common": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"

diff --git a/firebase-auth/package.json b/firebase-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-auth",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-auth.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"

diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-common",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-common.js",
   "scripts": {

diff --git a/firebase-config/package.json b/firebase-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-config",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-config.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"

diff --git a/firebase-crashlytics/package.json b/firebase-crashlytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-crashlytics",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-crashlytics.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.6.10",
     "kotlinx-coroutines-core": "1.6.1-native-mt"

diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-database",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-database.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"

diff --git 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")
+            }
         }
     }
 

diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-firestore",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-firestore.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"

diff --git a/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/FieldValue.kt b/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/FieldValue.kt
@@ -1,6 +1,6 @@
 package dev.gitlive.firebase.firestore
 
-import cocoapods.FirebaseFirestore.FIRFieldValue
+import cocoapods.FirebaseFirestoreInternal.FIRFieldValue
 import kotlinx.serialization.Serializable
 
 /** A class representing a platform specific Firebase FieldValue. */

diff --git a/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/_encoders.kt b/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/_encoders.kt
@@ -1,6 +1,6 @@
 package dev.gitlive.firebase.firestore
 
-import cocoapods.FirebaseFirestore.FIRFieldValue
+import cocoapods.FirebaseFirestoreInternal.FIRFieldValue
 
 @PublishedApi
 internal actual fun isSpecialValue(value: Any) = when(value) {

diff --git a/firebase-functions/package.json b/firebase-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-functions",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-functions.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"

diff --git a/firebase-installations/package.json b/firebase-installations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-installations",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-installations.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"

diff --git a/firebase-perf/package.json b/firebase-perf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-perf",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-perf.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.6.10",
     "kotlinx-coroutines-core": "1.6.1-native-mt"

diff --git a/firebase-storage/package.json b/firebase-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-storage",
-  "version": "1.10.4",
+  "version": "1.10.4-SNAPSHOT",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-storage.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-app": "1.10.4",
+    "@gitlive/firebase-app": "1.10.4-SNAPSHOT",
     "firebase": "9.19.1",
     "kotlin": "1.6.10",
     "kotlinx-coroutines-core": "1.6.1-native-mt"