Skip to content

Commit bcd892c

Browse files
committed
lintage
1 parent e92a168 commit bcd892c

File tree

73 files changed

+261
-459
lines changed

Some content is hidden

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

73 files changed

+261
-459
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import kotlin.time.Duration
1313
public actual val Firebase.analytics: FirebaseAnalytics
1414
get() = FirebaseAnalytics(com.google.firebase.Firebase.analytics)
1515

16-
public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics =
17-
FirebaseAnalytics(com.google.firebase.Firebase.analytics)
16+
public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics = FirebaseAnalytics(com.google.firebase.Firebase.analytics)
1817

1918
public val FirebaseAnalytics.android: com.google.firebase.analytics.FirebaseAnalytics get() = android
2019

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import kotlin.time.Duration
1111
public actual val Firebase.analytics: FirebaseAnalytics
1212
get() = FirebaseAnalytics(getAnalytics())
1313

14-
public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics =
15-
FirebaseAnalytics(getAnalytics(app.js))
14+
public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics = FirebaseAnalytics(getAnalytics(app.js))
1615

1716
public val FirebaseAnalytics.js: dev.gitlive.firebase.analytics.externals.FirebaseAnalytics get() = js
1817

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,13 @@ public val FirebaseApp.android: com.google.firebase.FirebaseApp get() = android
1919
public actual val Firebase.app: FirebaseApp
2020
get() = FirebaseApp(com.google.firebase.FirebaseApp.getInstance())
2121

22-
public actual fun Firebase.app(name: String): FirebaseApp =
23-
FirebaseApp(com.google.firebase.FirebaseApp.getInstance(name))
22+
public actual fun Firebase.app(name: String): FirebaseApp = FirebaseApp(com.google.firebase.FirebaseApp.getInstance(name))
2423

25-
public actual fun Firebase.initialize(context: Any?): FirebaseApp? =
26-
com.google.firebase.FirebaseApp.initializeApp(context as Context)?.let { FirebaseApp(it) }
24+
public actual fun Firebase.initialize(context: Any?): FirebaseApp? = com.google.firebase.FirebaseApp.initializeApp(context as Context)?.let { FirebaseApp(it) }
2725

28-
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
29-
FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid(), name))
26+
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp = FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid(), name))
3027

31-
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp =
32-
FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid()))
28+
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid()))
3329

3430
public actual data class FirebaseApp internal constructor(internal val android: com.google.firebase.FirebaseApp) {
3531
actual val name: String

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ public val FirebaseApp.ios: FIRApp get() = ios
1717
public actual val Firebase.app: FirebaseApp
1818
get() = FirebaseApp(FIRApp.defaultApp()!!)
1919

20-
public actual fun Firebase.app(name: String): FirebaseApp =
21-
FirebaseApp(FIRApp.appNamed(name)!!)
20+
public actual fun Firebase.app(name: String): FirebaseApp = FirebaseApp(FIRApp.appNamed(name)!!)
2221

23-
public actual fun Firebase.initialize(context: Any?): FirebaseApp? =
24-
FIRApp.configure().let { app }
22+
public actual fun Firebase.initialize(context: Any?): FirebaseApp? = FIRApp.configure().let { app }
2523

26-
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
27-
FIRApp.configureWithName(name, options.toIos()).let { app(name) }
24+
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp = FIRApp.configureWithName(name, options.toIos()).let { app(name) }
2825

29-
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp =
30-
FIRApp.configureWithOptions(options.toIos()).let { app }
26+
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FIRApp.configureWithOptions(options.toIos()).let { app }
3127

3228
public actual data class FirebaseApp internal constructor(internal val ios: FIRApp) {
3329
actual val name: String

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,13 @@ import dev.gitlive.firebase.externals.FirebaseApp as JsFirebaseApp
1414
public actual val Firebase.app: FirebaseApp
1515
get() = FirebaseApp(getApp())
1616

17-
public actual fun Firebase.app(name: String): FirebaseApp =
18-
FirebaseApp(getApp(name))
17+
public actual fun Firebase.app(name: String): FirebaseApp = FirebaseApp(getApp(name))
1918

20-
public actual fun Firebase.initialize(context: Any?): FirebaseApp? =
21-
throw UnsupportedOperationException("Cannot initialize firebase without options in JS")
19+
public actual fun Firebase.initialize(context: Any?): FirebaseApp? = throw UnsupportedOperationException("Cannot initialize firebase without options in JS")
2220

23-
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
24-
FirebaseApp(initializeApp(options.toJson(), name))
21+
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp = FirebaseApp(initializeApp(options.toJson(), name))
2522

26-
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp =
27-
FirebaseApp(initializeApp(options.toJson()))
23+
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FirebaseApp(initializeApp(options.toJson()))
2824

2925
public val FirebaseApp.js: JsFirebaseApp get() = js
3026

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ public val FirebaseAuth.android: com.google.firebase.auth.FirebaseAuth get() = c
2323
public actual val Firebase.auth: FirebaseAuth
2424
get() = FirebaseAuth(com.google.firebase.auth.FirebaseAuth.getInstance())
2525

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

2928
public actual class FirebaseAuth internal constructor(internal val android: com.google.firebase.auth.FirebaseAuth) {
3029
public actual val currentUser: FirebaseUser?
@@ -55,8 +54,7 @@ public actual class FirebaseAuth internal constructor(internal val android: com.
5554
android.confirmPasswordReset(code, newPassword).await()
5655
}
5756

58-
public actual suspend fun createUserWithEmailAndPassword(email: String, password: String): AuthResult =
59-
AuthResult(android.createUserWithEmailAndPassword(email, password).await())
57+
public actual suspend fun createUserWithEmailAndPassword(email: String, password: String): AuthResult = AuthResult(android.createUserWithEmailAndPassword(email, password).await())
6058

6159
@Suppress("DEPRECATION")
6260
public actual suspend fun fetchSignInMethodsForEmail(email: String): List<String> = android.fetchSignInMethodsForEmail(email).await().signInMethods.orEmpty()
@@ -71,19 +69,15 @@ public actual class FirebaseAuth internal constructor(internal val android: com.
7169

7270
public actual fun isSignInWithEmailLink(link: String): Boolean = android.isSignInWithEmailLink(link)
7371

74-
public actual suspend fun signInWithEmailAndPassword(email: String, password: String): AuthResult =
75-
AuthResult(android.signInWithEmailAndPassword(email, password).await())
72+
public actual suspend fun signInWithEmailAndPassword(email: String, password: String): AuthResult = AuthResult(android.signInWithEmailAndPassword(email, password).await())
7673

77-
public actual suspend fun signInWithCustomToken(token: String): AuthResult =
78-
AuthResult(android.signInWithCustomToken(token).await())
74+
public actual suspend fun signInWithCustomToken(token: String): AuthResult = AuthResult(android.signInWithCustomToken(token).await())
7975

8076
public actual suspend fun signInAnonymously(): AuthResult = AuthResult(android.signInAnonymously().await())
8177

82-
public actual suspend fun signInWithCredential(authCredential: AuthCredential): AuthResult =
83-
AuthResult(android.signInWithCredential(authCredential.android).await())
78+
public actual suspend fun signInWithCredential(authCredential: AuthCredential): AuthResult = AuthResult(android.signInWithCredential(authCredential.android).await())
8479

85-
public actual suspend fun signInWithEmailLink(email: String, link: String): AuthResult =
86-
AuthResult(android.signInWithEmailLink(email, link).await())
80+
public actual suspend fun signInWithEmailLink(email: String, link: String): AuthResult = AuthResult(android.signInWithEmailLink(email, link).await())
8781

8882
public actual suspend fun signOut(): Unit = android.signOut()
8983

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,10 @@ public actual class FirebaseAuth internal constructor(internal val ios: FIRAuth)
5353
public actual suspend fun applyActionCode(code: String): Unit = ios.await { applyActionCode(code, it) }
5454
public actual suspend fun confirmPasswordReset(code: String, newPassword: String): Unit = ios.await { confirmPasswordResetWithCode(code, newPassword, it) }
5555

56-
public actual suspend fun createUserWithEmailAndPassword(email: String, password: String): AuthResult =
57-
AuthResult(ios.awaitResult { createUserWithEmail(email = email, password = password, completion = it) })
56+
public actual suspend fun createUserWithEmailAndPassword(email: String, password: String): AuthResult = AuthResult(ios.awaitResult { createUserWithEmail(email = email, password = password, completion = it) })
5857

5958
@Suppress("UNCHECKED_CAST")
60-
public actual suspend fun fetchSignInMethodsForEmail(email: String): List<String> =
61-
ios.awaitResult<FIRAuth, List<*>?> { fetchSignInMethodsForEmail(email, it) }.orEmpty() as List<String>
59+
public actual suspend fun fetchSignInMethodsForEmail(email: String): List<String> = ios.awaitResult<FIRAuth, List<*>?> { fetchSignInMethodsForEmail(email, it) }.orEmpty() as List<String>
6260

6361
public actual suspend fun sendPasswordResetEmail(email: String, actionCodeSettings: ActionCodeSettings?) {
6462
ios.await { actionCodeSettings?.let { actionSettings -> sendPasswordResetWithEmail(email, actionSettings.toIos(), it) } ?: sendPasswordResetWithEmail(email = email, completion = it) }
@@ -68,20 +66,15 @@ public actual class FirebaseAuth internal constructor(internal val ios: FIRAuth)
6866

6967
public actual fun isSignInWithEmailLink(link: String): Boolean = ios.isSignInWithEmailLink(link)
7068

71-
public actual suspend fun signInWithEmailAndPassword(email: String, password: String): AuthResult =
72-
AuthResult(ios.awaitResult { signInWithEmail(email = email, password = password, completion = it) })
69+
public actual suspend fun signInWithEmailAndPassword(email: String, password: String): AuthResult = AuthResult(ios.awaitResult { signInWithEmail(email = email, password = password, completion = it) })
7370

74-
public actual suspend fun signInWithCustomToken(token: String): AuthResult =
75-
AuthResult(ios.awaitResult { signInWithCustomToken(token, it) })
71+
public actual suspend fun signInWithCustomToken(token: String): AuthResult = AuthResult(ios.awaitResult { signInWithCustomToken(token, it) })
7672

77-
public actual suspend fun signInAnonymously(): AuthResult =
78-
AuthResult(ios.awaitResult { signInAnonymouslyWithCompletion(it) })
73+
public actual suspend fun signInAnonymously(): AuthResult = AuthResult(ios.awaitResult { signInAnonymouslyWithCompletion(it) })
7974

80-
public actual suspend fun signInWithCredential(authCredential: AuthCredential): AuthResult =
81-
AuthResult(ios.awaitResult { signInWithCredential(authCredential.ios, it) })
75+
public actual suspend fun signInWithCredential(authCredential: AuthCredential): AuthResult = AuthResult(ios.awaitResult { signInWithCredential(authCredential.ios, it) })
8276

83-
public actual suspend fun signInWithEmailLink(email: String, link: String): AuthResult =
84-
AuthResult(ios.awaitResult { signInWithEmail(email = email, link = link, completion = it) })
77+
public actual suspend fun signInWithEmailLink(email: String, link: String): AuthResult = AuthResult(ios.awaitResult { signInWithEmail(email = email, link = link, completion = it) })
8578

8679
public actual suspend fun signOut(): Unit = ios.throwError { signOut(it) }
8780

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ public actual object EmailAuthProvider {
1818
public actual fun credential(
1919
email: String,
2020
password: String,
21-
): AuthCredential =
22-
AuthCredential(FIREmailAuthProvider.credentialWithEmail(email = email, password = password))
21+
): AuthCredential = AuthCredential(FIREmailAuthProvider.credentialWithEmail(email = email, password = password))
2322

2423
public actual fun credentialWithLink(
2524
email: String,
2625
emailLink: String,
27-
): AuthCredential =
28-
AuthCredential(FIREmailAuthProvider.credentialWithEmail(email = email, link = emailLink))
26+
): AuthCredential = AuthCredential(FIREmailAuthProvider.credentialWithEmail(email = email, link = emailLink))
2927
}
3028

3129
public actual object FacebookAuthProvider {

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,17 @@ public actual class FirebaseUser internal constructor(internal val ios: FIRUser)
4040

4141
public actual suspend fun reload(): Unit = ios.await { reloadWithCompletion(it) }
4242

43-
public actual suspend fun getIdToken(forceRefresh: Boolean): String? =
44-
ios.awaitResult { getIDTokenForcingRefresh(forceRefresh, it) }
43+
public actual suspend fun getIdToken(forceRefresh: Boolean): String? = ios.awaitResult { getIDTokenForcingRefresh(forceRefresh, it) }
4544

46-
public actual suspend fun getIdTokenResult(forceRefresh: Boolean): AuthTokenResult =
47-
AuthTokenResult(ios.awaitResult { getIDTokenResultForcingRefresh(forceRefresh, it) })
45+
public actual suspend fun getIdTokenResult(forceRefresh: Boolean): AuthTokenResult = AuthTokenResult(ios.awaitResult { getIDTokenResultForcingRefresh(forceRefresh, it) })
4846

49-
public actual suspend fun linkWithCredential(credential: AuthCredential): AuthResult =
50-
AuthResult(ios.awaitResult { linkWithCredential(credential.ios, it) })
47+
public actual suspend fun linkWithCredential(credential: AuthCredential): AuthResult = AuthResult(ios.awaitResult { linkWithCredential(credential.ios, it) })
5148

5249
public actual suspend fun reauthenticate(credential: AuthCredential) {
5350
ios.awaitResult<FIRUser, FIRAuthDataResult?> { reauthenticateWithCredential(credential.ios, it) }
5451
}
5552

56-
public actual suspend fun reauthenticateAndRetrieveData(credential: AuthCredential): AuthResult =
57-
AuthResult(ios.awaitResult { reauthenticateWithCredential(credential.ios, it) })
53+
public actual suspend fun reauthenticateAndRetrieveData(credential: AuthCredential): AuthResult = AuthResult(ios.awaitResult { reauthenticateWithCredential(credential.ios, it) })
5854

5955
public actual suspend fun sendEmailVerification(actionCodeSettings: ActionCodeSettings?): Unit = ios.await {
6056
actionCodeSettings?.let { settings -> sendEmailVerificationWithActionCodeSettings(settings.toIos(), it) }

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

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ import dev.gitlive.firebase.auth.externals.AdditionalUserInfo as JsAdditionalUse
4141
public actual val Firebase.auth: FirebaseAuth
4242
get() = rethrow { FirebaseAuth(getAuth()) }
4343

44-
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth =
45-
rethrow { FirebaseAuth(getAuth(app.js)) }
44+
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = rethrow { FirebaseAuth(getAuth(app.js)) }
4645

4746
public val FirebaseAuth.js: Auth get() = js
4847

@@ -74,41 +73,31 @@ public actual class FirebaseAuth internal constructor(internal val js: Auth) {
7473
public actual suspend fun applyActionCode(code: String): Unit = rethrow { applyActionCode(js, code).await() }
7574
public actual suspend fun confirmPasswordReset(code: String, newPassword: String): Unit = rethrow { confirmPasswordReset(js, code, newPassword).await() }
7675

77-
public actual suspend fun createUserWithEmailAndPassword(email: String, password: String): AuthResult =
78-
rethrow { AuthResult(createUserWithEmailAndPassword(js, email, password).await()) }
76+
public actual suspend fun createUserWithEmailAndPassword(email: String, password: String): AuthResult = rethrow { AuthResult(createUserWithEmailAndPassword(js, email, password).await()) }
7977

8078
public actual suspend fun fetchSignInMethodsForEmail(email: String): List<String> = rethrow { fetchSignInMethodsForEmail(js, email).await().asList() }
8179

82-
public actual suspend fun sendPasswordResetEmail(email: String, actionCodeSettings: ActionCodeSettings?): Unit =
83-
rethrow { sendPasswordResetEmail(js, email, actionCodeSettings?.toJson()).await() }
80+
public actual suspend fun sendPasswordResetEmail(email: String, actionCodeSettings: ActionCodeSettings?): Unit = rethrow { sendPasswordResetEmail(js, email, actionCodeSettings?.toJson()).await() }
8481

85-
public actual suspend fun sendSignInLinkToEmail(email: String, actionCodeSettings: ActionCodeSettings): Unit =
86-
rethrow { sendSignInLinkToEmail(js, email, actionCodeSettings.toJson()).await() }
82+
public actual suspend fun sendSignInLinkToEmail(email: String, actionCodeSettings: ActionCodeSettings): Unit = rethrow { sendSignInLinkToEmail(js, email, actionCodeSettings.toJson()).await() }
8783

8884
public actual fun isSignInWithEmailLink(link: String): Boolean = rethrow { isSignInWithEmailLink(js, link) }
8985

90-
public actual suspend fun signInWithEmailAndPassword(email: String, password: String): AuthResult =
91-
rethrow { AuthResult(signInWithEmailAndPassword(js, email, password).await()) }
86+
public actual suspend fun signInWithEmailAndPassword(email: String, password: String): AuthResult = rethrow { AuthResult(signInWithEmailAndPassword(js, email, password).await()) }
9287

93-
public actual suspend fun signInWithCustomToken(token: String): AuthResult =
94-
rethrow { AuthResult(signInWithCustomToken(js, token).await()) }
88+
public actual suspend fun signInWithCustomToken(token: String): AuthResult = rethrow { AuthResult(signInWithCustomToken(js, token).await()) }
9589

96-
public actual suspend fun signInAnonymously(): AuthResult =
97-
rethrow { AuthResult(signInAnonymously(js).await()) }
90+
public actual suspend fun signInAnonymously(): AuthResult = rethrow { AuthResult(signInAnonymously(js).await()) }
9891

99-
public actual suspend fun signInWithCredential(authCredential: AuthCredential): AuthResult =
100-
rethrow { AuthResult(signInWithCredential(js, authCredential.js).await()) }
92+
public actual suspend fun signInWithCredential(authCredential: AuthCredential): AuthResult = rethrow { AuthResult(signInWithCredential(js, authCredential.js).await()) }
10193

102-
public actual suspend fun signInWithEmailLink(email: String, link: String): AuthResult =
103-
rethrow { AuthResult(signInWithEmailLink(js, email, link).await()) }
94+
public actual suspend fun signInWithEmailLink(email: String, link: String): AuthResult = rethrow { AuthResult(signInWithEmailLink(js, email, link).await()) }
10495

10596
public actual suspend fun signOut(): Unit = rethrow { signOut(js).await() }
10697

107-
public actual suspend fun updateCurrentUser(user: FirebaseUser): Unit =
108-
rethrow { updateCurrentUser(js, user.js).await() }
98+
public actual suspend fun updateCurrentUser(user: FirebaseUser): Unit = rethrow { updateCurrentUser(js, user.js).await() }
10999

110-
public actual suspend fun verifyPasswordResetCode(code: String): String =
111-
rethrow { verifyPasswordResetCode(js, code).await() }
100+
public actual suspend fun verifyPasswordResetCode(code: String): String = rethrow { verifyPasswordResetCode(js, code).await() }
112101

113102
public actual suspend fun <T : ActionCodeResult> checkActionCode(code: String): T = rethrow {
114103
val result = checkActionCode(js, code).await()

0 commit comments

Comments
 (0)