Skip to content

Commit e9720e9

Browse files
DatL4gDatL4g
committed
fix build on android
1 parent d4a408f commit e9720e9

File tree

47 files changed

+116
-233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+116
-233
lines changed

‎build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ buildscript {
3030
}
3131
}
3232

33-
val compileSdkVersion by extra(34)
34-
val targetSdkVersion by extra(34)
35-
val minSdkVersion by extra(21)
33+
val compileSdkVersion by extra(36)
34+
val targetSdkVersion by extra(36)
35+
val minSdkVersion by extra(23)
3636

3737
tasks {
3838
register("updateVersions") {

‎firebase-analytics/api/android/firebase-analytics.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public final class dev/gitlive/firebase/analytics/AnalyticsKt {
1212

1313
public final class dev/gitlive/firebase/analytics/FirebaseAnalytics {
1414
public fun <init> (Lcom/google/firebase/analytics/FirebaseAnalytics;)V
15+
public final fun getAndroid ()Lcom/google/firebase/analytics/FirebaseAnalytics;
1516
public final fun getSessionId (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1617
public final fun logEvent (Ljava/lang/String;Ljava/util/Map;)V
1718
public static synthetic fun logEvent$default (Ldev/gitlive/firebase/analytics/FirebaseAnalytics;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
@@ -206,6 +207,5 @@ public final class dev/gitlive/firebase/analytics/FirebaseAnalyticsUserProperty
206207
public final class dev/gitlive/firebase/analytics/analyticsAndroid {
207208
public static final fun analytics (Ldev/gitlive/firebase/Firebase;Ldev/gitlive/firebase/FirebaseApp;)Ldev/gitlive/firebase/analytics/FirebaseAnalytics;
208209
public static final fun getAnalytics (Ldev/gitlive/firebase/Firebase;)Ldev/gitlive/firebase/analytics/FirebaseAnalytics;
209-
public static final fun getAndroid (Ldev/gitlive/firebase/analytics/FirebaseAnalytics;)Lcom/google/firebase/analytics/FirebaseAnalytics;
210210
}
211211

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ public actual val Firebase.analytics: FirebaseAnalytics
1515

1616
public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics = FirebaseAnalytics(com.google.firebase.Firebase.analytics)
1717

18-
public val FirebaseAnalytics.android: com.google.firebase.analytics.FirebaseAnalytics get() = android
19-
20-
public actual class FirebaseAnalytics(internal val android: com.google.firebase.analytics.FirebaseAnalytics) {
18+
public actual class FirebaseAnalytics(public val android: com.google.firebase.analytics.FirebaseAnalytics) {
2119
public actual fun logEvent(name: String, parameters: Map<String, Any>?) {
2220
android.logEvent(name, parameters?.toBundle())
2321
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import dev.gitlive.firebase.Firebase
44
import dev.gitlive.firebase.FirebaseApp
55
import dev.gitlive.firebase.FirebaseException
66
import dev.gitlive.firebase.analytics.externals.getAnalytics
7-
import dev.gitlive.firebase.js
87
import kotlinx.coroutines.await
98
import kotlin.time.Duration
109

@@ -13,9 +12,7 @@ public actual val Firebase.analytics: FirebaseAnalytics
1312

1413
public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics = FirebaseAnalytics(getAnalytics(app.js))
1514

16-
public val FirebaseAnalytics.js: dev.gitlive.firebase.analytics.externals.FirebaseAnalytics get() = js
17-
18-
public actual class FirebaseAnalytics(internal val js: dev.gitlive.firebase.analytics.externals.FirebaseAnalytics) {
15+
public actual class FirebaseAnalytics(public val js: dev.gitlive.firebase.analytics.externals.FirebaseAnalytics) {
1916
public actual fun logEvent(
2017
name: String,
2118
parameters: Map<String, Any>?,

‎firebase-app/api/android/firebase-app.api

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ public final class dev/gitlive/firebase/Firebase {
77
}
88

99
public final class dev/gitlive/firebase/FirebaseApp {
10+
public final fun component1 ()Lcom/google/firebase/FirebaseApp;
1011
public final fun delete (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1112
public fun equals (Ljava/lang/Object;)Z
13+
public final fun getAndroid ()Lcom/google/firebase/FirebaseApp;
1214
public final fun getName ()Ljava/lang/String;
1315
public final fun getOptions ()Ldev/gitlive/firebase/FirebaseOptions;
1416
public fun hashCode ()I
@@ -19,7 +21,6 @@ public final class dev/gitlive/firebase/FirebaseKt {
1921
public static final fun app (Ldev/gitlive/firebase/Firebase;Ljava/lang/String;)Ldev/gitlive/firebase/FirebaseApp;
2022
public static final fun apps (Ldev/gitlive/firebase/Firebase;Ljava/lang/Object;)Ljava/util/List;
2123
public static synthetic fun apps$default (Ldev/gitlive/firebase/Firebase;Ljava/lang/Object;ILjava/lang/Object;)Ljava/util/List;
22-
public static final fun getAndroid (Ldev/gitlive/firebase/FirebaseApp;)Lcom/google/firebase/FirebaseApp;
2324
public static final fun getApp (Ldev/gitlive/firebase/Firebase;)Ldev/gitlive/firebase/FirebaseApp;
2425
public static final fun initialize (Ldev/gitlive/firebase/Firebase;Ljava/lang/Object;)Ldev/gitlive/firebase/FirebaseApp;
2526
public static final fun initialize (Ldev/gitlive/firebase/Firebase;Ljava/lang/Object;Ldev/gitlive/firebase/FirebaseOptions;)Ldev/gitlive/firebase/FirebaseApp;

‎firebase-app/api/jvm/firebase-app.api

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ public final class dev/gitlive/firebase/Firebase {
77
}
88

99
public final class dev/gitlive/firebase/FirebaseApp {
10+
public final fun component1 ()Lcom/google/firebase/FirebaseApp;
1011
public final fun delete (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1112
public fun equals (Ljava/lang/Object;)Z
13+
public final fun getAndroid ()Lcom/google/firebase/FirebaseApp;
1214
public final fun getName ()Ljava/lang/String;
1315
public final fun getOptions ()Ldev/gitlive/firebase/FirebaseOptions;
1416
public fun hashCode ()I
@@ -19,7 +21,6 @@ public final class dev/gitlive/firebase/FirebaseKt {
1921
public static final fun app (Ldev/gitlive/firebase/Firebase;Ljava/lang/String;)Ldev/gitlive/firebase/FirebaseApp;
2022
public static final fun apps (Ldev/gitlive/firebase/Firebase;Ljava/lang/Object;)Ljava/util/List;
2123
public static synthetic fun apps$default (Ldev/gitlive/firebase/Firebase;Ljava/lang/Object;ILjava/lang/Object;)Ljava/util/List;
22-
public static final fun getAndroid (Ldev/gitlive/firebase/FirebaseApp;)Lcom/google/firebase/FirebaseApp;
2324
public static final fun getApp (Ldev/gitlive/firebase/Firebase;)Ldev/gitlive/firebase/FirebaseApp;
2425
public static final fun initialize (Ldev/gitlive/firebase/Firebase;Ljava/lang/Object;)Ldev/gitlive/firebase/FirebaseApp;
2526
public static final fun initialize (Ldev/gitlive/firebase/Firebase;Ljava/lang/Object;Ldev/gitlive/firebase/FirebaseOptions;)Ldev/gitlive/firebase/FirebaseApp;

‎firebase-app/src/androidMain/kotlin/dev/gitlive/firebase/firebase.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ public actual typealias FirebaseTooManyRequestsException = com.google.firebase.F
1414

1515
public actual typealias FirebaseApiNotAvailableException = com.google.firebase.FirebaseApiNotAvailableException
1616

17-
public val FirebaseApp.android: com.google.firebase.FirebaseApp get() = android
18-
1917
public actual val Firebase.app: FirebaseApp
2018
get() = FirebaseApp(com.google.firebase.FirebaseApp.getInstance())
2119

@@ -27,7 +25,7 @@ public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, n
2725

2826
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid()))
2927

30-
public actual data class FirebaseApp internal constructor(internal val android: com.google.firebase.FirebaseApp) {
28+
public actual data class FirebaseApp internal constructor(public val android: com.google.firebase.FirebaseApp) {
3129
actual val name: String
3230
get() = android.name
3331
actual val options: FirebaseOptions

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, n
2222

2323
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FirebaseApp(initializeApp(options.toJson()))
2424

25-
public val FirebaseApp.js: JsFirebaseApp get() = js
26-
27-
public actual class FirebaseApp internal constructor(internal val js: JsFirebaseApp) {
25+
public actual class FirebaseApp internal constructor(public val js: JsFirebaseApp) {
2826
public actual val name: String
2927
get() = js.name
3028
public actual val options: FirebaseOptions

‎firebase-auth/api/android/firebase-auth.api

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public final class dev/gitlive/firebase/auth/ActionCodeSettings {
5353

5454
public final class dev/gitlive/firebase/auth/AdditionalUserInfo {
5555
public fun <init> (Lcom/google/firebase/auth/AdditionalUserInfo;)V
56+
public final fun getAndroid ()Lcom/google/firebase/auth/AdditionalUserInfo;
5657
public final fun getProfile ()Ljava/util/Map;
5758
public final fun getProviderId ()Ljava/lang/String;
5859
public final fun getUsername ()Ljava/lang/String;
@@ -84,21 +85,19 @@ public class dev/gitlive/firebase/auth/AuthCredential {
8485
public final class dev/gitlive/firebase/auth/AuthResult {
8586
public fun <init> (Lcom/google/firebase/auth/AuthResult;)V
8687
public final fun getAdditionalUserInfo ()Ldev/gitlive/firebase/auth/AdditionalUserInfo;
88+
public final fun getAndroid ()Lcom/google/firebase/auth/AuthResult;
8789
public final fun getCredential ()Ldev/gitlive/firebase/auth/AuthCredential;
8890
public final fun getUser ()Ldev/gitlive/firebase/auth/FirebaseUser;
8991
}
9092

9193
public final class dev/gitlive/firebase/auth/AuthTokenResult {
9294
public fun <init> (Lcom/google/firebase/auth/GetTokenResult;)V
95+
public final fun getAndroid ()Lcom/google/firebase/auth/GetTokenResult;
9396
public final fun getClaims ()Ljava/util/Map;
9497
public final fun getSignInProvider ()Ljava/lang/String;
9598
public final fun getToken ()Ljava/lang/String;
9699
}
97100

98-
public final class dev/gitlive/firebase/auth/CredentialsKt {
99-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/OAuthProvider;)Lcom/google/firebase/auth/OAuthProvider;
100-
}
101-
102101
public final class dev/gitlive/firebase/auth/EmailAuthProvider {
103102
public static final field INSTANCE Ldev/gitlive/firebase/auth/EmailAuthProvider;
104103
public final fun credential (Ljava/lang/String;Ljava/lang/String;)Ldev/gitlive/firebase/auth/AuthCredential;
@@ -116,6 +115,7 @@ public final class dev/gitlive/firebase/auth/FirebaseAuth {
116115
public final fun confirmPasswordReset (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
117116
public final fun createUserWithEmailAndPassword (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
118117
public final fun fetchSignInMethodsForEmail (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
118+
public final fun getAndroid ()Lcom/google/firebase/auth/FirebaseAuth;
119119
public final fun getAuthStateChanged ()Lkotlinx/coroutines/flow/Flow;
120120
public final fun getCurrentUser ()Ldev/gitlive/firebase/auth/FirebaseUser;
121121
public final fun getIdTokenChanged ()Lkotlinx/coroutines/flow/Flow;
@@ -138,6 +138,7 @@ public final class dev/gitlive/firebase/auth/FirebaseAuth {
138138

139139
public final class dev/gitlive/firebase/auth/FirebaseUser {
140140
public final fun delete (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
141+
public final fun getAndroid ()Lcom/google/firebase/auth/FirebaseUser;
141142
public final fun getDisplayName ()Ljava/lang/String;
142143
public final fun getEmail ()Ljava/lang/String;
143144
public final fun getIdToken (ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -180,6 +181,7 @@ public final class dev/gitlive/firebase/auth/GoogleAuthProvider {
180181
public final class dev/gitlive/firebase/auth/MultiFactor {
181182
public fun <init> (Lcom/google/firebase/auth/MultiFactor;)V
182183
public final fun enroll (Ldev/gitlive/firebase/auth/MultiFactorAssertion;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
184+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactor;
183185
public final fun getEnrolledFactors ()Ljava/util/List;
184186
public final fun getSession (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
185187
public final fun unenroll (Ldev/gitlive/firebase/auth/MultiFactorInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -188,11 +190,13 @@ public final class dev/gitlive/firebase/auth/MultiFactor {
188190

189191
public final class dev/gitlive/firebase/auth/MultiFactorAssertion {
190192
public fun <init> (Lcom/google/firebase/auth/MultiFactorAssertion;)V
193+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactorAssertion;
191194
public final fun getFactorId ()Ljava/lang/String;
192195
}
193196

194197
public final class dev/gitlive/firebase/auth/MultiFactorInfo {
195198
public fun <init> (Lcom/google/firebase/auth/MultiFactorInfo;)V
199+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactorInfo;
196200
public final fun getDisplayName ()Ljava/lang/String;
197201
public final fun getEnrollmentTime ()D
198202
public final fun getFactorId ()Ljava/lang/String;
@@ -201,6 +205,7 @@ public final class dev/gitlive/firebase/auth/MultiFactorInfo {
201205

202206
public final class dev/gitlive/firebase/auth/MultiFactorResolver {
203207
public fun <init> (Lcom/google/firebase/auth/MultiFactorResolver;)V
208+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactorResolver;
204209
public final fun getAuth ()Ldev/gitlive/firebase/auth/FirebaseAuth;
205210
public final fun getHints ()Ljava/util/List;
206211
public final fun getSession ()Ldev/gitlive/firebase/auth/MultiFactorSession;
@@ -209,14 +214,7 @@ public final class dev/gitlive/firebase/auth/MultiFactorResolver {
209214

210215
public final class dev/gitlive/firebase/auth/MultiFactorSession {
211216
public fun <init> (Lcom/google/firebase/auth/MultiFactorSession;)V
212-
}
213-
214-
public final class dev/gitlive/firebase/auth/MultifactorKt {
215-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactor;)Lcom/google/firebase/auth/MultiFactor;
216-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactorAssertion;)Lcom/google/firebase/auth/MultiFactorAssertion;
217-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactorInfo;)Lcom/google/firebase/auth/MultiFactorInfo;
218-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactorResolver;)Lcom/google/firebase/auth/MultiFactorResolver;
219-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/MultiFactorSession;)Lcom/google/firebase/auth/MultiFactorSession;
217+
public final fun getAndroid ()Lcom/google/firebase/auth/MultiFactorSession;
220218
}
221219

222220
public final class dev/gitlive/firebase/auth/OAuthCredential : dev/gitlive/firebase/auth/AuthCredential {
@@ -230,6 +228,7 @@ public final class dev/gitlive/firebase/auth/OAuthProvider {
230228
public fun <init> (Lcom/google/firebase/auth/OAuthProvider;)V
231229
public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ldev/gitlive/firebase/auth/FirebaseAuth;)V
232230
public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ldev/gitlive/firebase/auth/FirebaseAuth;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
231+
public final fun getAndroid ()Lcom/google/firebase/auth/OAuthProvider;
233232
}
234233

235234
public final class dev/gitlive/firebase/auth/OAuthProvider$Companion {
@@ -267,6 +266,7 @@ public final class dev/gitlive/firebase/auth/TwitterAuthProvider {
267266

268267
public final class dev/gitlive/firebase/auth/UserInfo {
269268
public fun <init> (Lcom/google/firebase/auth/UserInfo;)V
269+
public final fun getAndroid ()Lcom/google/firebase/auth/UserInfo;
270270
public final fun getDisplayName ()Ljava/lang/String;
271271
public final fun getEmail ()Ljava/lang/String;
272272
public final fun getPhoneNumber ()Ljava/lang/String;
@@ -275,24 +275,15 @@ public final class dev/gitlive/firebase/auth/UserInfo {
275275
public final fun getUid ()Ljava/lang/String;
276276
}
277277

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-
284278
public final class dev/gitlive/firebase/auth/UserMetaData {
285279
public fun <init> (Lcom/google/firebase/auth/FirebaseUserMetadata;)V
280+
public final fun getAndroid ()Lcom/google/firebase/auth/FirebaseUserMetadata;
286281
public final fun getCreationTime ()Ljava/lang/Double;
287282
public final fun getLastSignInTime ()Ljava/lang/Double;
288283
}
289284

290285
public final class dev/gitlive/firebase/auth/android {
291286
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/AdditionalUserInfo;)Lcom/google/firebase/auth/AdditionalUserInfo;
293-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/AuthResult;)Lcom/google/firebase/auth/AuthResult;
294-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/AuthTokenResult;)Lcom/google/firebase/auth/GetTokenResult;
295-
public static final fun getAndroid (Ldev/gitlive/firebase/auth/FirebaseAuth;)Lcom/google/firebase/auth/FirebaseAuth;
296287
public static final fun getAuth (Ldev/gitlive/firebase/Firebase;)Ldev/gitlive/firebase/auth/FirebaseAuth;
297288
}
298289

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,17 @@ import com.google.firebase.auth.ActionCodeResult.*
1212
import com.google.firebase.auth.FirebaseAuth.AuthStateListener
1313
import dev.gitlive.firebase.Firebase
1414
import dev.gitlive.firebase.FirebaseApp
15-
import dev.gitlive.firebase.android as publicAndroid
1615
import kotlinx.coroutines.channels.awaitClose
1716
import kotlinx.coroutines.flow.Flow
1817
import kotlinx.coroutines.flow.callbackFlow
1918
import kotlinx.coroutines.tasks.await
2019

21-
public val FirebaseAuth.android: com.google.firebase.auth.FirebaseAuth get() = com.google.firebase.auth.FirebaseAuth.getInstance()
22-
2320
public actual val Firebase.auth: FirebaseAuth
2421
get() = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance())
2522

26-
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance(app.publicAndroid))
23+
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance(app.android))
2724

28-
public actual class FirebaseAuth internal constructor(internal val android: com.google.firebase.auth.FirebaseAuth) {
25+
public actual class FirebaseAuth internal constructor(public val android: com.google.firebase.auth.FirebaseAuth) {
2926
public actual val currentUser: FirebaseUser?
3027
get() = android.currentUser?.let { FirebaseUser(it) }
3128

@@ -110,9 +107,7 @@ public actual class FirebaseAuth internal constructor(internal val android: com.
110107
public actual fun useEmulator(host: String, port: Int): Unit = android.useEmulator(host, port)
111108
}
112109

113-
public val AuthResult.android: com.google.firebase.auth.AuthResult get() = android
114-
115-
public actual class AuthResult(internal val android: com.google.firebase.auth.AuthResult) {
110+
public actual class AuthResult(public val android: com.google.firebase.auth.AuthResult) {
116111
public actual val user: FirebaseUser?
117112
get() = android.user?.let { FirebaseUser(it) }
118113
public actual val credential: AuthCredential?
@@ -121,11 +116,8 @@ public actual class AuthResult(internal val android: com.google.firebase.auth.Au
121116
get() = android.additionalUserInfo?.let { AdditionalUserInfo(it) }
122117
}
123118

124-
public val AdditionalUserInfo.android: com.google.firebase.auth.AdditionalUserInfo
125-
get() = android
126-
127119
public actual class AdditionalUserInfo(
128-
internal val android: com.google.firebase.auth.AdditionalUserInfo,
120+
public val android: com.google.firebase.auth.AdditionalUserInfo,
129121
) {
130122
public actual val providerId: String?
131123
get() = android.providerId
@@ -137,9 +129,7 @@ public actual class AdditionalUserInfo(
137129
get() = android.isNewUser
138130
}
139131

140-
public val AuthTokenResult.android: com.google.firebase.auth.GetTokenResult get() = android
141-
142-
public actual class AuthTokenResult(internal val android: com.google.firebase.auth.GetTokenResult) {
132+
public actual class AuthTokenResult(public val android: com.google.firebase.auth.GetTokenResult) {
143133
// actual val authTimestamp: Long
144134
// get() = android.authTimestamp
145135
public actual val claims: Map<String, Any>
@@ -160,7 +150,7 @@ internal fun ActionCodeSettings.toAndroid() = com.google.firebase.auth.ActionCod
160150
.also { androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) } }
161151
.also { dynamicLinkDomain?.run { it.setDynamicLinkDomain(this) } }
162152
.setHandleCodeInApp(canHandleCodeInApp)
163-
.also { iOSBundleId?.run { it.setIOSBundleId(this) } }
153+
.also { iOSBundleId?.run { it.iosBundleId = this } }
164154
.build()
165155

166156
public actual typealias FirebaseAuthException = com.google.firebase.auth.FirebaseAuthException

0 commit comments

Comments
 (0)