diff --git a/build-tools/build.gradle.kts b/build-tools/build.gradle.kts index ee86e29df97..17595da1afc 100644 --- a/build-tools/build.gradle.kts +++ b/build-tools/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") implementation("com.ullink.slack:simpleslackapi:1.2.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.10.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0") implementation("io.ktor:ktor-client-auth:1.2.1") implementation("io.ktor:ktor-client-core:1.2.1") 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 ea441eb0025..b4d9682e6b0 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin import groovy.lang.Closure -import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json +import kotlinx.serialization.* +import kotlinx.serialization.json.* import org.gradle.api.Action import org.gradle.api.Project import org.gradle.process.ExecResult @@ -420,11 +420,11 @@ private fun deviceLauncher(project: Project) = object : ExecutorService { } return out.toString().run { check(isNotEmpty()) - @Serializable + @kotlinx.serialization.Serializable data class DeviceTarget(val name: String, val udid: String, val state: String, val type: String) split("\n") .filter { it.isNotEmpty() } - .map { Json(strictMode = false).parse(DeviceTarget.serializer(), it) } + .map { Json(JsonConfiguration.Default).parse(DeviceTarget.serializer(), it) } .first { it.type == "device" && deviceName?.run { this == it.name } ?: true } diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExternalReportUtils.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExternalReportUtils.kt index 58b30ad8230..ee426c8f3e0 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExternalReportUtils.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExternalReportUtils.kt @@ -2,12 +2,12 @@ package org.jetbrains.kotlin import kotlinx.io.PrintWriter import kotlinx.serialization.* -import kotlinx.serialization.json.Json +import kotlinx.serialization.json.* import java.io.File import java.io.FileReader -@Serializable +@kotlinx.serialization.Serializable data class ExternalTestReport(val statistics: Statistics, val groups: List) @ImplicitReflectionSerializer diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/KonanTestSuiteReport.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/KonanTestSuiteReport.kt index 4e8bc1ea9e1..da2412caa2c 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/KonanTestSuiteReport.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/KonanTestSuiteReport.kt @@ -13,7 +13,7 @@ enum class TestStatus { SKIPPED } -@Serializable +@kotlinx.serialization.Serializable data class Statistics( var passed: Int = 0, var failed: Int = 0, @@ -42,13 +42,13 @@ val Statistics.total: Int class TestFailedException(msg:String) : RuntimeException(msg) -@Serializable +@kotlinx.serialization.Serializable data class KonanTestGroupReport(val name:String, val suites:List) -@Serializable +@kotlinx.serialization.Serializable data class KonanTestSuiteReport(val name: String, val tests: List) -@Serializable +@kotlinx.serialization.Serializable data class KonanTestCaseReport(val name:String, val status: TestStatus, @Optional val comment:String? = null) class KonanTestSuiteReportEnvironment(val name:String, val project: Project, val statistics: Statistics) {