Skip to content

Commit cbca57b

Browse files
DatL4gDatL4g
committed
update to kotlin 2.2.0
1 parent acc824a commit cbca57b

File tree

27 files changed

+50
-107
lines changed

27 files changed

+50
-107
lines changed

‎firebase-analytics/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ kotlin {
113113
sourceSets {
114114
all {
115115
languageSettings.apply {
116-
this.apiVersion = libs.versions.settings.api.get()
117-
this.languageVersion = libs.versions.settings.language.get()
118116
progressiveMode = true
119117
if (name.lowercase().contains("ios")) {
120118
optIn("kotlinx.cinterop.ExperimentalForeignApi")

‎firebase-app/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ kotlin {
115115
sourceSets {
116116
all {
117117
languageSettings.apply {
118-
this.apiVersion = libs.versions.settings.api.get()
119-
this.languageVersion = libs.versions.settings.language.get()
120118
progressiveMode = true
121119
if (name.lowercase().contains("ios")) {
122120
optIn("kotlinx.cinterop.ExperimentalForeignApi")

‎firebase-auth/api/jvm/firebase-auth.api

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,14 @@ public class dev/gitlive/firebase/auth/AuthCredential {
8484
public final class dev/gitlive/firebase/auth/AuthResult {
8585
public fun <init> (Lcom/google/firebase/auth/AuthResult;)V
8686
public final fun getAdditionalUserInfo ()Ldev/gitlive/firebase/auth/AdditionalUserInfo;
87+
public final fun getAndroid ()Lcom/google/firebase/auth/AuthResult;
8788
public final fun getCredential ()Ldev/gitlive/firebase/auth/AuthCredential;
8889
public final fun getUser ()Ldev/gitlive/firebase/auth/FirebaseUser;
8990
}
9091

9192
public final class dev/gitlive/firebase/auth/AuthTokenResult {
9293
public fun <init> (Lcom/google/firebase/auth/GetTokenResult;)V
94+
public final fun getAndroid ()Lcom/google/firebase/auth/GetTokenResult;
9395
public final fun getClaims ()Ljava/util/Map;
9496
public final fun getSignInProvider ()Ljava/lang/String;
9597
public final fun getToken ()Ljava/lang/String;
@@ -139,6 +141,7 @@ public final class dev/gitlive/firebase/auth/FirebaseAuth {
139141

140142
public final class dev/gitlive/firebase/auth/FirebaseUser {
141143
public final fun delete (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
144+
public final fun getAndroid ()Lcom/google/firebase/auth/FirebaseUser;
142145
public final fun getDisplayName ()Ljava/lang/String;
143146
public final fun getEmail ()Ljava/lang/String;
144147
public final fun getIdToken (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -181,6 +184,7 @@ public final class dev/gitlive/firebase/auth/GoogleAuthProvider {
181184
public final class dev/gitlive/firebase/auth/MultiFactor {
182185
public fun <init> (Lcom/google/firebase/auth/MultiFactor;)V
183186
public final fun enroll (Ldev/gitlive/firebase/auth/MultiFactorAssertion;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
187+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactor;
184188
public final fun getEnrolledFactors ()Ljava/util/List;
185189
public final fun getSession (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
186190
public final fun unenroll (Ldev/gitlive/firebase/auth/MultiFactorInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -189,11 +193,13 @@ public final class dev/gitlive/firebase/auth/MultiFactor {
189193

190194
public final class dev/gitlive/firebase/auth/MultiFactorAssertion {
191195
public fun <init> (Lcom/google/firebase/auth/MultiFactorAssertion;)V
196+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactorAssertion;
192197
public final fun getFactorId ()Ljava/lang/String;
193198
}
194199

195200
public final class dev/gitlive/firebase/auth/MultiFactorInfo {
196201
public fun <init> (Lcom/google/firebase/auth/MultiFactorInfo;)V
202+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactorInfo;
197203
public final fun getDisplayName ()Ljava/lang/String;
198204
public final fun getEnrollmentTime ()D
199205
public final fun getFactorId ()Ljava/lang/String;
@@ -202,6 +208,7 @@ public final class dev/gitlive/firebase/auth/MultiFactorInfo {
202208

203209
public final class dev/gitlive/firebase/auth/MultiFactorResolver {
204210
public fun <init> (Lcom/google/firebase/auth/MultiFactorResolver;)V
211+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactorResolver;
205212
public final fun getAuth ()Ldev/gitlive/firebase/auth/FirebaseAuth;
206213
public final fun getHints ()Ljava/util/List;
207214
public final fun getSession ()Ldev/gitlive/firebase/auth/MultiFactorSession;
@@ -210,14 +217,7 @@ public final class dev/gitlive/firebase/auth/MultiFactorResolver {
210217

211218
public final class dev/gitlive/firebase/auth/MultiFactorSession {
212219
public fun <init> (Lcom/google/firebase/auth/MultiFactorSession;)V
213-
}
214-
215-
public final class dev/gitlive/firebase/auth/MultifactorKt {
216-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactor;)Lcom/google/firebase/auth/MultiFactor;
217-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactorAssertion;)Lcom/google/firebase/auth/MultiFactorAssertion;
218-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactorInfo;)Lcom/google/firebase/auth/MultiFactorInfo;
219-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactorResolver;)Lcom/google/firebase/auth/MultiFactorResolver;
220-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactorSession;)Lcom/google/firebase/auth/MultiFactorSession;
220+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactorSession;
221221
}
222222

223223
public final class dev/gitlive/firebase/auth/OAuthCredential : dev/gitlive/firebase/auth/AuthCredential {
@@ -267,6 +267,7 @@ public final class dev/gitlive/firebase/auth/TwitterAuthProvider {
267267

268268
public final class dev/gitlive/firebase/auth/UserInfo {
269269
public fun <init> (Lcom/google/firebase/auth/UserInfo;)V
270+
public final fun getAndroid ()Lcom/google/firebase/auth/UserInfo;
270271
public final fun getDisplayName ()Ljava/lang/String;
271272
public final fun getEmail ()Ljava/lang/String;
272273
public final fun getPhoneNumber ()Ljava/lang/String;
@@ -275,22 +276,15 @@ public final class dev/gitlive/firebase/auth/UserInfo {
275276
public final fun getUid ()Ljava/lang/String;
276277
}
277278

278-
public final class dev/gitlive/firebase/auth/UserKt {
279-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/FirebaseUser;)Lcom/google/firebase/auth/FirebaseUser;
280-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/UserInfo;)Lcom/google/firebase/auth/UserInfo;
281-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/UserMetaData;)Lcom/google/firebase/auth/FirebaseUserMetadata;
282-
}
283-
284279
public final class dev/gitlive/firebase/auth/UserMetaData {
285280
public fun <init> (Lcom/google/firebase/auth/FirebaseUserMetadata;)V
281+
public final fun getAndroid ()Lcom/google/firebase/auth/FirebaseUserMetadata;
286282
public final fun getCreationTime ()Ljava/lang/Double;
287283
public final fun getLastSignInTime ()Ljava/lang/Double;
288284
}
289285

290286
public final class dev/gitlive/firebase/auth/android {
291287
public static final fun auth (Ldev/gitlive/firebase/Firebase;Ldev/gitlive/firebase/FirebaseApp;)Ldev/gitlive/firebase/auth/FirebaseAuth;
292-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/AuthResult;)Lcom/google/firebase/auth/AuthResult;
293-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/AuthTokenResult;)Lcom/google/firebase/auth/GetTokenResult;
294288
public static final fun getAuth (Ldev/gitlive/firebase/Firebase;)Ldev/gitlive/firebase/auth/FirebaseAuth;
295289
}
296290

‎firebase-auth/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ kotlin {
114114
sourceSets {
115115
all {
116116
languageSettings.apply {
117-
this.apiVersion = libs.versions.settings.api.get()
118-
this.languageVersion = libs.versions.settings.language.get()
119117
progressiveMode = true
120118
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
121119
if (name.lowercase().contains("ios")) {

‎firebase-auth/src/jvmMain/kotlin/dev/gitlive/firebase/auth/auth.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import kotlinx.coroutines.tasks.await
2121
public actual val Firebase.auth: FirebaseAuth
2222
get() = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance())
2323

24-
public actual fun Firebase.auth(app: FirebaseApp) = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance(app.publicAndroid))
24+
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance(app.publicAndroid))
2525

2626
public actual class FirebaseAuth internal constructor(internal val android: com.google.firebase.auth.FirebaseAuth) {
2727
public actual val currentUser: FirebaseUser?
@@ -119,9 +119,7 @@ public actual class FirebaseAuth internal constructor(internal val android: com.
119119
}
120120
}
121121

122-
public val AuthResult.android: com.google.firebase.auth.AuthResult get() = android
123-
124-
public actual class AuthResult(internal val android: com.google.firebase.auth.AuthResult) {
122+
public actual class AuthResult(public val android: com.google.firebase.auth.AuthResult) {
125123
public actual val user: FirebaseUser?
126124
get() = android.user?.let { FirebaseUser(it) }
127125
public actual val credential: AuthCredential?
@@ -141,9 +139,7 @@ public actual class AdditionalUserInfo {
141139
get() = throw NotImplementedError()
142140
}
143141

144-
public val AuthTokenResult.android: com.google.firebase.auth.GetTokenResult get() = android
145-
146-
public actual class AuthTokenResult(internal val android: com.google.firebase.auth.GetTokenResult) {
142+
public actual class AuthTokenResult(public val android: com.google.firebase.auth.GetTokenResult) {
147143
// actual val authTimestamp: Long
148144
// get() = android.authTimestamp
149145
public actual val claims: Map<String, Any>

‎firebase-auth/src/jvmMain/kotlin/dev/gitlive/firebase/auth/multifactor.kt

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ package dev.gitlive.firebase.auth
66

77
import kotlinx.coroutines.tasks.await
88

9-
public val MultiFactor.android: com.google.firebase.auth.MultiFactor get() = android
10-
11-
public actual class MultiFactor(internal val android: com.google.firebase.auth.MultiFactor) {
9+
public actual class MultiFactor(public val android: com.google.firebase.auth.MultiFactor) {
1210
public actual val enrolledFactors: List<MultiFactorInfo>
1311
get() = android.enrolledFactors.map { MultiFactorInfo(it) }
1412
public actual suspend fun enroll(multiFactorAssertion: MultiFactorAssertion, displayName: String?) {
@@ -23,9 +21,7 @@ public actual class MultiFactor(internal val android: com.google.firebase.auth.M
2321
}
2422
}
2523

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

39-
public val MultiFactorAssertion.android: com.google.firebase.auth.MultiFactorAssertion get() = android
40-
41-
public actual class MultiFactorAssertion(internal val android: com.google.firebase.auth.MultiFactorAssertion) {
35+
public actual class MultiFactorAssertion(public val android: com.google.firebase.auth.MultiFactorAssertion) {
4236
public actual val factorId: String
4337
get() = android.factorId
4438
}
4539

46-
public val MultiFactorSession.android: com.google.firebase.auth.MultiFactorSession get() = android
47-
48-
public actual class MultiFactorSession(internal val android: com.google.firebase.auth.MultiFactorSession)
49-
50-
public val MultiFactorResolver.android: com.google.firebase.auth.MultiFactorResolver get() = android
40+
public actual class MultiFactorSession(public val android: com.google.firebase.auth.MultiFactorSession)
5141

52-
public actual class MultiFactorResolver(internal val android: com.google.firebase.auth.MultiFactorResolver) {
42+
public actual class MultiFactorResolver(public val android: com.google.firebase.auth.MultiFactorResolver) {
5343
public actual val auth: FirebaseAuth = FirebaseAuth(android.firebaseAuth)
5444
public actual val hints: List<MultiFactorInfo> = android.hints.map { MultiFactorInfo(it) }
5545
public actual val session: MultiFactorSession = MultiFactorSession(android.session)

‎firebase-auth/src/jvmMain/kotlin/dev/gitlive/firebase/auth/user.kt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ import android.net.Uri
88
import com.google.firebase.auth.UserProfileChangeRequest
99
import kotlinx.coroutines.tasks.await
1010

11-
public val FirebaseUser.android: com.google.firebase.auth.FirebaseUser get() = android
12-
13-
public actual class FirebaseUser internal constructor(internal val android: com.google.firebase.auth.FirebaseUser) {
11+
public actual class FirebaseUser internal constructor(public val android: com.google.firebase.auth.FirebaseUser) {
1412
public actual val uid: String
1513
get() = android.uid
1614
public actual val displayName: String?
@@ -72,9 +70,7 @@ public actual class FirebaseUser internal constructor(internal val android: com.
7270
}
7371
}
7472

75-
public val UserInfo.android: com.google.firebase.auth.UserInfo get() = android
76-
77-
public actual class UserInfo(internal val android: com.google.firebase.auth.UserInfo) {
73+
public actual class UserInfo(public val android: com.google.firebase.auth.UserInfo) {
7874
public actual val displayName: String?
7975
get() = android.displayName
8076
public actual val email: String?
@@ -89,9 +85,7 @@ public actual class UserInfo(internal val android: com.google.firebase.auth.User
8985
get() = android.uid
9086
}
9187

92-
public val UserMetaData.android: com.google.firebase.auth.FirebaseUserMetadata get() = android
93-
94-
public actual class UserMetaData(internal val android: com.google.firebase.auth.FirebaseUserMetadata) {
88+
public actual class UserMetaData(public val android: com.google.firebase.auth.FirebaseUserMetadata) {
9589
public actual val creationTime: Double?
9690
get() = android.creationTimestamp.toDouble()
9791
public actual val lastSignInTime: Double?

‎firebase-common-internal/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ kotlin {
103103
sourceSets {
104104
all {
105105
languageSettings.apply {
106-
this.apiVersion = libs.versions.settings.api.get()
107-
this.languageVersion = libs.versions.settings.language.get()
108106
progressiveMode = true
109107
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
110108
optIn("kotlinx.serialization.ExperimentalSerializationApi")

‎firebase-common/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ kotlin {
102102
sourceSets {
103103
all {
104104
languageSettings.apply {
105-
this.apiVersion = libs.versions.settings.api.get()
106-
this.languageVersion = libs.versions.settings.language.get()
107105
progressiveMode = true
108106
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
109107
optIn("kotlinx.serialization.ExperimentalSerializationApi")

‎firebase-config/api/android/firebase-config.api

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ public final class dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig {
2424
}
2525

2626
public final class dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo {
27-
public fun <init> (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;)V
27+
public fun <init> (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlin/time/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;)V
2828
public final fun component1 ()Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;
29-
public final fun component2 ()Lkotlinx/datetime/Instant;
29+
public final fun component2 ()Lkotlin/time/Instant;
3030
public final fun component3 ()Ldev/gitlive/firebase/remoteconfig/FetchStatus;
31-
public final fun copy (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
32-
public static synthetic fun copy$default (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlinx/datetime/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;ILjava/lang/Object;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
31+
public final fun copy (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlin/time/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
32+
public static synthetic fun copy$default (Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;Lkotlin/time/Instant;Ldev/gitlive/firebase/remoteconfig/FetchStatus;ILjava/lang/Object;)Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigInfo;
3333
public fun equals (Ljava/lang/Object;)Z
3434
public final fun getConfigSettings ()Ldev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigSettings;
35-
public final fun getFetchTime ()Lkotlinx/datetime/Instant;
35+
public final fun getFetchTime ()Lkotlin/time/Instant;
3636
public final fun getFetchTimeMillis ()J
3737
public final fun getLastFetchStatus ()Ldev/gitlive/firebase/remoteconfig/FetchStatus;
3838
public fun hashCode ()I

0 commit comments

Comments
 (0)