azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use stable json configuration with non strict mode

Browse Source
This commit is contained in:
Pavel Punegov
2020-01-29 13:03:14 +03:00
committed by Pavel Punegov
parent 851ef95672
commit 76d4561520
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
+4 -2
View File
@@ -424,8 +424,10 @@ private fun deviceLauncher(project: Project) = object : ExecutorService {
data class DeviceTarget(val name: String, val udid: String, val state: String, val type: String) data class DeviceTarget(val name: String, val udid: String, val state: String, val type: String)
split("\n") split("\n")
.filter { it.isNotEmpty() } .filter { it.isNotEmpty() }
.map { Json(JsonConfiguration.Default).parse(DeviceTarget.serializer(), it) } .map {
.first { Json(JsonConfiguration.Stable.copy(strictMode = false))
.parse(DeviceTarget.serializer(), it)
}.first {
it.type == "device" && deviceName?.run { this == it.name } ?: true it.type == "device" && deviceName?.run { this == it.name } ?: true
} }
.udid .udid