From 76d456152066a01e41a5e7b9c25b0db9b54bb378 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Wed, 29 Jan 2020 13:03:14 +0300 Subject: [PATCH] Use stable json configuration with non strict mode --- .../src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt index b4d9682e6b0..821ec385b91 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt @@ -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) split("\n") .filter { it.isNotEmpty() } - .map { Json(JsonConfiguration.Default).parse(DeviceTarget.serializer(), it) } - .first { + .map { + Json(JsonConfiguration.Stable.copy(strictMode = false)) + .parse(DeviceTarget.serializer(), it) + }.first { it.type == "device" && deviceName?.run { this == it.name } ?: true } .udid