Skip to content

Commit e52c3be

Browse files
DatL4gDatL4g
committed
align ios to android and js
1 parent e9720e9 commit e52c3be

File tree

16 files changed

+32
-97
lines changed
  • firebase-analytics/src/iosMain/kotlin/dev/gitlive/firebase/analytics
  • firebase-app/src/iosMain/kotlin/dev/gitlive/firebase
  • firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth
  • firebase-config/src/iosMain/kotlin/dev/gitlive/firebase/remoteconfig
  • firebase-crashlytics/src/iosMain/kotlin/dev/gitlive/firebase/crashlytics
  • firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database
  • firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore
  • firebase-functions/src/iosMain/kotlin/dev/gitlive/firebase/functions
  • firebase-installations/src/iosMain/kotlin/dev/gitlive/firebase/installations
  • firebase-messaging/src/iosMain/kotlin/dev/gitlive/firebase/messaging
  • firebase-perf/src/iosMain/kotlin/dev/gitlive/firebase/perf
  • firebase-storage/src/iosMain/kotlin/dev/gitlive/firebase/storage

16 files changed

+32
-97
lines changed

‎firebase-analytics/src/iosMain/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(FIRAnalytics)
1717

18-
public val FirebaseAnalytics.ios: FIRAnalytics.Companion get() = ios
19-
20-
public actual class FirebaseAnalytics(internal val ios: FIRAnalytics.Companion) {
18+
public actual class FirebaseAnalytics(public val ios: FIRAnalytics.Companion) {
2119
public actual fun logEvent(name: String, parameters: Map<String, Any>?) {
2220
val mappedParameters: Map<Any?, Any>? = parameters?.map { it.key to it.value }?.toMap()
2321
ios.logEventWithName(name, mappedParameters)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ public actual open class FirebaseNetworkException(message: String) : FirebaseExc
1212
public actual open class FirebaseTooManyRequestsException(message: String) : FirebaseException(message)
1313
public actual open class FirebaseApiNotAvailableException(message: String) : FirebaseException(message)
1414

15-
public val FirebaseApp.ios: FIRApp get() = ios
16-
1715
public actual val Firebase.app: FirebaseApp
1816
get() = FirebaseApp(FIRApp.defaultApp()!!)
1917

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

2624
public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FIRApp.configureWithOptions(options.toIos()).let { app }
2725

28-
public actual data class FirebaseApp internal constructor(internal val ios: FIRApp) {
26+
public actual data class FirebaseApp internal constructor(public val ios: FIRApp) {
2927
actual val name: String
3028
get() = ios.name
3129
actual val options: FirebaseOptions

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import dev.gitlive.firebase.FirebaseApp
1010
import dev.gitlive.firebase.FirebaseException
1111
import dev.gitlive.firebase.FirebaseNetworkException
1212
import dev.gitlive.firebase.auth.ActionCodeResult.*
13-
import dev.gitlive.firebase.ios
1413
import kotlinx.cinterop.*
1514
import kotlinx.coroutines.CompletableDeferred
1615
import kotlinx.coroutines.channels.awaitClose
@@ -20,16 +19,14 @@ import platform.Foundation.NSError
2019
import platform.Foundation.NSString
2120
import platform.Foundation.NSURL
2221

23-
public val FirebaseAuth.ios: FIRAuth get() = FIRAuth.auth()
24-
2522
public actual val Firebase.auth: FirebaseAuth
2623
get() = FirebaseAuth(FIRAuth.auth())
2724

2825
public actual fun Firebase.auth(app: FirebaseApp): FirebaseAuth = FirebaseAuth(
2926
FIRAuth.authWithApp(app.ios as objcnames.classes.FIRApp),
3027
)
3128

32-
public actual class FirebaseAuth internal constructor(internal val ios: FIRAuth) {
29+
public actual class FirebaseAuth internal constructor(public val ios: FIRAuth) {
3330

3431
public actual val currentUser: FirebaseUser?
3532
get() = ios.currentUser()?.let { FirebaseUser(it) }
@@ -99,9 +96,7 @@ public actual class FirebaseAuth internal constructor(internal val ios: FIRAuth)
9996
public actual fun useEmulator(host: String, port: Int): Unit = ios.useEmulatorWithHost(host, port.toLong())
10097
}
10198

102-
public val AuthResult.ios: FIRAuthDataResult get() = ios
103-
104-
public actual class AuthResult(internal val ios: FIRAuthDataResult) {
99+
public actual class AuthResult(public val ios: FIRAuthDataResult) {
105100
public actual val user: FirebaseUser?
106101
get() = FirebaseUser(ios.user())
107102
public actual val credential: AuthCredential?
@@ -110,10 +105,8 @@ public actual class AuthResult(internal val ios: FIRAuthDataResult) {
110105
get() = ios.additionalUserInfo()?.let { AdditionalUserInfo(it) }
111106
}
112107

113-
public val AdditionalUserInfo.ios: FIRAdditionalUserInfo get() = ios
114-
115108
public actual class AdditionalUserInfo(
116-
internal val ios: FIRAdditionalUserInfo,
109+
public val ios: FIRAdditionalUserInfo,
117110
) {
118111
public actual val providerId: String?
119112
get() = ios.providerID()
@@ -133,8 +126,7 @@ public actual class AdditionalUserInfo(
133126
get() = ios.newUser()
134127
}
135128

136-
public val AuthTokenResult.ios: FIRAuthTokenResult get() = ios
137-
public actual class AuthTokenResult(internal val ios: FIRAuthTokenResult) {
129+
public actual class AuthTokenResult(public val ios: FIRAuthTokenResult) {
138130
// actual val authTimestamp: Long
139131
// get() = ios.authDate
140132
public actual val claims: Map<String, Any>

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ public actual object GoogleAuthProvider {
4242
}
4343
}
4444

45-
public val OAuthProvider.ios: FIROAuthProvider get() = ios
46-
47-
public actual class OAuthProvider(internal val ios: FIROAuthProvider) {
45+
public actual class OAuthProvider(public val ios: FIROAuthProvider) {
4846

4947
public actual constructor(
5048
provider: String,
@@ -70,9 +68,7 @@ public actual class OAuthProvider(internal val ios: FIROAuthProvider) {
7068
}
7169
}
7270

73-
public val PhoneAuthProvider.ios: FIRPhoneAuthProvider get() = ios
74-
75-
public actual class PhoneAuthProvider(internal val ios: FIRPhoneAuthProvider) {
71+
public actual class PhoneAuthProvider(public val ios: FIRPhoneAuthProvider) {
7672

7773
public actual constructor(auth: FirebaseAuth) : this(FIRPhoneAuthProvider.providerWithAuth(auth.ios))
7874

‎firebase-auth/src/iosMain/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 cocoapods.FirebaseAuth.*
88

9-
public val MultiFactor.ios: FIRMultiFactor get() = ios
10-
11-
public actual class MultiFactor(internal val ios: FIRMultiFactor) {
9+
public actual class MultiFactor(public val ios: FIRMultiFactor) {
1210
public actual val enrolledFactors: List<MultiFactorInfo>
1311
get() = ios.enrolledFactors().mapNotNull { info -> (info as? FIRMultiFactorInfo)?.let { MultiFactorInfo(it) } }
1412
public actual suspend fun enroll(multiFactorAssertion: MultiFactorAssertion, displayName: String?): Unit = ios.await { enrollWithAssertion(multiFactorAssertion.ios, displayName, it) }
@@ -17,9 +15,7 @@ public actual class MultiFactor(internal val ios: FIRMultiFactor) {
1715
public actual suspend fun unenroll(factorUid: String): Unit = ios.await { unenrollWithFactorUID(factorUid, it) }
1816
}
1917

20-
public val MultiFactorInfo.ios: FIRMultiFactorInfo get() = ios
21-
22-
public actual class MultiFactorInfo(internal val ios: FIRMultiFactorInfo) {
18+
public actual class MultiFactorInfo(public val ios: FIRMultiFactorInfo) {
2319
public actual val displayName: String?
2420
get() = ios.displayName()
2521
public actual val enrollmentTime: Double
@@ -30,20 +26,14 @@ public actual class MultiFactorInfo(internal val ios: FIRMultiFactorInfo) {
3026
get() = ios.UID()
3127
}
3228

33-
public val MultiFactorAssertion.ios: FIRMultiFactorAssertion get() = ios
34-
35-
public actual class MultiFactorAssertion(internal val ios: FIRMultiFactorAssertion) {
29+
public actual class MultiFactorAssertion(public val ios: FIRMultiFactorAssertion) {
3630
public actual val factorId: String
3731
get() = ios.factorID()
3832
}
3933

40-
public val MultiFactorSession.ios: FIRMultiFactorSession get() = ios
41-
42-
public actual class MultiFactorSession(internal val ios: FIRMultiFactorSession)
43-
44-
public val MultiFactorResolver.ios: FIRMultiFactorResolver get() = ios
34+
public actual class MultiFactorSession(public val ios: FIRMultiFactorSession)
4535

46-
public actual class MultiFactorResolver(internal val ios: FIRMultiFactorResolver) {
36+
public actual class MultiFactorResolver(public val ios: FIRMultiFactorResolver) {
4737
public actual val auth: FirebaseAuth = FirebaseAuth(ios.auth())
4838
public actual val hints: List<MultiFactorInfo> = ios.hints().mapNotNull { hint -> (hint as? FIRMultiFactorInfo)?.let { MultiFactorInfo(it) } }
4939
public actual val session: MultiFactorSession = MultiFactorSession(ios.session())

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import cocoapods.FirebaseAuth.FIRUserInfoProtocol
1010
import cocoapods.FirebaseAuth.FIRUserMetadata
1111
import platform.Foundation.NSURL
1212

13-
public val FirebaseUser.ios: FIRUser get() = ios
14-
15-
public actual class FirebaseUser internal constructor(internal val ios: FIRUser) {
13+
public actual class FirebaseUser internal constructor(public val ios: FIRUser) {
1614
public actual val uid: String
1715
get() = ios.uid()
1816
public actual val displayName: String?
@@ -77,9 +75,7 @@ public actual class FirebaseUser internal constructor(internal val ios: FIRUser)
7775
}
7876
}
7977

80-
public val UserInfo.ios: FIRUserInfoProtocol get() = ios
81-
82-
public actual class UserInfo(internal val ios: FIRUserInfoProtocol) {
78+
public actual class UserInfo(public val ios: FIRUserInfoProtocol) {
8379
public actual val displayName: String?
8480
get() = ios.displayName()
8581
public actual val email: String?
@@ -94,9 +90,7 @@ public actual class UserInfo(internal val ios: FIRUserInfoProtocol) {
9490
get() = ios.uid()
9591
}
9692

97-
public val UserMetaData.ios: FIRUserMetadata get() = ios
98-
99-
public actual class UserMetaData(internal val ios: FIRUserMetadata) {
93+
public actual class UserMetaData(public val ios: FIRUserMetadata) {
10094
public actual val creationTime: Double?
10195
get() = ios.creationDate()?.timeIntervalSinceReferenceDate
10296
public actual val lastSignInTime: Double?

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import dev.gitlive.firebase.Firebase
1212
import dev.gitlive.firebase.FirebaseApp
1313
import dev.gitlive.firebase.FirebaseException
1414
import dev.gitlive.firebase.app
15-
import dev.gitlive.firebase.ios
1615
import kotlinx.coroutines.CompletableDeferred
1716
import kotlinx.datetime.toKotlinInstant
1817
import platform.Foundation.NSError
@@ -22,16 +21,14 @@ import kotlin.time.DurationUnit
2221
import kotlin.time.ExperimentalTime
2322
import kotlin.time.Instant
2423

25-
public val FirebaseRemoteConfig.ios: FIRRemoteConfig get() = FIRRemoteConfig.remoteConfig()
26-
2724
public actual val Firebase.remoteConfig: FirebaseRemoteConfig
2825
get() = FirebaseRemoteConfig(FIRRemoteConfig.remoteConfig())
2926

3027
public actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = FirebaseRemoteConfig(
3128
FIRRemoteConfig.remoteConfigWithApp(Firebase.app.ios as objcnames.classes.FIRApp),
3229
)
3330

34-
public actual class FirebaseRemoteConfig internal constructor(internal val ios: FIRRemoteConfig) {
31+
public actual class FirebaseRemoteConfig internal constructor(public val ios: FIRRemoteConfig) {
3532
@Suppress("UNCHECKED_CAST")
3633
public actual val all: Map<String, FirebaseRemoteConfigValue>
3734
get() {

‎firebase-crashlytics/src/iosMain/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ import dev.gitlive.firebase.Firebase
77
import dev.gitlive.firebase.FirebaseApp
88
import dev.gitlive.firebase.FirebaseException
99

10-
public val FirebaseCrashlytics.ios: FIRCrashlytics get() = FIRCrashlytics.crashlytics()
11-
1210
public actual val Firebase.crashlytics: FirebaseCrashlytics get() =
1311
FirebaseCrashlytics(FIRCrashlytics.crashlytics())
1412

1513
public actual fun Firebase.crashlytics(app: FirebaseApp): FirebaseCrashlytics = FirebaseCrashlytics(FIRCrashlytics.crashlytics())
1614

17-
public actual class FirebaseCrashlytics internal constructor(internal val ios: FIRCrashlytics) {
15+
public actual class FirebaseCrashlytics internal constructor(public val ios: FIRCrashlytics) {
1816

1917
public actual fun recordException(exception: Throwable) {
2018
ios.recordError(exception.asNSError())

‎firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database/database.kt

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import dev.gitlive.firebase.internal.EncodedObject
2929
import dev.gitlive.firebase.internal.decode
3030
import dev.gitlive.firebase.internal.ios
3131
import dev.gitlive.firebase.internal.reencodeTransformation
32-
import dev.gitlive.firebase.ios
3332
import kotlinx.coroutines.CompletableDeferred
3433
import kotlinx.coroutines.FlowPreview
3534
import kotlinx.coroutines.channels.awaitClose
@@ -44,8 +43,6 @@ import kotlinx.serialization.KSerializer
4443
import platform.Foundation.NSError
4544
import platform.Foundation.allObjects
4645

47-
public val FirebaseDatabase.ios: FIRDatabase get() = FIRDatabase.database()
48-
4946
public actual val Firebase.database: FirebaseDatabase
5047
by lazy { FirebaseDatabase(FIRDatabase.database()) }
5148

@@ -59,7 +56,7 @@ public actual fun Firebase.database(app: FirebaseApp, url: String): FirebaseData
5956
FIRDatabase.databaseForApp(app.ios as objcnames.classes.FIRApp, url),
6057
)
6158

62-
public actual class FirebaseDatabase internal constructor(internal val ios: FIRDatabase) {
59+
public actual class FirebaseDatabase internal constructor(public val ios: FIRDatabase) {
6360

6461
public actual fun reference(path: String): DatabaseReference = DatabaseReference(NativeDatabaseReference(ios.referenceWithPath(path), ios.persistenceEnabled))
6562

@@ -102,15 +99,13 @@ internal actual open class NativeQuery(
10299
val persistenceEnabled: Boolean,
103100
)
104101

105-
public val Query.ios: FIRDatabaseQuery get() = nativeQuery.ios
106-
107102
public actual open class Query internal actual constructor(
108103
internal val nativeQuery: NativeQuery,
109104
) {
110105

111106
internal constructor(ios: FIRDatabaseQuery, persistenceEnabled: Boolean) : this(NativeQuery(ios, persistenceEnabled))
112107

113-
internal open val ios: FIRDatabaseQuery = nativeQuery.ios
108+
public open val ios: FIRDatabaseQuery = nativeQuery.ios
114109
public val persistenceEnabled: Boolean = nativeQuery.persistenceEnabled
115110

116111
public actual fun orderByKey(): Query = Query(ios.queryOrderedByKey(), persistenceEnabled)
@@ -212,11 +207,8 @@ internal actual class NativeDatabaseReference internal constructor(
212207
}
213208
}
214209

215-
public val DatabaseReference.ios: FIRDatabaseReference get() = nativeReference.ios
216-
public val DataSnapshot.ios: FIRDataSnapshot get() = ios
217-
218210
public actual class DataSnapshot internal constructor(
219-
internal val ios: FIRDataSnapshot,
211+
public val ios: FIRDataSnapshot,
220212
private val persistenceEnabled: Boolean,
221213
) {
222214

@@ -228,9 +220,9 @@ public actual class DataSnapshot internal constructor(
228220

229221
public actual val value: Any? get() = ios.value
230222

231-
public actual inline fun <reified T> value(): T = decode<T>(value = publicIos.value)
223+
public actual inline fun <reified T> value(): T = decode<T>(value = ios.value)
232224

233-
public actual inline fun <T> value(strategy: DeserializationStrategy<T>, buildSettings: DecodeSettings.Builder.() -> Unit): T = decode(strategy, publicIos.value, buildSettings)
225+
public actual inline fun <T> value(strategy: DeserializationStrategy<T>, buildSettings: DecodeSettings.Builder.() -> Unit): T = decode(strategy, ios.value, buildSettings)
234226

235227
public actual fun child(path: String): DataSnapshot = DataSnapshot(ios.childSnapshotForPath(path), persistenceEnabled)
236228
public actual val hasChildren: Boolean get() = ios.hasChildren()

‎firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import dev.gitlive.firebase.Firebase
1212
import dev.gitlive.firebase.FirebaseApp
1313
import dev.gitlive.firebase.FirebaseException
1414
import dev.gitlive.firebase.firestore.internal.NativeDocumentSnapshotWrapper
15-
import dev.gitlive.firebase.ios
1615
import kotlinx.coroutines.CompletableDeferred
1716
import platform.Foundation.NSError
1817
import platform.Foundation.NSNumber

0 commit comments

Comments
 (0)