From c75b46dee6216f600f2c94a0817f0f90fc8ed029 Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Tue, 25 Jun 2024 15:41:09 +0200 Subject: [PATCH] Prepare 1.7.1 release (#2726) --- CHANGELOG.md | 23 +++++++++++++++++++++++ README.md | 8 ++++---- gradle.properties | 2 +- integration-test/build.gradle.kts | 2 ++ integration-test/gradle.properties | 2 +- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b68a67c0f..cf3c6f4043 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,27 @@ +1.7.1 / 2024-06-25 +================== + +This is a bugfix release that aims to fix missing `kotlinx-serialization-hocon` artifact. +It also contains experimental integration with `kotlinx-io` library. +Kotlin 2.0.0 is used by default. + +## Fixed HOCON publication + +Sadly, 1.7.0 release was published incomplete: `kotlinx-serialization-hocon` artifact is missing from 1.7.0 and 1.7.0-RC releases. +This release fixes this problem and now `kotlinx-serialization-hocon` is available again with 1.7.1 version. +No other changes were made to this artifact. Related ticket: [#2717](https://github.com/Kotlin/kotlinx.serialization/issues/2717). + +## Add integration with a kotlinx-io library + +[`kotlinx-io`](https://github.com/Kotlin/kotlinx-io) is an official multiplatform library that provides basic IO primitives, similar to Okio. +kotlinx.serialization integration is now available in a separate artifact, located at the `kotlinx-serialization-json-io` coordinates. +Integration artifact provides functions similar to existing [Okio integration](https://kotlinlang.org/api/kotlinx.serialization/kotlinx-serialization-json-okio/kotlinx.serialization.json.okio/): `encodeToSink`, `decodeFromSource`, and `decodeSourceToSequence`. +Check out the [PR](https://github.com/Kotlin/kotlinx.serialization/pull/2707) for more details. + +## Other bugfixes + * Prohibited use of elements other than JsonObject in JsonTransformingSerializer with polymorphic serialization (#2715) + 1.7.0 / 2024-06-05 ================== diff --git a/README.md b/README.md index aef2955c14..02ea017b87 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![TeamCity build](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/KotlinTools_KotlinxSerialization_Ko.svg)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=KotlinTools_KotlinxSerialization_Ko&guest=1) [![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-blue.svg?logo=kotlin)](http://kotlinlang.org) -[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-serialization-core/1.7.0)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.7.0) +[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-serialization-core/1.7.1)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.7.1) [![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://kotlinlang.org/api/kotlinx.serialization/) [![Slack channel](https://img.shields.io/badge/chat-slack-blue.svg?logo=slack)](https://kotlinlang.slack.com/messages/serialization/) @@ -164,7 +164,7 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") } ``` @@ -176,7 +176,7 @@ repositories { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0" + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1" } ``` @@ -267,7 +267,7 @@ Ensure the proper version of Kotlin and serialization version: ```xml 2.0.0 - 1.7.0 + 1.7.1 ``` diff --git a/gradle.properties b/gradle.properties index de99883c57..39c94e653d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # group=org.jetbrains.kotlinx -version=1.7.1-SNAPSHOT +version=1.7.2-SNAPSHOT # This version takes precedence if 'bootstrap' property passed to project kotlin.version.snapshot=2.0.255-SNAPSHOT diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts index d723c2d680..aee666e63b 100644 --- a/integration-test/build.gradle.kts +++ b/integration-test/build.gradle.kts @@ -66,6 +66,8 @@ kotlin { implementation(kotlin("stdlib")) implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version") + // To check that all expected artifacts are resolvable: + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-io:$serialization_version") implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$serialization_version") implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:$serialization_version") } diff --git a/integration-test/gradle.properties b/integration-test/gradle.properties index 3e078369ac..6917df662f 100644 --- a/integration-test/gradle.properties +++ b/integration-test/gradle.properties @@ -3,7 +3,7 @@ # mainKotlinVersion=2.0.0 -mainLibVersion=1.7.1-SNAPSHOT +mainLibVersion=1.7.2-SNAPSHOT kotlin.code.style=official kotlin.js.compiler=ir