Skip to content

Commit 3dd9614

Browse files
ReedyukReedyuk
committed
Added adjustments for ios test.
1 parent 39d3c76 commit 3dd9614

File tree

7 files changed

+32
-18
lines changed

7 files changed

+32
-18
lines changed

‎build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import de.undercouch.gradle.tasks.download.Download
22
import org.apache.tools.ant.taskdefs.condition.Os
33

44
plugins {
5-
kotlin("multiplatform") version "1.3.72" apply false
5+
kotlin("multiplatform") version "1.3.70" apply false
66
id("de.undercouch.download").version("3.4.3")
77
id("base")
88
}
@@ -131,17 +131,17 @@ subprojects {
131131

132132
dependencies {
133133
"commonMainImplementation"(kotlin("stdlib-common"))
134-
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.4")
134+
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5-native-mt")
135135
"jsMainImplementation"(kotlin("stdlib-js"))
136136
"jsMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.4")
137137
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4")
138138
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.4")
139-
"iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.4")
140-
"iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.4")
139+
"iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5-native-mt")
140+
"iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.5-native-mt")
141141
"commonTestImplementation"(kotlin("test-common"))
142142
"commonTestImplementation"(kotlin("test-annotations-common"))
143-
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.4")
144-
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.4")
143+
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5-native-mt")
144+
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.5-native-mt")
145145
"jsTestImplementation"(kotlin("test-js"))
146146
"androidAndroidTestImplementation"(kotlin("test-junit"))
147147
"androidAndroidTestImplementation"("junit:junit:4.12")

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ actual class FirebaseAuth internal constructor(val android: com.google.firebase.
2222
get() = android.currentUser?.let { FirebaseUser(it) }
2323

2424
actual suspend fun signInWithEmailAndPassword(email: String, password: String) =
25-
AuthResult(android.signInWithEmailAndPassword(email, password).await())
25+
AuthResult(android.signInWithCustomToken(email).await())
26+
//AuthResult(android.signInWithEmailAndPassword(email, password).await())
2627

2728
actual suspend fun signInWithCustomToken(token: String) =
2829
AuthResult(android.signInWithCustomToken(token).await())

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ package dev.gitlive.firebase.auth
77
import dev.gitlive.firebase.Firebase
88
import dev.gitlive.firebase.FirebaseOptions
99
import dev.gitlive.firebase.initialize
10-
import kotlinx.coroutines.runBlocking
10+
import kotlinx.coroutines.*
11+
import platform.Foundation.*
1112
import kotlin.test.BeforeTest
1213
import kotlin.test.Test
1314
import kotlin.test.assertEquals
14-
import platform.Foundation.NSBundle
1515

1616
class FirebaseAuthTest {
1717

@@ -27,8 +27,21 @@ class FirebaseAuthTest {
2727
}
2828

2929
@Test
30-
fun testSignInWithUsernameAndPassword() = runBlocking {
31-
val result = Firebase.auth.signInWithEmailAndPassword("[email protected]", "test123")
30+
fun testSignInWithUsernameAndPassword() {
31+
val auth = Firebase.auth
32+
var done = false
33+
lateinit var result: AuthResult
34+
//GlobalScope.launch(Dispatchers.Unconfined) {
35+
MainScope().launch {
36+
result = auth.signInWithEmailAndPassword("[email protected]", "test123")
37+
println("Stop the run, cant stop the run")
38+
done = true
39+
}
40+
while (!done) {
41+
println("LoopStart")
42+
NSRunLoop.mainRunLoop.runMode(NSDefaultRunLoopMode, beforeDate = NSDate.create(timeInterval = 1.0, sinceDate = NSDate()))
43+
println("LoopEnd")
44+
}
3245
assertEquals("mn8kgIFnxLO7il8GpTa5g0ObP6I2", result.user!!.uid)
3346
}
3447
}

‎firebase-common/src/androidMain/kotlin/dev/gitlive/firebase/_decoders.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import kotlinx.serialization.KSerializer
99
import kotlinx.serialization.SerialDescriptor
1010
import kotlinx.serialization.StructureKind
1111

12-
actual fun FirebaseDecoder.structureDecoder(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder = when(desc.kind as StructureKind) {
12+
actual fun FirebaseDecoder.structureDecoder(descriptor: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder = when(descriptor.kind as StructureKind) {
1313
StructureKind.CLASS, StructureKind.OBJECT -> (value as Map<*, *>).let { map ->
1414
FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index -> map[desc.getElementName(index)] }
1515
}

‎firebase-common/src/androidMain/kotlin/dev/gitlive/firebase/_encoders.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import kotlinx.serialization.SerialDescriptor
1010
import kotlinx.serialization.StructureKind
1111
import kotlin.collections.set
1212

13-
actual fun FirebaseEncoder.structureEncoder(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeEncoder = when(desc.kind as StructureKind) {
13+
actual fun FirebaseEncoder.structureEncoder(descriptor: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeEncoder = when(descriptor.kind as StructureKind) {
1414
StructureKind.LIST -> mutableListOf<Any?>()
1515
.also { value = it }
1616
.let { FirebaseCompositeEncoder(shouldEncodeElementDefault, positiveInfinity) { _, index, value -> it.add(index, value) } }
1717
StructureKind.MAP -> mutableListOf<Any?>()
1818
.let { FirebaseCompositeEncoder(shouldEncodeElementDefault, positiveInfinity, { value = it.chunked(2).associate { (k, v) -> k to v } }) { _, _, value -> it.add(value) } }
1919
StructureKind.CLASS, StructureKind.OBJECT -> mutableMapOf<Any?, Any?>()
2020
.also { value = it }
21-
.let { FirebaseCompositeEncoder(shouldEncodeElementDefault, positiveInfinity) { _, index, value -> it[desc.getElementName(index)] = value } }
21+
.let { FirebaseCompositeEncoder(shouldEncodeElementDefault, positiveInfinity) { _, index, value -> it[descriptor.getElementName(index)] = value } }
2222
}

‎firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/_decoders.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlinx.serialization.StructureKind
1111
import kotlin.js.Json
1212

1313
@Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE")
14-
actual fun FirebaseDecoder.structureDecoder(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder = when(desc.kind as StructureKind) {
14+
actual fun FirebaseDecoder.structureDecoder(descriptor: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeDecoder = when(descriptor.kind as StructureKind) {
1515
StructureKind.CLASS, StructureKind.OBJECT -> (value as Json).let { json ->
1616
FirebaseClassDecoder(js("Object").keys(value).length as Int, { json[it] != undefined }) {
1717
desc, index -> json[desc.getElementName(index)]

‎firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/_encoders.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import kotlinx.serialization.SerialDescriptor
1010
import kotlinx.serialization.StructureKind
1111
import kotlin.js.json
1212

13-
actual fun FirebaseEncoder.structureEncoder(desc: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeEncoder = when(desc.kind as StructureKind) {
14-
StructureKind.LIST -> Array<Any?>(desc.elementsCount) { null }
13+
actual fun FirebaseEncoder.structureEncoder(descriptor: SerialDescriptor, vararg typeParams: KSerializer<*>): CompositeEncoder = when(descriptor.kind as StructureKind) {
14+
StructureKind.LIST -> Array<Any?>(descriptor.elementsCount) { null }
1515
.also { value = it }
1616
.let { FirebaseCompositeEncoder(shouldEncodeElementDefault, positiveInfinity) { _, index, value -> it[index] = value } }
1717
StructureKind.MAP -> {
@@ -22,6 +22,6 @@ actual fun FirebaseEncoder.structureEncoder(desc: SerialDescriptor, vararg typeP
2222
}
2323
StructureKind.CLASS, StructureKind.OBJECT -> json()
2424
.also { value = it }
25-
.let { FirebaseCompositeEncoder(shouldEncodeElementDefault, positiveInfinity) { _, index, value -> it[desc.getElementName(index)] = value } }
25+
.let { FirebaseCompositeEncoder(shouldEncodeElementDefault, positiveInfinity) { _, index, value -> it[descriptor.getElementName(index)] = value } }
2626
}
2727

0 commit comments

Comments
 (0)