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 {
207
207
}
208
208
209
209
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 " )
212
212
" androidMainImplementation" (platform(" com.google.firebase:firebase-bom:28.4.0" ))
213
213
" commonTestImplementation" (kotlin(" test-common" ))
214
214
" 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 " )
216
216
" jsTestImplementation" (kotlin(" test-js" ))
217
217
" androidAndroidTestImplementation" (kotlin(" test-junit" ))
218
218
" androidAndroidTestImplementation" (" junit:junit:4.13.2" )
Original file line number Diff line number Diff line change 26
26
"@gitlive/firebase-common" : " 1.4.2" ,
27
27
"firebase" : " 8.10.0" ,
28
28
"kotlin" : " 1.5.30" ,
29
- "kotlinx-coroutines-core" : " 1.5.1 "
29
+ "kotlinx-coroutines-core" : " 1.5.2 "
30
30
}
31
31
}
Original file line number Diff line number Diff line change 26
26
"@gitlive/firebase-app" : " 1.4.2" ,
27
27
"firebase" : " 8.10.0" ,
28
28
"kotlin" : " 1.5.30" ,
29
- "kotlinx-coroutines-core" : " 1.5.1 "
29
+ "kotlinx-coroutines-core" : " 1.5.2 "
30
30
}
31
31
}
Original file line number Diff line number Diff line change @@ -46,15 +46,8 @@ kotlin {
46
46
publishAllLibraryVariants()
47
47
}
48
48
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()
58
51
59
52
js {
60
53
useCommonJs()
@@ -89,7 +82,7 @@ kotlin {
89
82
90
83
val commonMain by getting {
91
84
dependencies {
92
- api(" org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2 " )
85
+ api(" org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.0-RC " )
93
86
}
94
87
}
95
88
@@ -100,6 +93,12 @@ kotlin {
100
93
}
101
94
102
95
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)
103
102
104
103
val jsMain by getting {
105
104
dependencies {
Original file line number Diff line number Diff line change 25
25
"dependencies" : {
26
26
"firebase" : " 8.10.0" ,
27
27
"kotlin" : " 1.5.30" ,
28
- "kotlinx-coroutines-core" : " 1.5.1 " ,
28
+ "kotlinx-coroutines-core" : " 1.5.2 " ,
29
29
"kotlinx-serialization-kotlinx-serialization-runtime" : " 1.2.2"
30
30
}
31
31
}
Original file line number Diff line number Diff line change 26
26
"@gitlive/firebase-app" : " 1.4.2" ,
27
27
"firebase" : " 8.10.0" ,
28
28
"kotlin" : " 1.5.30" ,
29
- "kotlinx-coroutines-core" : " 1.5.1 "
29
+ "kotlinx-coroutines-core" : " 1.5.2 "
30
30
}
31
31
}
Original file line number Diff line number Diff line change 26
26
"@gitlive/firebase-app" : " 1.4.2" ,
27
27
"firebase" : " 8.10.0" ,
28
28
"kotlin" : " 1.5.30" ,
29
- "kotlinx-coroutines-core" : " 1.5.1 "
29
+ "kotlinx-coroutines-core" : " 1.5.2 "
30
30
}
31
31
}
Original file line number Diff line number Diff line change 26
26
"@gitlive/firebase-app" : " 1.4.2" ,
27
27
"firebase" : " 8.10.0" ,
28
28
"kotlin" : " 1.5.30" ,
29
- "kotlinx-coroutines-core" : " 1.5.1 "
29
+ "kotlinx-coroutines-core" : " 1.5.2 "
30
30
}
31
31
}
Original file line number Diff line number Diff line change 26
26
"@gitlive/firebase-app" : " 1.4.2" ,
27
27
"firebase" : " 8.10.0" ,
28
28
"kotlin" : " 1.5.30" ,
29
- "kotlinx-coroutines-core" : " 1.5.1 "
29
+ "kotlinx-coroutines-core" : " 1.5.2 "
30
30
}
31
31
}
You can’t perform that action at this time.
0 commit comments