add ktx syntax and publishing config

Author: Bas Buijsen

.github/workflows/publish.yml

@@ -28,6 +28,8 @@ jobs:
         run: ./gradlew :updateVersions
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+      - name: Publish Firebase Analytics
+        run: ./gradlew :firebase-analytics:publish
       - name: Publish Firebase App
         run: ./gradlew :firebase-app:publish
       - name: Publish Firebase Auth

build.gradle.kts

@@ -36,6 +36,7 @@ val minSdkVersion by extra(23)
 tasks {
     register("updateVersions") {
         dependsOn(
+            "firebase-analytics:updateVersion", "firebase-analytics:updateDependencyVersion",
             "firebase-app:updateVersion", "firebase-app:updateDependencyVersion",
             "firebase-auth:updateVersion", "firebase-auth:updateDependencyVersion",
             "firebase-common:updateVersion", "firebase-common:updateDependencyVersion",

firebase-analytics/src/androidMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -9,8 +9,8 @@ actual val Firebase.analytics: FirebaseAnalytics
     get() = FirebaseAnalytics(com.google.firebase.Firebase.analytics)
 
 actual class FirebaseAnalytics(val android: com.google.firebase.analytics.FirebaseAnalytics) {
-    actual fun logEvent(name: String, parameters: Map<String, String>) {
-        android.logEvent(name, parameters.toBundle())
+    actual fun logEvent(name: String, parameters: Map<String, String>?) {
+        android.logEvent(name, parameters?.toBundle())
     }
     actual fun logEvent(name: String, block: FirebaseAnalyticsParameters.() -> Unit) {
         val params = FirebaseAnalyticsParameters()

firebase-analytics/src/commonMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -5,7 +5,7 @@ import dev.gitlive.firebase.Firebase
 expect val Firebase.analytics: FirebaseAnalytics
 
 expect class FirebaseAnalytics {
-    fun logEvent(name: String, parameters: Map<String, String>)
+    fun logEvent(name: String, parameters: Map<String, String>? = null)
     fun logEvent(name: String, block: FirebaseAnalyticsParameters.() -> Unit)
     fun setUserProperty(name: String, value: String)
     fun setUserId(id: String)

firebase-analytics/src/commonTest/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -8,7 +8,11 @@ import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
 import dev.gitlive.firebase.initialize
+import dev.gitlive.firebase.runBlockingTest
+import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertNotNull
 
 expect val emulatorHost: String
 expect val context: Any
@@ -35,4 +39,21 @@ class FirebaseAnalyticsTest {
 
         analytics = Firebase.analytics
     }
+
+    @AfterTest
+    fun deinitializeFirebase() = runBlockingTest {
+        Firebase.apps(context).forEach {
+            it.delete()
+        }
+    }
+
+    @Test
+    fun testAnalyticsShouldNotCrash() {
+        assertNotNull(analytics)
+
+        // This should not crash, otherwise the test will fail
+        analytics.logEvent("test") {
+            param("key", "value")
+        }
+    }
 }

firebase-analytics/src/iosMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -11,10 +11,10 @@ actual val Firebase.analytics: FirebaseAnalytics
     get() = FirebaseAnalytics(FIRAnalytics)
 
 actual class FirebaseAnalytics(val ios: FIRAnalytics.Companion) {
-    actual fun logEvent(name: String, parameters: Map<String, String>) {
-        val mappedParameters: Map<Any?, String> = parameters.map {
+    actual fun logEvent(name: String, parameters: Map<String, String>?) {
+        val mappedParameters: Map<Any?, String>? = parameters?.map {
             it.key to it.value
-        }.toMap()
+        }?.toMap()
         ios.logEventWithName(name, mappedParameters)
     }
     actual fun logEvent(name: String, block: FirebaseAnalyticsParameters.() -> Unit) {

firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -19,7 +19,7 @@ actual val Firebase.analytics: FirebaseAnalytics
 actual class FirebaseAnalytics(val js: dev.gitlive.firebase.analytics.externals.FirebaseAnalytics) {
     actual fun logEvent(
         name: String,
-        parameters: Map<String, String>
+        parameters: Map<String, String>?
     ) {
         jsLogEvent(js, name, parameters)
     }

firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/externals/analytics.kt

@@ -6,7 +6,7 @@ import kotlin.js.Promise
 
 external fun getAnalytics(app: FirebaseApp? = definedExternally): FirebaseAnalytics
 
-external fun jsLogEvent(app: FirebaseAnalytics, name: String, parameters: Map<String, String>)
+external fun jsLogEvent(app: FirebaseAnalytics, name: String, parameters: Map<String, String>?)
 external fun jsSetUserProperty(app: FirebaseAnalytics, name: String, value: String)
 external fun jsSetUserId(app: FirebaseAnalytics, id: String)
 external fun jsResetAnalyticsData(app: FirebaseAnalytics)

firebase-analytics/src/jvmMain/kotlin/dev/gitlive/firebase/analytics/analytics.jvm.kt

@@ -7,7 +7,7 @@ actual val Firebase.analytics: FirebaseAnalytics
     get() = TODO("Not yet implemented")
 
 actual class FirebaseAnalytics {
-    actual fun logEvent(name: String, parameters: Map<String, String>) {}
+    actual fun logEvent(name: String, parameters: Map<String, String>?) {}
     actual fun logEvent(name: String, block: FirebaseAnalyticsParameters.() -> Unit) {}
     actual fun setUserProperty(name: String, value: String) {}
     actual fun setUserId(id: String) {}