Merge pull request #447 from splendo/feature/fix-gcm-sender0id

Fix passing GCMSenderId to FirebaseOptions on Android/iOS
GitLiveApp · Apr 1, 2024 · 7a49f42 · 7a49f42
2 parents a2f103d + e316f61
commit 7a49f42
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/firebase-app/src/androidMain/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/androidMain/kotlin/dev/gitlive/firebase/firebase.kt
@@ -29,11 +29,11 @@ actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: St
 actual fun Firebase.initialize(context: Any?, options: FirebaseOptions) =
     FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid()))
 
-actual class FirebaseApp internal constructor(val android: com.google.firebase.FirebaseApp) {
+actual data class FirebaseApp internal constructor(val android: com.google.firebase.FirebaseApp) {
     actual val name: String
         get() = android.name
     actual val options: FirebaseOptions
-        get() = android.options.run { FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId) }
+        get() = android.options.run { FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId, gcmSenderId) }
 
     actual suspend fun delete() {
         android.delete()
@@ -51,4 +51,4 @@ private fun FirebaseOptions.toAndroid() = com.google.firebase.FirebaseOptions.Bu
     .setStorageBucket(storageBucket)
     .setProjectId(projectId)
     .setGcmSenderId(gcmSenderId)
-    .build()
+    .build()
diff --git a/firebase-app/src/iosMain/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/iosMain/kotlin/dev/gitlive/firebase/firebase.kt
@@ -27,11 +27,11 @@ actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: St
 actual fun Firebase.initialize(context: Any?, options: FirebaseOptions) =
     FIRApp.configureWithOptions(options.toIos()).let { app }
 
-actual class FirebaseApp internal constructor(val ios: FIRApp) {
+actual data class FirebaseApp internal constructor(val ios: FIRApp) {
     actual val name: String
         get() = ios.name
     actual val options: FirebaseOptions
-        get() = ios.options.run { FirebaseOptions(bundleID, APIKey!!, databaseURL!!, trackingID, storageBucket, projectID) }
+        get() = ios.options.run { FirebaseOptions(bundleID, APIKey!!, databaseURL!!, trackingID, storageBucket, projectID, GCMSenderID) }
 
     actual suspend fun delete() {
         val deleted = CompletableDeferred<Unit>()

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

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

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

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