Skip to content

Commit 541ea99

Browse files
committed
Move externals to related modules
1 parent 117ac63 commit 541ea99

File tree

24 files changed

+93
-90
lines changed

24 files changed

+93
-90
lines changed

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/app/app.kt renamed to firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/externals/app.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@file:JsModule("firebase/app")
22
@file:JsNonModule
33

4-
package dev.gitlive.firebase.externals.app
4+
package dev.gitlive.firebase.externals
55

66
import kotlin.js.Promise
77

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
package dev.gitlive.firebase
66

7-
import dev.gitlive.firebase.externals.app.deleteApp
8-
import dev.gitlive.firebase.externals.app.getApp
9-
import dev.gitlive.firebase.externals.app.getApps
10-
import dev.gitlive.firebase.externals.app.initializeApp
7+
import dev.gitlive.firebase.externals.deleteApp
8+
import dev.gitlive.firebase.externals.getApp
9+
import dev.gitlive.firebase.externals.getApps
10+
import dev.gitlive.firebase.externals.initializeApp
1111
import kotlin.js.json
12-
import dev.gitlive.firebase.externals.app.FirebaseApp as JsFirebaseApp
12+
import dev.gitlive.firebase.externals.FirebaseApp as JsFirebaseApp
1313

1414
actual val Firebase.app: FirebaseApp
1515
get() = FirebaseApp(getApp())

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ package dev.gitlive.firebase.auth
66

77
import dev.gitlive.firebase.*
88
import dev.gitlive.firebase.FirebaseApp
9-
import dev.gitlive.firebase.externals.auth.*
9+
import dev.gitlive.firebase.auth.externals.*
1010
import kotlinx.coroutines.await
1111
import kotlinx.coroutines.channels.awaitClose
1212
import kotlinx.coroutines.flow.callbackFlow
1313
import kotlin.js.json
14-
import dev.gitlive.firebase.externals.auth.AuthResult as JsAuthResult
14+
import dev.gitlive.firebase.auth.externals.AuthResult as JsAuthResult
1515

1616
actual val Firebase.auth
1717
get() = rethrow { FirebaseAuth(getAuth()) }

firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/credentials.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package dev.gitlive.firebase.auth
22

3-
import dev.gitlive.firebase.externals.auth.*
4-
import dev.gitlive.firebase.externals.auth.EmailAuthProvider
5-
import dev.gitlive.firebase.externals.auth.FacebookAuthProvider
6-
import dev.gitlive.firebase.externals.auth.GithubAuthProvider
7-
import dev.gitlive.firebase.externals.auth.GoogleAuthProvider
8-
import dev.gitlive.firebase.externals.auth.PhoneAuthProvider
9-
import dev.gitlive.firebase.externals.auth.TwitterAuthProvider
3+
import dev.gitlive.firebase.auth.externals.ApplicationVerifier
4+
import dev.gitlive.firebase.auth.externals.EmailAuthProvider
5+
import dev.gitlive.firebase.auth.externals.FacebookAuthProvider
6+
import dev.gitlive.firebase.auth.externals.GithubAuthProvider
7+
import dev.gitlive.firebase.auth.externals.GoogleAuthProvider
8+
import dev.gitlive.firebase.auth.externals.PhoneAuthProvider
9+
import dev.gitlive.firebase.auth.externals.TwitterAuthProvider
1010
import kotlinx.coroutines.await
1111
import kotlin.js.json
12-
import dev.gitlive.firebase.externals.auth.AuthCredential as JsAuthCredential
13-
import dev.gitlive.firebase.externals.auth.OAuthProvider as JsOAuthProvider
12+
import dev.gitlive.firebase.auth.externals.AuthCredential as JsAuthCredential
13+
import dev.gitlive.firebase.auth.externals.OAuthProvider as JsOAuthProvider
1414

1515
actual open class AuthCredential(val js: JsAuthCredential) {
1616
actual val providerId: String

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/auth/auth.kt renamed to firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/externals/auth.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@file:JsModule("firebase/auth")
22
@file:JsNonModule
33

4-
package dev.gitlive.firebase.externals.auth
4+
package dev.gitlive.firebase.auth.externals
55

66
import dev.gitlive.firebase.Unsubscribe
7-
import dev.gitlive.firebase.externals.app.FirebaseApp
7+
import dev.gitlive.firebase.externals.FirebaseApp
88
import kotlin.js.Json
99
import kotlin.js.Promise
1010

firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/multifactor.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package dev.gitlive.firebase.auth
22

3-
import dev.gitlive.firebase.externals.auth.MultiFactorUser
3+
import dev.gitlive.firebase.auth.externals.MultiFactorUser
44
import kotlinx.coroutines.await
55
import kotlin.js.Date
6-
import dev.gitlive.firebase.externals.auth.MultiFactorAssertion as JsMultiFactorAssertion
7-
import dev.gitlive.firebase.externals.auth.MultiFactorInfo as JsMultiFactorInfo
8-
import dev.gitlive.firebase.externals.auth.MultiFactorResolver as JsMultiFactorResolver
9-
import dev.gitlive.firebase.externals.auth.MultiFactorSession as JsMultiFactorSession
6+
import dev.gitlive.firebase.auth.externals.MultiFactorAssertion as JsMultiFactorAssertion
7+
import dev.gitlive.firebase.auth.externals.MultiFactorInfo as JsMultiFactorInfo
8+
import dev.gitlive.firebase.auth.externals.MultiFactorResolver as JsMultiFactorResolver
9+
import dev.gitlive.firebase.auth.externals.MultiFactorSession as JsMultiFactorSession
1010

1111
actual class MultiFactor(val js: MultiFactorUser) {
1212
actual val enrolledFactors: List<MultiFactorInfo>

firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/user.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package dev.gitlive.firebase.auth
22

3-
import dev.gitlive.firebase.externals.auth.*
3+
import dev.gitlive.firebase.auth.externals.*
44
import kotlinx.coroutines.await
55
import kotlin.js.Date
6-
import dev.gitlive.firebase.externals.auth.UserInfo as JsUserInfo
6+
import dev.gitlive.firebase.auth.externals.UserInfo as JsUserInfo
77

88
actual class FirebaseUser internal constructor(val js: User) {
99
actual val uid: String

firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dev.gitlive.firebase.remoteconfig
33
import dev.gitlive.firebase.Firebase
44
import dev.gitlive.firebase.FirebaseApp
55
import dev.gitlive.firebase.FirebaseException
6-
import dev.gitlive.firebase.externals.remoteconfig.*
6+
import dev.gitlive.firebase.remoteconfig.externals.*
77
import kotlinx.coroutines.await
88
import kotlin.js.json
99

firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigValue.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.gitlive.firebase.remoteconfig
22

3-
import dev.gitlive.firebase.externals.remoteconfig.Value
3+
import dev.gitlive.firebase.remoteconfig.externals.Value
44

55
actual class FirebaseRemoteConfigValue(val js: Value) {
66
actual fun asBoolean(): Boolean = rethrow { js.asBoolean() }

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/remoteconfig/remoteconfig.kt renamed to firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/externals/remoteconfig.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@file:JsModule("firebase/remote-config")
22
@file:JsNonModule
33

4-
package dev.gitlive.firebase.externals.remoteconfig
4+
package dev.gitlive.firebase.remoteconfig.externals
55

6-
import dev.gitlive.firebase.externals.app.FirebaseApp
6+
import dev.gitlive.firebase.externals.FirebaseApp
77
import kotlin.js.Json
88
import kotlin.js.Promise
99

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package dev.gitlive.firebase.database
66

77
import dev.gitlive.firebase.*
88
import dev.gitlive.firebase.FirebaseApp
9-
import dev.gitlive.firebase.externals.database.*
9+
import dev.gitlive.firebase.database.externals.*
1010
import kotlinx.coroutines.*
1111
import kotlinx.coroutines.channels.awaitClose
1212
import kotlinx.coroutines.flow.callbackFlow
@@ -18,18 +18,18 @@ import kotlinx.serialization.KSerializer
1818
import kotlinx.serialization.SerializationStrategy
1919
import kotlin.js.Promise
2020
import kotlin.js.json
21-
import dev.gitlive.firebase.externals.database.DataSnapshot as JsDataSnapshot
22-
import dev.gitlive.firebase.externals.database.DatabaseReference as JsDatabaseReference
23-
import dev.gitlive.firebase.externals.database.OnDisconnect as JsOnDisconnect
24-
import dev.gitlive.firebase.externals.database.Query as JsQuery
25-
import dev.gitlive.firebase.externals.database.endAt as jsEndAt
26-
import dev.gitlive.firebase.externals.database.equalTo as jsEqualTo
27-
import dev.gitlive.firebase.externals.database.limitToFirst as jsLimitToFirst
28-
import dev.gitlive.firebase.externals.database.limitToLast as jsLimitToLast
29-
import dev.gitlive.firebase.externals.database.orderByChild as jsOrderByChild
30-
import dev.gitlive.firebase.externals.database.orderByKey as jsOrderByKey
31-
import dev.gitlive.firebase.externals.database.orderByValue as jsOrderByValue
32-
import dev.gitlive.firebase.externals.database.startAt as jsStartAt
21+
import dev.gitlive.firebase.database.externals.DataSnapshot as JsDataSnapshot
22+
import dev.gitlive.firebase.database.externals.DatabaseReference as JsDatabaseReference
23+
import dev.gitlive.firebase.database.externals.OnDisconnect as JsOnDisconnect
24+
import dev.gitlive.firebase.database.externals.Query as JsQuery
25+
import dev.gitlive.firebase.database.externals.endAt as jsEndAt
26+
import dev.gitlive.firebase.database.externals.equalTo as jsEqualTo
27+
import dev.gitlive.firebase.database.externals.limitToFirst as jsLimitToFirst
28+
import dev.gitlive.firebase.database.externals.limitToLast as jsLimitToLast
29+
import dev.gitlive.firebase.database.externals.orderByChild as jsOrderByChild
30+
import dev.gitlive.firebase.database.externals.orderByKey as jsOrderByKey
31+
import dev.gitlive.firebase.database.externals.orderByValue as jsOrderByValue
32+
import dev.gitlive.firebase.database.externals.startAt as jsStartAt
3333

3434
@PublishedApi
3535
internal inline fun <reified T> encode(value: T, shouldEncodeElementDefault: Boolean) =
@@ -153,7 +153,7 @@ actual class DatabaseReference internal constructor(override val js: JsDatabaseR
153153

154154
actual suspend fun <T> runTransaction(strategy: KSerializer<T>, transactionUpdate: (currentData: T) -> T): DataSnapshot =
155155
rethrow {
156-
val result = dev.gitlive.firebase.externals.database.runTransaction(
156+
val result = runTransaction(
157157
js,
158158
transactionUpdate,
159159
).awaitWhileOnline()

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/database/externals.kt renamed to firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/externals/callbacks.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2020 GitLive Ltd. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5-
package dev.gitlive.firebase.externals.database
5+
package dev.gitlive.firebase.database.externals
66

77
typealias ChangeSnapshotCallback = (data: DataSnapshot, previousChildName: String?) -> Unit
88
typealias ValueSnapshotCallback = (data: DataSnapshot) -> Unit

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/database/database.kt renamed to firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/externals/database.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@file:JsModule("firebase/database")
22
@file:JsNonModule
33

4-
package dev.gitlive.firebase.externals.database
4+
package dev.gitlive.firebase.database.externals
55

66
import dev.gitlive.firebase.*
7-
import dev.gitlive.firebase.externals.app.FirebaseApp
7+
import dev.gitlive.firebase.externals.FirebaseApp
88
import kotlin.js.Promise
99

1010
external fun child(parent: DatabaseReference, path: String): DatabaseReference

firebase-database/src/jsTest/kotlin/dev/gitlive/firebase/database/database.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package dev.gitlive.firebase.database
22

33
import dev.gitlive.firebase.Firebase
4-
import dev.gitlive.firebase.externals.database.getDatabase
5-
import dev.gitlive.firebase.externals.database.goOffline
6-
import dev.gitlive.firebase.externals.database.goOnline
4+
import dev.gitlive.firebase.database.externals.getDatabase
5+
import dev.gitlive.firebase.database.externals.goOffline
6+
import dev.gitlive.firebase.database.externals.goOnline
77
import kotlinx.coroutines.Dispatchers
88
import kotlinx.coroutines.flow.first
99
import kotlinx.coroutines.withContext

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/firestore/firestore.kt renamed to firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/externals/firestore.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
@file:JsModule("firebase/firestore")
22
@file:JsNonModule
33

4-
package dev.gitlive.firebase.externals.firestore
4+
package dev.gitlive.firebase.firestore.externals
55

66
import dev.gitlive.firebase.Unsubscribe
7-
import dev.gitlive.firebase.externals.app.FirebaseApp
8-
import dev.gitlive.firebase.externals.database.QueryConstraint
7+
import dev.gitlive.firebase.externals.FirebaseApp
98
import kotlin.js.Json
109
import kotlin.js.Promise
1110

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

+22-21
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
package dev.gitlive.firebase.firestore
66

77
import dev.gitlive.firebase.*
8-
import dev.gitlive.firebase.externals.firestore.*
8+
import dev.gitlive.firebase.FirebaseApp
9+
import dev.gitlive.firebase.firestore.externals.*
910
import kotlinx.coroutines.GlobalScope
1011
import kotlinx.coroutines.await
1112
import kotlinx.coroutines.channels.awaitClose
@@ -14,26 +15,26 @@ import kotlinx.coroutines.promise
1415
import kotlinx.serialization.DeserializationStrategy
1516
import kotlinx.serialization.SerializationStrategy
1617
import kotlin.js.json
17-
import dev.gitlive.firebase.externals.firestore.CollectionReference as JsCollectionReference
18-
import dev.gitlive.firebase.externals.firestore.DocumentChange as JsDocumentChange
19-
import dev.gitlive.firebase.externals.firestore.DocumentReference as JsDocumentReference
20-
import dev.gitlive.firebase.externals.firestore.DocumentSnapshot as JsDocumentSnapshot
21-
import dev.gitlive.firebase.externals.firestore.FieldPath as JsFieldPath
22-
import dev.gitlive.firebase.externals.firestore.Query as JsQuery
23-
import dev.gitlive.firebase.externals.firestore.QuerySnapshot as JsQuerySnapshot
24-
import dev.gitlive.firebase.externals.firestore.SnapshotMetadata as JsSnapshotMetadata
25-
import dev.gitlive.firebase.externals.firestore.Transaction as JsTransaction
26-
import dev.gitlive.firebase.externals.firestore.WriteBatch as JsWriteBatch
27-
import dev.gitlive.firebase.externals.firestore.arrayRemove as jsArrayRemove
28-
import dev.gitlive.firebase.externals.firestore.arrayUnion as jsArrayUnion
29-
import dev.gitlive.firebase.externals.firestore.endAt as jsEndAt
30-
import dev.gitlive.firebase.externals.firestore.endBefore as jsEndBefore
31-
import dev.gitlive.firebase.externals.firestore.increment as jsIncrement
32-
import dev.gitlive.firebase.externals.firestore.updateDoc as jsUpdate
33-
import dev.gitlive.firebase.externals.firestore.limit as jsLimit
34-
import dev.gitlive.firebase.externals.firestore.startAfter as jsStartAfter
35-
import dev.gitlive.firebase.externals.firestore.startAt as jsStartAt
36-
import dev.gitlive.firebase.externals.firestore.where as jsWhere
18+
import dev.gitlive.firebase.firestore.externals.CollectionReference as JsCollectionReference
19+
import dev.gitlive.firebase.firestore.externals.DocumentChange as JsDocumentChange
20+
import dev.gitlive.firebase.firestore.externals.DocumentReference as JsDocumentReference
21+
import dev.gitlive.firebase.firestore.externals.DocumentSnapshot as JsDocumentSnapshot
22+
import dev.gitlive.firebase.firestore.externals.FieldPath as JsFieldPath
23+
import dev.gitlive.firebase.firestore.externals.Query as JsQuery
24+
import dev.gitlive.firebase.firestore.externals.QuerySnapshot as JsQuerySnapshot
25+
import dev.gitlive.firebase.firestore.externals.SnapshotMetadata as JsSnapshotMetadata
26+
import dev.gitlive.firebase.firestore.externals.Transaction as JsTransaction
27+
import dev.gitlive.firebase.firestore.externals.WriteBatch as JsWriteBatch
28+
import dev.gitlive.firebase.firestore.externals.arrayRemove as jsArrayRemove
29+
import dev.gitlive.firebase.firestore.externals.arrayUnion as jsArrayUnion
30+
import dev.gitlive.firebase.firestore.externals.endAt as jsEndAt
31+
import dev.gitlive.firebase.firestore.externals.endBefore as jsEndBefore
32+
import dev.gitlive.firebase.firestore.externals.increment as jsIncrement
33+
import dev.gitlive.firebase.firestore.externals.limit as jsLimit
34+
import dev.gitlive.firebase.firestore.externals.startAfter as jsStartAfter
35+
import dev.gitlive.firebase.firestore.externals.startAt as jsStartAt
36+
import dev.gitlive.firebase.firestore.externals.updateDoc as jsUpdate
37+
import dev.gitlive.firebase.firestore.externals.where as jsWhere
3738

3839
@PublishedApi
3940
internal inline fun <reified T> decode(value: Any?): T =

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/functions/externals.kt renamed to firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions/externals/HttpsCallableExt.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2020 GitLive Ltd. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5-
package dev.gitlive.firebase.externals.functions
5+
package dev.gitlive.firebase.functions.externals
66

77
import kotlin.js.Promise
88

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/functions/functions.kt renamed to firebase-functions/src/jsMain/kotlin/dev/gitlive/firebase/functions/externals/functions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@file:JsModule("firebase/functions")
22
@file:JsNonModule
33

4-
package dev.gitlive.firebase.externals.functions
4+
package dev.gitlive.firebase.functions.externals
55

6-
import dev.gitlive.firebase.externals.app.FirebaseApp
6+
import dev.gitlive.firebase.externals.FirebaseApp
77
import kotlin.js.Json
88

99
external fun connectFunctionsEmulator(functions: Functions, host: String, port: Int)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
package dev.gitlive.firebase.functions
66

77
import dev.gitlive.firebase.*
8-
import dev.gitlive.firebase.externals.functions.*
8+
import dev.gitlive.firebase.functions.externals.*
99
import kotlinx.coroutines.await
1010
import kotlinx.serialization.DeserializationStrategy
1111
import kotlinx.serialization.SerializationStrategy
1212
import org.w3c.dom.url.URL
1313
import kotlin.js.json
14-
import dev.gitlive.firebase.externals.functions.HttpsCallableResult as JsHttpsCallableResult
14+
import dev.gitlive.firebase.functions.externals.HttpsCallableResult as JsHttpsCallableResult
1515

1616
actual val Firebase.functions: FirebaseFunctions
1717
get() = rethrow { FirebaseFunctions(getFunctions()) }

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/installations/installations.kt renamed to firebase-installations/src/jsMain/kotlin/dev/gitlive/firebase/installations/externals/installations.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@file:JsModule("firebase/installations")
22
@file:JsNonModule
33

4-
package dev.gitlive.firebase.externals.installations
4+
package dev.gitlive.firebase.installations.externals
55

6-
import dev.gitlive.firebase.externals.app.FirebaseApp
6+
import dev.gitlive.firebase.externals.FirebaseApp
77
import kotlin.js.Promise
88

99
external fun delete(installations: Installations): Promise<Unit>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.gitlive.firebase.installations
22

33
import dev.gitlive.firebase.*
4-
import dev.gitlive.firebase.externals.installations.*
4+
import dev.gitlive.firebase.installations.externals.*
55
import kotlinx.coroutines.await
66

77
actual val Firebase.installations

firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/externals.kt renamed to firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/externals/performance.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
@file:JsModule("firebase/performance")
22
@file:JsNonModule
33

4-
package dev.gitlive.firebase.perf
4+
package dev.gitlive.firebase.perf.externals
55

6-
import dev.gitlive.firebase.externals.app.FirebaseApp
6+
import dev.gitlive.firebase.externals.FirebaseApp
77

8-
external fun getPerformance(app: FirebaseApp? = definedExternally): JsFirebasePerformance
8+
external fun getPerformance(app: FirebaseApp? = definedExternally): FirebasePerformance
99

10-
external fun trace(performance: JsFirebasePerformance, name: String): JsPerformanceTrace
10+
external fun trace(performance: FirebasePerformance, name: String): PerformanceTrace
1111

12-
external interface JsFirebasePerformance {
12+
external interface FirebasePerformance {
1313
var dataCollectionEnabled: Boolean
1414
var instrumentationEnabled: Boolean
1515
}
1616

17-
external interface JsPerformanceTrace {
17+
external interface PerformanceTrace {
1818
fun getAttribute(attr: String): String?
1919
fun getAttributes(): Map<String, String>
2020
fun getMetric(metricName: String): Int

firebase-perf/src/jsMain/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package dev.gitlive.firebase.perf.metrics
22

3-
import dev.gitlive.firebase.perf.JsPerformanceTrace
3+
import dev.gitlive.firebase.perf.externals.PerformanceTrace
44
import dev.gitlive.firebase.perf.rethrow
55

66

7-
actual class Trace internal constructor(private val js: JsPerformanceTrace) {
7+
actual class Trace internal constructor(private val js: PerformanceTrace) {
88

99
actual fun start() = rethrow { js.start() }
1010
actual fun stop() = rethrow { js.stop() }

0 commit comments

Comments
 (0)