Skip to content

Commit ef4fdab

Browse files
author
Bas Buijsen
committed
fix js build
1 parent 44bcd46 commit ef4fdab

File tree

8 files changed

+32
-1
lines changed

8 files changed

+32
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@ import android.util.SizeF
99
import com.google.firebase.analytics.analytics
1010
import com.google.firebase.analytics.setConsent
1111
import dev.gitlive.firebase.Firebase
12+
import dev.gitlive.firebase.FirebaseApp
1213
import kotlinx.coroutines.tasks.await
1314
import java.io.Serializable
1415

1516
actual val Firebase.analytics: FirebaseAnalytics
1617
get() = FirebaseAnalytics(com.google.firebase.Firebase.analytics)
1718

19+
actual fun Firebase.analytics(app: FirebaseApp) =
20+
FirebaseAnalytics(com.google.firebase.Firebase.analytics)
21+
1822
actual class FirebaseAnalytics(val android: com.google.firebase.analytics.FirebaseAnalytics) {
1923
actual fun logEvent(name: String, parameters: Map<String, Any>?) {
2024
android.logEvent(name, parameters?.toBundle())

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package dev.gitlive.firebase.analytics
22

33
import dev.gitlive.firebase.Firebase
4+
import dev.gitlive.firebase.FirebaseApp
45

56
expect val Firebase.analytics: FirebaseAnalytics
67

8+
/** Returns the [FirebaseStorage] instance of a given [FirebaseApp]. */
9+
expect fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics
10+
711
expect class FirebaseAnalytics {
812
fun logEvent(name: String, parameters: Map<String, Any>? = null)
913
fun setUserProperty(name: String, value: String)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class FirebaseAnalyticsTest {
3737
)
3838
)
3939

40-
analytics = Firebase.analytics
40+
analytics = Firebase.analytics(app)
4141
}
4242

4343
@AfterTest

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package dev.gitlive.firebase.analytics
33
import cocoapods.FirebaseAnalytics.FIRAnalytics
44
import cocoapods.FirebaseAnalytics.setConsent
55
import dev.gitlive.firebase.Firebase
6+
import dev.gitlive.firebase.FirebaseApp
67
import dev.gitlive.firebase.FirebaseException
78
import kotlinx.coroutines.CompletableDeferred
89
import platform.Foundation.NSError
@@ -11,6 +12,8 @@ import platform.Foundation.NSTimeInterval
1112
actual val Firebase.analytics: FirebaseAnalytics
1213
get() = FirebaseAnalytics(FIRAnalytics)
1314

15+
actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics = FirebaseAnalytics(FIRAnalytics)
16+
1417
actual class FirebaseAnalytics(val ios: FIRAnalytics.Companion) {
1518
actual fun logEvent(name: String, parameters: Map<String, Any>?) {
1619
val mappedParameters: Map<Any?, Any>? = parameters?.map { it.key to it.value }?.toMap()

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
package dev.gitlive.firebase.analytics
22

33
import dev.gitlive.firebase.Firebase
4+
import dev.gitlive.firebase.FirebaseApp
45
import dev.gitlive.firebase.FirebaseException
56
import dev.gitlive.firebase.analytics.externals.getAnalytics
67
import kotlinx.coroutines.await
78

89
actual val Firebase.analytics: FirebaseAnalytics
910
get() = FirebaseAnalytics(getAnalytics())
1011

12+
actual fun Firebase.analytics(app: FirebaseApp) =
13+
FirebaseAnalytics(getAnalytics(app.js))
14+
1115
actual class FirebaseAnalytics(val js: dev.gitlive.firebase.analytics.externals.FirebaseAnalytics) {
1216
actual fun logEvent(
1317
name: String,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@file:JsModule("firebase/analytics")
2+
@file:JsNonModule
3+
14
package dev.gitlive.firebase.analytics.externals
25

36
import dev.gitlive.firebase.externals.FirebaseApp
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package dev.gitlive.firebase.analytics
2+
3+
actual val emulatorHost: String = "10.0.2.2"
4+
5+
actual val context: Any = Unit
6+
7+
@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
8+
actual annotation class IgnoreForAndroidUnitTest

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
package dev.gitlive.firebase.analytics
22

33
import dev.gitlive.firebase.Firebase
4+
import dev.gitlive.firebase.FirebaseApp
45
import dev.gitlive.firebase.FirebaseException
56

67
actual val Firebase.analytics: FirebaseAnalytics
78
get() = TODO("Not yet implemented")
89

10+
actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics {
11+
TODO("Not yetimplemented")
12+
}
13+
914
actual class FirebaseAnalytics {
1015
actual fun setUserProperty(name: String, value: String) {}
1116
actual fun setUserId(id: String) {}

0 commit comments

Comments
 (0)