Skip to content

Commit 39d3c76

Browse files
committed
get ios tests running
1 parent bc22acd commit 39d3c76

File tree

9 files changed

+25
-14
lines changed

9 files changed

+25
-14
lines changed

firebase-app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ kotlin {
8484
val firebasecore by cinterops.creating {
8585
packageName("cocoapods.FirebaseCore")
8686
defFile(file("$projectDir/src/iosMain/c_interop/FirebaseCore.def"))
87-
compilerOpts("-F$projectDir/../build/Firebase/FirebaseAnalytics")
87+
compilerOpts("-F${rootProject.buildDir}/Firebase/FirebaseAnalytics")
8888
}
8989
}
9090
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
language = Objective-C
22
modules = FirebaseCore
33
compilerOpts = -framework FirebaseCore
4-
linkerOpts = -framework FirebaseCore
4+
linkerOpts = -framework FirebaseCore -framework FIRAnalyticsConnector -framework FirebaseAnalytics -framework FirebaseCore -framework FirebaseCoreDiagnostics -framework FirebaseInstallations -framework FirebaseInstanceID -framework GoogleAppMeasurement -framework GoogleDataTransport -framework GoogleDataTransportCCTSupport -framework GoogleUtilities -framework PromisesObjC -framework nanopb -framework StoreKit -lsqlite3

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ actual fun Firebase.apps(context: Any?) = FIRApp.allApps()
3838
.values
3939
.map { FirebaseApp(it as FIRApp) }
4040

41-
private fun FirebaseOptions.toIos() = FIROptions().apply {
42-
bundleID = this@toIos.applicationId
41+
private fun FirebaseOptions.toIos() = FIROptions(this@toIos.applicationId, "846484016111").apply {
4342
APIKey = this@toIos.apiKey
4443
databaseURL = this@toIos.databaseUrl
4544
trackingID = this@toIos.gaTrackingId

firebase-auth/build.gradle.kts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,17 @@ kotlin {
4343
publishLibraryVariants("release", "debug")
4444
}
4545
val iosArm64 = iosArm64()
46-
val iosX64 = iosX64("ios")
46+
val iosX64 = iosX64("ios") {
47+
binaries {
48+
getTest("DEBUG").apply {
49+
linkerOpts("-F${rootProject.buildDir}/Firebase/FirebaseAnalytics")
50+
linkerOpts("-F${rootProject.buildDir}/Firebase/FirebaseAuth")
51+
linkerOpts("-F${rootProject.buildDir}/Firebase/GoogleSignIn")
52+
linkerOpts("-ObjC")
53+
// compilerOpts("-framework AppAuth")
54+
}
55+
}
56+
}
4757

4858
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
4959
kotlinOptions.freeCompilerArgs += listOf(
@@ -73,6 +83,7 @@ kotlin {
7383
packageName("cocoapods.FirebaseAuth")
7484
defFile(file("$projectDir/src/iosMain/c_interop/FirebaseAuth.def"))
7585
compilerOpts("-F$projectDir/../build/Firebase/FirebaseAuth")
86+
compilerOpts("-F$projectDir/../build/Firebase/GoogleSignIn")
7687
}
7788
}
7889
}
@@ -81,6 +92,7 @@ kotlin {
8192
summary = ""
8293
homepage = ""
8394
}
95+
8496
}
8597
}
8698

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
language = Objective-C
22
modules = FirebaseAuth
33
compilerOpts = -framework FirebaseAuth
4-
linkerOpts = -framework FirebaseAuth
4+
linkerOpts = -framework FirebaseAuth -framework GTMSessionFetcher

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ import kotlinx.coroutines.runBlocking
1111
import kotlin.test.BeforeTest
1212
import kotlin.test.Test
1313
import kotlin.test.assertEquals
14+
import platform.Foundation.NSBundle
1415

1516
class FirebaseAuthTest {
1617

1718
@BeforeTest
1819
fun initializeFirebase() {
1920
Firebase.initialize(null, FirebaseOptions(
20-
applicationId ="fir-kotlin-sdk",
21-
apiKey = "AIzaSyDft_DSsVA7KPJj_GItUvMLjk6wbOdGBOs",
22-
databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
21+
applicationId = "1:846484016111:ios:dd1f6688bad7af768c841a",
22+
apiKey = "AIzaSyCK87dcMFhzCz_kJVs2cT2AVlqOTLuyWV0",
23+
databaseUrl = "https://fir- kotlin-sdk.firebaseio.com",
2324
storageBucket = "fir-kotlin-sdk.appspot.com",
24-
projectId ="fir-kotlin-sdk"
25+
projectId = "fir-kotlin-sdk"
2526
))
26-
2727
}
2828

2929
@Test

firebase-database/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ kotlin {
7070
val firebaseDatabase by cinterops.creating {
7171
packageName("cocoapods.FirebaseDatabase")
7272
defFile(file("$projectDir/src/iosMain/c_interop/FirebaseDatabase.def"))
73-
compilerOpts("-F$projectDir/../build/Firebase/FirebaseDatabase")
73+
compilerOpts("-F${rootProject.buildDir}/Firebase/FirebaseDatabase")
7474
}
7575
}
7676
}

firebase-firestore/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ kotlin {
7171
val firebasefirestore by cinterops.creating {
7272
packageName("cocoapods.FirebaseFirestore")
7373
defFile(file("$projectDir/src/iosMain/c_interop/FirebaseFirestore.def"))
74-
compilerOpts("-F$projectDir/../build/Firebase/FirebaseFirestore")
74+
compilerOpts("-F${rootProject.buildDir}/Firebase/FirebaseFirestore")
7575
}
7676
}
7777
}

firebase-functions/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ kotlin {
7070
val firebasefunctions by cinterops.creating {
7171
packageName("cocoapods.FirebaseFunctions")
7272
defFile(file("$projectDir/src/iosMain/c_interop/FirebaseFunctions.def"))
73-
compilerOpts("-F$projectDir/../build/Firebase/FirebaseFunctions")
73+
compilerOpts("-F${rootProject.buildDir}/Firebase/FirebaseFunctions")
7474
}
7575
}
7676
}

0 commit comments

Comments
 (0)