From d2dc7d2978bd62971e8ab00de197d59d7e378ed2 Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Wed, 5 Jun 2024 18:58:12 +0200 Subject: [PATCH] Update to Kotlin 2.0 and prepare 1.7.0 release (#2706) --- CHANGELOG.md | 10 ++++++++++ README.md | 22 +++++++++++----------- gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- integration-test/gradle.properties | 4 ++-- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 749e066776..7b68a67c0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ +1.7.0 / 2024-06-05 +================== + +This release contains all of the changes from 1.7.0-RC and is compatible with Kotlin 2.0. +Please note that for reasons explained in the [1.7.0-RC changelog](https://github.com/Kotlin/kotlinx.serialization/releases/tag/v1.7.0-RC), it may not be possible to use it with the Kotlin 1.9.x +compiler plugin. Yet, it is still fully backwards compatible with previous versions. + +The only difference with 1.7.0-RC is that `classDiscriminatorMode` property in `JsonBuilder` is marked as experimental, +as it should have been when it was introduced (#2680). + 1.7.0-RC / 2024-05-16 ================== diff --git a/README.md b/README.md index 7dce89c1de..aef2955c14 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-RC)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.7.0-RC) +[![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) [![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/) @@ -95,8 +95,8 @@ Kotlin DSL: ```kotlin plugins { - kotlin("jvm") version "2.0.0-RC3" // or kotlin("multiplatform") or any other kotlin plugin - kotlin("plugin.serialization") version "2.0.0-RC3" + kotlin("jvm") version "2.0.0" // or kotlin("multiplatform") or any other kotlin plugin + kotlin("plugin.serialization") version "2.0.0" } ``` @@ -104,8 +104,8 @@ Groovy DSL: ```gradle plugins { - id 'org.jetbrains.kotlin.multiplatform' version '2.0.0-RC3' - id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0-RC3' + id 'org.jetbrains.kotlin.multiplatform' version '2.0.0' + id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0' } ``` @@ -123,7 +123,7 @@ buildscript { repositories { mavenCentral() } dependencies { - val kotlinVersion = "2.0.0-RC3" + val kotlinVersion = "2.0.0" classpath(kotlin("gradle-plugin", version = kotlinVersion)) classpath(kotlin("serialization", version = kotlinVersion)) } @@ -134,7 +134,7 @@ Groovy DSL: ```gradle buildscript { - ext.kotlin_version = '2.0.0-RC3' + ext.kotlin_version = '2.0.0' repositories { mavenCentral() } dependencies { @@ -164,7 +164,7 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0-RC") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0") } ``` @@ -176,7 +176,7 @@ repositories { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0-RC" + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0" } ``` @@ -266,8 +266,8 @@ Ensure the proper version of Kotlin and serialization version: ```xml - 2.0.0-RC3 - 1.7.0-RC + 2.0.0 + 1.7.0 ``` diff --git a/gradle.properties b/gradle.properties index 9ccf242b9c..de99883c57 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # group=org.jetbrains.kotlinx -version=1.7.0-SNAPSHOT +version=1.7.1-SNAPSHOT # This version takes precedence if 'bootstrap' property passed to project kotlin.version.snapshot=2.0.255-SNAPSHOT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6152842710..e3642e2fe1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.0.0-RC3" +kotlin = "2.0.0" kover = "0.8.0-Beta2" dokka = "1.9.20" knit = "0.5.0" diff --git a/integration-test/gradle.properties b/integration-test/gradle.properties index 75224e5e9c..3e078369ac 100644 --- a/integration-test/gradle.properties +++ b/integration-test/gradle.properties @@ -2,8 +2,8 @@ # Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. # -mainKotlinVersion=2.0.0-RC3 -mainLibVersion=1.7.0-SNAPSHOT +mainKotlinVersion=2.0.0 +mainLibVersion=1.7.1-SNAPSHOT kotlin.code.style=official kotlin.js.compiler=ir