Skip to content

Commit b02afce

Browse files
committed
bump dependencies
1 parent d839e2c commit b02afce

File tree

22 files changed

+68
-112
lines changed

22 files changed

+68
-112
lines changed

firebase-auth/build.gradle.kts

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,16 @@ kotlin {
125125
}
126126
}
127127

128-
getByName("commonMain") {
129-
dependencies {
130-
api(project(":firebase-app"))
131-
implementation(project(":firebase-common"))
132-
}
128+
commonMain.dependencies {
129+
api(project(":firebase-app"))
130+
implementation(project(":firebase-common"))
133131
}
134-
135-
getByName("commonTest") {
136-
dependencies {
137-
implementation(project(":test-utils"))
138-
}
132+
commonTest.dependencies {
133+
implementation(project(":test-utils"))
139134
}
140135

141-
getByName("androidMain") {
142-
dependencies {
143-
api(libs.google.firebase.auth)
144-
}
136+
androidMain.dependencies {
137+
api(libs.google.firebase.auth)
145138
}
146139
}
147140
}

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ public actual val Firebase.auth: FirebaseAuth
4444
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth =
4545
rethrow { FirebaseAuth(getAuth(app.js)) }
4646

47-
public val FirebaseAuth.js: Auth get() = js
48-
49-
public actual class FirebaseAuth internal constructor(internal val js: Auth) {
47+
public actual class FirebaseAuth internal constructor(public val js: Auth) {
5048

5149
public actual val currentUser: FirebaseUser?
5250
get() = rethrow { js.currentUser?.let { FirebaseUser(it) } }
@@ -133,9 +131,7 @@ public actual class FirebaseAuth internal constructor(internal val js: Auth) {
133131
public actual fun useEmulator(host: String, port: Int): Unit = rethrow { connectAuthEmulator(js, "http://$host:$port") }
134132
}
135133

136-
public val AuthResult.js: JsAuthResult get() = js
137-
138-
public actual class AuthResult(internal val js: JsAuthResult) {
134+
public actual class AuthResult(public val js: JsAuthResult) {
139135
public actual val user: FirebaseUser?
140136
get() = rethrow { js.user?.let { FirebaseUser(it) } }
141137
public actual val credential: AuthCredential?
@@ -144,10 +140,8 @@ public actual class AuthResult(internal val js: JsAuthResult) {
144140
get() = rethrow { js.additionalUserInfo?.let { AdditionalUserInfo(it) } }
145141
}
146142

147-
public val AdditionalUserInfo.js: JsAdditionalUserInfo get() = js
148-
149143
public actual class AdditionalUserInfo(
150-
internal val js: JsAdditionalUserInfo,
144+
public val js: JsAdditionalUserInfo,
151145
) {
152146
public actual val providerId: String?
153147
get() = js.providerId
@@ -165,9 +159,7 @@ public actual class AdditionalUserInfo(
165159
get() = js.newUser
166160
}
167161

168-
public val AuthTokenResult.js: IdTokenResult get() = js
169-
170-
public actual class AuthTokenResult(internal val js: IdTokenResult) {
162+
public actual class AuthTokenResult(public val js: IdTokenResult) {
171163
// actual val authTimestamp: Long
172164
// get() = js.authTime
173165
public actual val claims: Map<String, Any>

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ import kotlin.js.json
1212
import dev.gitlive.firebase.auth.externals.AuthCredential as JsAuthCredential
1313
import dev.gitlive.firebase.auth.externals.OAuthProvider as JsOAuthProvider
1414

15-
public val AuthCredential.js: JsAuthCredential get() = js
16-
17-
public actual open class AuthCredential(internal val js: JsAuthCredential) {
15+
public actual open class AuthCredential(public val js: JsAuthCredential) {
1816
public actual val providerId: String
1917
get() = js.providerId
2018
}
@@ -51,9 +49,7 @@ public actual object GoogleAuthProvider {
5149
}
5250
}
5351

54-
public val OAuthProvider.js: JsOAuthProvider get() = js
55-
56-
public actual class OAuthProvider(internal val js: JsOAuthProvider) {
52+
public actual class OAuthProvider(public val js: JsOAuthProvider) {
5753

5854
public actual constructor(
5955
provider: String,
@@ -82,9 +78,7 @@ public actual class OAuthProvider(internal val js: JsOAuthProvider) {
8278
}
8379
}
8480

85-
public val PhoneAuthProvider.js: JsPhoneAuthProvider get() = js
86-
87-
public actual class PhoneAuthProvider(internal val js: JsPhoneAuthProvider) {
81+
public actual class PhoneAuthProvider(public val js: JsPhoneAuthProvider) {
8882

8983
public actual constructor(auth: FirebaseAuth) : this(JsPhoneAuthProvider(auth.js))
9084

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ import dev.gitlive.firebase.auth.externals.MultiFactorInfo as JsMultiFactorInfo
88
import dev.gitlive.firebase.auth.externals.MultiFactorResolver as JsMultiFactorResolver
99
import dev.gitlive.firebase.auth.externals.MultiFactorSession as JsMultiFactorSession
1010

11-
public val MultiFactor.js get() = js
12-
13-
public actual class MultiFactor(internal val js: MultiFactorUser) {
11+
public actual class MultiFactor(public val js: MultiFactorUser) {
1412
public actual val enrolledFactors: List<MultiFactorInfo>
1513
get() = rethrow { js.enrolledFactors.map { MultiFactorInfo(it) } }
1614
public actual suspend fun enroll(multiFactorAssertion: MultiFactorAssertion, displayName: String?): Unit =
@@ -23,9 +21,7 @@ public actual class MultiFactor(internal val js: MultiFactorUser) {
2321
rethrow { js.unenroll(factorUid).await() }
2422
}
2523

26-
public val MultiFactorInfo.js get() = js
27-
28-
public actual class MultiFactorInfo(internal val js: JsMultiFactorInfo) {
24+
public actual class MultiFactorInfo(public val js: JsMultiFactorInfo) {
2925
public actual val displayName: String?
3026
get() = rethrow { js.displayName }
3127
public actual val enrollmentTime: Double
@@ -36,20 +32,14 @@ public actual class MultiFactorInfo(internal val js: JsMultiFactorInfo) {
3632
get() = rethrow { js.uid }
3733
}
3834

39-
public val MultiFactorAssertion.js get() = js
40-
41-
public actual class MultiFactorAssertion(internal val js: JsMultiFactorAssertion) {
35+
public actual class MultiFactorAssertion(public val js: JsMultiFactorAssertion) {
4236
public actual val factorId: String
4337
get() = rethrow { js.factorId }
4438
}
4539

46-
public val MultiFactorSession.js get() = js
47-
48-
public actual class MultiFactorSession(internal val js: JsMultiFactorSession)
49-
50-
public val MultiFactorResolver.js get() = js
40+
public actual class MultiFactorSession(public val js: JsMultiFactorSession)
5141

52-
public actual class MultiFactorResolver(internal val js: JsMultiFactorResolver) {
42+
public actual class MultiFactorResolver(public val js: JsMultiFactorResolver) {
5343
public actual val auth: FirebaseAuth = rethrow { FirebaseAuth(js.auth) }
5444
public actual val hints: List<MultiFactorInfo> = rethrow { js.hints.map { MultiFactorInfo(it) } }
5545
public actual val session: MultiFactorSession = rethrow { MultiFactorSession(js.session) }

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import kotlin.js.Date
66
import dev.gitlive.firebase.auth.externals.UserInfo as JsUserInfo
77
import kotlin.js.json
88

9-
public val FirebaseUser.js get() = js
10-
11-
public actual class FirebaseUser internal constructor(internal val js: User) {
9+
public actual class FirebaseUser internal constructor(public val js: User) {
1210
public actual val uid: String
1311
get() = rethrow { js.uid }
1412
public actual val displayName: String?
@@ -57,9 +55,7 @@ public actual class FirebaseUser internal constructor(internal val js: User) {
5755
public actual suspend fun verifyBeforeUpdateEmail(newEmail: String, actionCodeSettings: ActionCodeSettings?): Unit = rethrow { verifyBeforeUpdateEmail(js, newEmail, actionCodeSettings?.toJson()).await() }
5856
}
5957

60-
public val UserInfo.js get() = js
61-
62-
public actual class UserInfo(internal val js: JsUserInfo) {
58+
public actual class UserInfo(public val js: JsUserInfo) {
6359
public actual val displayName: String?
6460
get() = rethrow { js.displayName }
6561
public actual val email: String?
@@ -74,9 +70,7 @@ public actual class UserInfo(internal val js: JsUserInfo) {
7470
get() = rethrow { js.uid }
7571
}
7672

77-
public val UserMetaData.js get() = js
78-
79-
public actual class UserMetaData(internal val js: UserMetadata) {
73+
public actual class UserMetaData(public val js: UserMetadata) {
8074
public actual val creationTime: Double?
8175
get() = rethrow { js.creationTime?.let { (Date(it).getTime() / 1000.0) } }
8276
public actual val lastSignInTime: Double?

firebase-common-internal/src/commonMain/kotlin/dev/gitlive/firebase/internal/serializers.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package dev.gitlive.firebase.internal
66

77
import kotlinx.serialization.KSerializer
8+
import kotlinx.serialization.SealedSerializationApi
89
import kotlinx.serialization.SerializationException
910
import kotlinx.serialization.SerializationStrategy
1011
import kotlinx.serialization.builtins.serializer
@@ -31,6 +32,7 @@ public class FirebaseMapSerializer : KSerializer<Map<String, Any?>> {
3132
public lateinit var keys: List<String>
3233
public lateinit var map: Map<String, Any?>
3334

35+
@OptIn(SealedSerializationApi::class)
3436
override val descriptor: SerialDescriptor = object : SerialDescriptor {
3537
override val kind = StructureKind.MAP
3638
override val serialName = "kotlin.Map<String, Any>"
@@ -78,6 +80,7 @@ public class FirebaseListSerializer : KSerializer<Iterable<Any?>> {
7880

7981
public lateinit var list: List<Any?>
8082

83+
@OptIn(SealedSerializationApi::class)
8184
override val descriptor: SerialDescriptor = object : SerialDescriptor {
8285
override val kind = StructureKind.LIST
8386
override val serialName = "kotlin.List<Any>"

firebase-common/api/android/firebase-common.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public abstract interface annotation class dev/gitlive/firebase/FirebaseClassDis
2828
public abstract fun discriminator ()Ljava/lang/String;
2929
}
3030

31-
public synthetic class dev/gitlive/firebase/FirebaseClassDiscriminator$Impl : dev/gitlive/firebase/FirebaseClassDiscriminator {
31+
public final synthetic class dev/gitlive/firebase/FirebaseClassDiscriminator$Impl : dev/gitlive/firebase/FirebaseClassDiscriminator {
3232
public fun <init> (Ljava/lang/String;)V
3333
public final synthetic fun discriminator ()Ljava/lang/String;
3434
}

firebase-common/api/jvm/firebase-common.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public abstract interface annotation class dev/gitlive/firebase/FirebaseClassDis
2828
public abstract fun discriminator ()Ljava/lang/String;
2929
}
3030

31-
public synthetic class dev/gitlive/firebase/FirebaseClassDiscriminator$Impl : dev/gitlive/firebase/FirebaseClassDiscriminator {
31+
public final synthetic class dev/gitlive/firebase/FirebaseClassDiscriminator$Impl : dev/gitlive/firebase/FirebaseClassDiscriminator {
3232
public fun <init> (Ljava/lang/String;)V
3333
public final synthetic fun discriminator ()Ljava/lang/String;
3434
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import dev.gitlive.firebase.Firebase
99
import dev.gitlive.firebase.FirebaseApp
1010
import dev.gitlive.firebase.android
1111
import kotlinx.coroutines.tasks.await
12-
import kotlinx.datetime.Instant
1312
import kotlin.time.Duration
1413
import kotlin.time.Duration.Companion.seconds
14+
import kotlin.time.ExperimentalTime
15+
import kotlin.time.Instant
1516
import com.google.firebase.remoteconfig.FirebaseRemoteConfig as AndroidFirebaseRemoteConfig
1617
import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo as AndroidFirebaseRemoteConfigInfo
1718
import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings as AndroidFirebaseRemoteConfigSettings
@@ -66,6 +67,7 @@ public actual class FirebaseRemoteConfig internal constructor(internal val andro
6667
minimumFetchInterval = minimumFetchIntervalInSeconds.seconds,
6768
)
6869

70+
@OptIn(ExperimentalTime::class)
6971
private fun AndroidFirebaseRemoteConfigInfo.asCommon(): FirebaseRemoteConfigInfo {
7072
val lastFetchStatus = when (lastFetchStatus) {
7173
AndroidFirebaseRemoteConfig.LAST_FETCH_STATUS_SUCCESS -> FetchStatus.Success

firebase-config/src/commonMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package dev.gitlive.firebase.remoteconfig
22

3-
import kotlinx.datetime.Instant
3+
import kotlin.time.ExperimentalTime
4+
import kotlin.time.Instant
45

56
/** Wraps the current state of the [FirebaseRemoteConfig] singleton object. */
7+
@OptIn(ExperimentalTime::class)
68
public data class FirebaseRemoteConfigInfo(
79
/**
810
* Gets the current settings of the [FirebaseRemoteConfig] singleton object.

0 commit comments

Comments
 (0)