Merge pull request #455 from GitLiveApp/upgrade-firebase-java-sdk

upgrade firebase-java-sdk to 0.3.1
GitLiveApp · Jan 4, 2024 · 9ec79c3 · 9ec79c3
2 parents 95f4403 + eb23066
commit 9ec79c3
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 615 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -117,7 +117,7 @@ subprojects {
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
             if (this@afterEvaluate.name != "firebase-crashlytics") {
-                "jvmMainApi"("dev.gitlive:firebase-java-sdk:0.1.2")
+                "jvmMainApi"("dev.gitlive:firebase-java-sdk:0.3.0")
                 "jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion") {
                     exclude("com.google.android.gms")
                 }

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.11.0",
   "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.11.0",
     "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.11.0",
   "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.11.0",
     "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.11.0",
   "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.11.0",
   "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.11.0",
     "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.11.4",
   "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.11.0",
     "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.11.0",
   "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.11.0",
     "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
@@ -171,6 +171,11 @@ kotlin {
                 api("com.google.firebase:firebase-firestore")
             }
         }
+
+        getByName("jvmMain") {
+            kotlin.srcDir("src/androidMain/kotlin")
+        }
+
     }
 }
 

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.11.0",
   "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.11.0",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"

diff --git a/firebase-firestore/src/jvmMain/kotlin/dev/gitlive/firebase/firestore/GeoPoint.kt b/firebase-firestore/src/jvmMain/kotlin/dev/gitlive/firebase/firestore/GeoPoint.kt
diff --git a/firebase-firestore/src/jvmMain/kotlin/dev/gitlive/firebase/firestore/Timestamp.kt b/firebase-firestore/src/jvmMain/kotlin/dev/gitlive/firebase/firestore/Timestamp.kt
-Original file line number
+Diff line change
@@ Expand Up / @@ -171,6 +171,11 @@ kotlin { @@
                     api("com.google.firebase:firebase-firestore")
                 }
             }
+            getByName("jvmMain") {
+                kotlin.srcDir("src/androidMain/kotlin")
+            }
         }
     }
@@ Expand Down @@