From a1894ed027cdc34a421513e0b70dc39a752fd82f Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Mon, 12 Dec 2022 18:52:57 +0100 Subject: [PATCH] Update runtime dependency in kotlinx.serialization plugin tests to 1.4.1 --- gradle/verification-metadata.xml | 24 +++++++++++++++++++ .../kotlinx-serialization/build.gradle.kts | 4 ++-- .../testData/boxIr/enumsAreCached.kt | 2 +- .../testData/diagnostics/SerializableEnums.kt | 1 + .../testData/firMembers/enums.kt | 4 ++-- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 36c2f8e2bdd..9088c3eb5e2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -7987,6 +7987,12 @@ + + + + + + @@ -8039,6 +8045,12 @@ + + + + + + @@ -8109,6 +8121,12 @@ + + + + + + @@ -8147,6 +8165,12 @@ + + + + + + diff --git a/plugins/kotlinx-serialization/build.gradle.kts b/plugins/kotlinx-serialization/build.gradle.kts index 453a1017869..a32f4511789 100644 --- a/plugins/kotlinx-serialization/build.gradle.kts +++ b/plugins/kotlinx-serialization/build.gradle.kts @@ -29,8 +29,8 @@ dependencies { testImplementation(project(":kotlinx-serialization-compiler-plugin.backend")) testImplementation(project(":kotlinx-serialization-compiler-plugin.cli")) - testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0-RC") - testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0-RC") + testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1") + testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") testRuntimeOnly(intellijCore()) testRuntimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } diff --git a/plugins/kotlinx-serialization/testData/boxIr/enumsAreCached.kt b/plugins/kotlinx-serialization/testData/boxIr/enumsAreCached.kt index 5a7f33830e0..8d104fd3b8b 100644 --- a/plugins/kotlinx-serialization/testData/boxIr/enumsAreCached.kt +++ b/plugins/kotlinx-serialization/testData/boxIr/enumsAreCached.kt @@ -25,7 +25,7 @@ fun testSerializers(): String { if (!str1.contains("kotlinx.serialization.internal.EnumSerializer")) return str1 /** - * Serialization 1.4.1+ have runtime factories to create EnumSerializer instead of synthetic $serializer, saving bytecode + * Serialization 1.5.0+ have runtime factories to create EnumSerializer instead of synthetic $serializer, saving bytecode * and bringing consistency. After updating the version, uncomment this block. */ // val str2 = cs[1].toString() diff --git a/plugins/kotlinx-serialization/testData/diagnostics/SerializableEnums.kt b/plugins/kotlinx-serialization/testData/diagnostics/SerializableEnums.kt index d837e063d96..9bc69c3b086 100644 --- a/plugins/kotlinx-serialization/testData/diagnostics/SerializableEnums.kt +++ b/plugins/kotlinx-serialization/testData/diagnostics/SerializableEnums.kt @@ -7,6 +7,7 @@ import kotlinx.serialization.encoding.* enum class SimpleEnum { A, B } +// Annotated enums do not require @Serializable if runtime has proper factory funciton (runtime ver. >= 1.5.0) enum class MarkedNameEnum { @SerialName("a") A, B} @Serializable diff --git a/plugins/kotlinx-serialization/testData/firMembers/enums.kt b/plugins/kotlinx-serialization/testData/firMembers/enums.kt index 95a08263bc0..98fb4384cc2 100644 --- a/plugins/kotlinx-serialization/testData/firMembers/enums.kt +++ b/plugins/kotlinx-serialization/testData/firMembers/enums.kt @@ -25,8 +25,8 @@ fun testSerializers(): String { if (!str1.contains("kotlinx.serialization.internal.EnumSerializer")) return str1 /** - * Serialization 1.4.1+ have runtime factories to create EnumSerializer instead of synthetic $serializer, saving bytecode - * and bringing consistency. After updating the version, uncomment this block. + * Serialization 1.5.0+ have runtime factories to create EnumSerializer instead of synthetic $serializer, saving bytecode + * and bringing consistency. */ // val str2 = cs[1].toString() // if (!str2.contains("kotlinx.serialization.internal.EnumSerializer")) return str2