File tree Expand file tree Collapse file tree 9 files changed +19
-20
lines changed
Expand file tree Collapse file tree 9 files changed +19
-20
lines changed Original file line number Diff line number Diff line change @@ -207,12 +207,12 @@ subprojects {
207207 }
208208
209209 dependencies {
210- " commonMainImplementation" (" org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1 " )
211- " androidMainImplementation" (" org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.1 " )
210+ " commonMainImplementation" (" org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 " )
211+ " androidMainImplementation" (" org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2 " )
212212 " androidMainImplementation" (platform(" com.google.firebase:firebase-bom:28.4.0" ))
213213 " commonTestImplementation" (kotlin(" test-common" ))
214214 " commonTestImplementation" (kotlin(" test-annotations-common" ))
215- " commonTestImplementation" (" org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1 " )
215+ " commonTestImplementation" (" org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 " )
216216 " jsTestImplementation" (kotlin(" test-js" ))
217217 " androidAndroidTestImplementation" (kotlin(" test-junit" ))
218218 " androidAndroidTestImplementation" (" junit:junit:4.13.2" )
Original file line number Diff line number Diff line change 2626 "@gitlive/firebase-common" : " 1.4.2" ,
2727 "firebase" : " 8.10.0" ,
2828 "kotlin" : " 1.5.30" ,
29- "kotlinx-coroutines-core" : " 1.5.1 "
29+ "kotlinx-coroutines-core" : " 1.5.2 "
3030 }
3131}
Original file line number Diff line number Diff line change 2626 "@gitlive/firebase-app" : " 1.4.2" ,
2727 "firebase" : " 8.10.0" ,
2828 "kotlin" : " 1.5.30" ,
29- "kotlinx-coroutines-core" : " 1.5.1 "
29+ "kotlinx-coroutines-core" : " 1.5.2 "
3030 }
3131}
Original file line number Diff line number Diff line change @@ -46,15 +46,8 @@ kotlin {
4646 publishAllLibraryVariants()
4747 }
4848
49- fun nativeTargetConfig (): KotlinNativeTarget .() -> Unit = {
50-
51- }
52-
53- if (project.extra[" ideaActive" ] as Boolean ) {
54- iosX64(" ios" , nativeTargetConfig())
55- } else {
56- ios(configure = nativeTargetConfig())
57- }
49+ ios()
50+ iosSimulatorArm64()
5851
5952 js {
6053 useCommonJs()
@@ -89,7 +82,7 @@ kotlin {
8982
9083 val commonMain by getting {
9184 dependencies {
92- api(" org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2 " )
85+ api(" org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.0-RC " )
9386 }
9487 }
9588
@@ -100,6 +93,12 @@ kotlin {
10093 }
10194
10295 val iosMain by getting
96+ val iosSimulatorArm64Main by getting
97+ iosSimulatorArm64Main.dependsOn(iosMain)
98+
99+ val iosTest by sourceSets.getting
100+ val iosSimulatorArm64Test by sourceSets.getting
101+ iosSimulatorArm64Test.dependsOn(iosTest)
103102
104103 val jsMain by getting {
105104 dependencies {
Original file line number Diff line number Diff line change 2525 "dependencies" : {
2626 "firebase" : " 8.10.0" ,
2727 "kotlin" : " 1.5.30" ,
28- "kotlinx-coroutines-core" : " 1.5.1 " ,
28+ "kotlinx-coroutines-core" : " 1.5.2 " ,
2929 "kotlinx-serialization-kotlinx-serialization-runtime" : " 1.2.2"
3030 }
3131}
Original file line number Diff line number Diff line change 2626 "@gitlive/firebase-app" : " 1.4.2" ,
2727 "firebase" : " 8.10.0" ,
2828 "kotlin" : " 1.5.30" ,
29- "kotlinx-coroutines-core" : " 1.5.1 "
29+ "kotlinx-coroutines-core" : " 1.5.2 "
3030 }
3131}
Original file line number Diff line number Diff line change 2626 "@gitlive/firebase-app" : " 1.4.2" ,
2727 "firebase" : " 8.10.0" ,
2828 "kotlin" : " 1.5.30" ,
29- "kotlinx-coroutines-core" : " 1.5.1 "
29+ "kotlinx-coroutines-core" : " 1.5.2 "
3030 }
3131}
Original file line number Diff line number Diff line change 2626 "@gitlive/firebase-app" : " 1.4.2" ,
2727 "firebase" : " 8.10.0" ,
2828 "kotlin" : " 1.5.30" ,
29- "kotlinx-coroutines-core" : " 1.5.1 "
29+ "kotlinx-coroutines-core" : " 1.5.2 "
3030 }
3131}
Original file line number Diff line number Diff line change 2626 "@gitlive/firebase-app" : " 1.4.2" ,
2727 "firebase" : " 8.10.0" ,
2828 "kotlin" : " 1.5.30" ,
29- "kotlinx-coroutines-core" : " 1.5.1 "
29+ "kotlinx-coroutines-core" : " 1.5.2 "
3030 }
3131}
You can’t perform that action at this time.
0 commit comments