Skip to content

Added fixes for imports. #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion firebase-auth/api/android/firebase-auth.api
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public final class dev/gitlive/firebase/auth/AuthTokenResult {
}

public final class dev/gitlive/firebase/auth/CredentialsKt {
public static final fun getAndroid (Lcom/google/firebase/auth/OAuthProvider;)Lcom/google/firebase/auth/OAuthProvider;
public static final fun getAndroid (Ldev/gitlive/firebase/auth/OAuthProvider;)Lcom/google/firebase/auth/OAuthProvider;
}

public final class dev/gitlive/firebase/auth/EmailAuthProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package dev.gitlive.firebase.auth

import android.app.Activity
import com.google.firebase.FirebaseException
import com.google.firebase.auth.OAuthProvider
import com.google.firebase.auth.PhoneAuthOptions
import com.google.firebase.auth.PhoneAuthProvider
import kotlinx.coroutines.CompletableDeferred
Expand Down Expand Up @@ -52,17 +51,17 @@ public actual object GoogleAuthProvider {
}
}

public val OAuthProvider.android: OAuthProvider get() = android
public val OAuthProvider.android: com.google.firebase.auth.OAuthProvider get() = android

public actual class OAuthProvider(internal val android: OAuthProvider) {
public actual class OAuthProvider(internal val android: com.google.firebase.auth.OAuthProvider) {

public actual constructor(
provider: String,
scopes: List<String>,
customParameters: Map<String, String>,
auth: FirebaseAuth,
) : this(
OAuthProvider
com.google.firebase.auth.OAuthProvider
.newBuilder(provider, auth.android)
.setScopes(scopes)
.addCustomParameters(customParameters)
Expand All @@ -71,7 +70,7 @@ public actual class OAuthProvider(internal val android: OAuthProvider) {

public actual companion object {
public actual fun credential(providerId: String, accessToken: String?, idToken: String?, rawNonce: String?): OAuthCredential {
val builder = OAuthProvider.newCredentialBuilder(providerId)
val builder = com.google.firebase.auth.OAuthProvider.newCredentialBuilder(providerId)
accessToken?.let { builder.setAccessToken(it) }
idToken?.let { builder.setIdToken(it) }
rawNonce?.let { builder.setIdTokenWithRawNonce(idToken!!, it) }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package dev.gitlive.firebase.firestore.internal

import com.google.firebase.firestore.FirebaseFirestore
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Executor

// Since on iOS Callback threads are set as settings, we store the settings explicitly here as well
internal val callbackExecutorMap = ConcurrentHashMap<FirebaseFirestore, Executor>()
internal val callbackExecutorMap = ConcurrentHashMap<com.google.firebase.firestore.FirebaseFirestore, Executor>()
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package dev.gitlive.firebase.perf.metrics

import com.google.firebase.perf.metrics.Trace
import dev.gitlive.firebase.perf.session.PerfSession

public actual class Trace internal constructor(private val android: Trace) {
public val Trace.android: com.google.firebase.perf.metrics.Trace get() = android

public actual class Trace internal constructor(internal val android: com.google.firebase.perf.metrics.Trace) {

public actual fun start() {
android.start()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package dev.gitlive.firebase.perf

import com.google.firebase.FirebaseException
import dev.gitlive.firebase.Firebase
import dev.gitlive.firebase.FirebaseApp
import dev.gitlive.firebase.android as publicAndroid
Expand All @@ -25,4 +24,4 @@ public actual class FirebasePerformance(internal val android: com.google.firebas
}
}

public actual open class FirebasePerformanceException(message: String) : FirebaseException(message)
public actual open class FirebasePerformanceException(message: String) : com.google.firebase.FirebaseException(message)
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package dev.gitlive.firebase.perf.session

import com.google.firebase.perf.session.PerfSession
public val PerfSession.android: com.google.firebase.perf.session.PerfSession get() = android

public val PerfSession.android: PerfSession get() = android

public class PerfSession internal constructor(internal val android: PerfSession)
public class PerfSession internal constructor(internal val android: com.google.firebase.perf.session.PerfSession)
Loading