Skip to content

Commit 4fa08d2

Browse files
authored
Merge branch 'master' into add-database-reference-testing
2 parents a0bd867 + 9604d00 commit 4fa08d2

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ subprojects {
197197
}
198198

199199
dependencies {
200-
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
201-
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2")
200+
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt")
201+
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2-native-mt")
202202
"androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.1"))
203203
"commonTestImplementation"(kotlin("test-common"))
204204
"commonTestImplementation"(kotlin("test-annotations-common"))
205-
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
205+
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt")
206206
"jsTestImplementation"(kotlin("test-js"))
207207
"androidAndroidTestImplementation"(kotlin("test-junit"))
208208
"androidAndroidTestImplementation"("junit:junit:4.13.2")

firebase-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@gitlive/firebase-common": "1.4.3",
2727
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
29-
"kotlinx-coroutines-core": "1.5.2"
29+
"kotlinx-coroutines-core": "1.5.2-native-mt"
3030
}
3131
}

firebase-auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@gitlive/firebase-app": "1.4.3",
2727
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
29-
"kotlinx-coroutines-core": "1.5.2"
29+
"kotlinx-coroutines-core": "1.5.2-native-mt"
3030
}
3131
}

firebase-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"dependencies": {
2626
"firebase": "9.4.1",
2727
"kotlin": "1.5.31",
28-
"kotlinx-coroutines-core": "1.5.2",
28+
"kotlinx-coroutines-core": "1.5.2-native-mt",
2929
"kotlinx-serialization-kotlinx-serialization-runtime": "1.3.0"
3030
}
3131
}

firebase-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@gitlive/firebase-app": "1.4.3",
2727
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
29-
"kotlinx-coroutines-core": "1.5.2"
29+
"kotlinx-coroutines-core": "1.5.2-native-mt"
3030
}
3131
}

firebase-database/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@gitlive/firebase-app": "1.4.3",
2727
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
29-
"kotlinx-coroutines-core": "1.5.2"
29+
"kotlinx-coroutines-core": "1.5.2-native-mt"
3030
}
3131
}

firebase-firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@gitlive/firebase-app": "1.4.3",
2727
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
29-
"kotlinx-coroutines-core": "1.5.2"
29+
"kotlinx-coroutines-core": "1.5.2-native-mt"
3030
}
3131
}

firebase-functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"@gitlive/firebase-app": "1.4.3",
2727
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
29-
"kotlinx-coroutines-core": "1.5.2"
29+
"kotlinx-coroutines-core": "1.5.2-native-mt"
3030
}
3131
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ firebase-app.skipIosTests=false
2525
firebase-auth.skipIosTests=true
2626
firebase-common.skipIosTests=false
2727
firebase-config.skipIosTests=false
28-
firebase-database.skipIosTests=false
28+
firebase-database.skipIosTests=true
2929
firebase-firestore.skipIosTests=false
3030
firebase-functions.skipIosTests=false
3131
firebase-installations.skipIosTests=false

0 commit comments

Comments
 (0)