Skip to content

Commit 8c67db0

Browse files
committed
only call initialize in initializeFirebase if necessary
1 parent f33bead commit 8c67db0

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ subprojects {
149149
"androidAndroidTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6")
150150
"androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.1")
151151
"androidAndroidTestImplementation"("androidx.test:runner:1.1.0")
152-
"androidAndroidTestUtil"("com.android.support.test:orchestrator:1.0.2")
153152
}
154153
}
155154

firebase-app/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ android {
3333
}
3434
packagingOptions {
3535
pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
36+
pickFirst("META-INF/AL2.0")
37+
pickFirst("META-INF/LGPL2.1")
3638
}
3739
}
3840

firebase-auth/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ android {
1212
minSdkVersion(property("minSdkVersion") as Int)
1313
targetSdkVersion(property("targetSdkVersion") as Int)
1414
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
15-
testInstrumentationRunnerArguments["clearPackageData"] = "true"
1615
}
1716
sourceSets {
1817
getByName("main") {
@@ -21,7 +20,6 @@ android {
2120
getByName("androidTest").java.srcDir(file("src/androidAndroidTest/kotlin"))
2221
}
2322
testOptions {
24-
execution = "ANDROID_TEST_ORCHESTRATOR"
2523
unitTests.apply {
2624
isIncludeAndroidResources = true
2725
}

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

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

77
import dev.gitlive.firebase.*
88
import kotlin.random.Random
9-
import kotlin.test.BeforeTest
10-
import kotlin.test.Test
11-
import kotlin.test.assertEquals
12-
import kotlin.test.assertNotEquals
9+
import kotlin.test.*
1310

1411
expect val context: Any
1512
expect fun runTest(test: suspend () -> Unit)
@@ -18,15 +15,17 @@ class FirebaseAuthTest {
1815

1916
@BeforeTest
2017
fun initializeFirebase() {
21-
Firebase.initialize(
22-
context,
23-
FirebaseOptions(
24-
applicationId = "1:846484016111:ios:dd1f6688bad7af768c841a",
25-
apiKey = "AIzaSyCK87dcMFhzCz_kJVs2cT2AVlqOTLuyWV0",
26-
databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
27-
storageBucket = "fir-kotlin-sdk.appspot.com",
28-
projectId = "fir-kotlin-sdk"
29-
)
18+
Firebase
19+
.takeIf { Firebase.apps(context).isEmpty() }
20+
?.initialize(
21+
context,
22+
FirebaseOptions(
23+
applicationId = "1:846484016111:ios:dd1f6688bad7af768c841a",
24+
apiKey = "AIzaSyCK87dcMFhzCz_kJVs2cT2AVlqOTLuyWV0",
25+
databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
26+
storageBucket = "fir-kotlin-sdk.appspot.com",
27+
projectId = "fir-kotlin-sdk"
28+
)
3029
)
3130
}
3231

0 commit comments

Comments
 (0)