Skip to content

Commit d2dc7d2

Browse files
authored
Update to Kotlin 2.0 and prepare 1.7.0 release (#2706)
1 parent 1cac162 commit d2dc7d2

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11

2+
1.7.0 / 2024-06-05
3+
==================
4+
5+
This release contains all of the changes from 1.7.0-RC and is compatible with Kotlin 2.0.
6+
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
7+
compiler plugin. Yet, it is still fully backwards compatible with previous versions.
8+
9+
The only difference with 1.7.0-RC is that `classDiscriminatorMode` property in `JsonBuilder` is marked as experimental,
10+
as it should have been when it was introduced (#2680).
11+
212
1.7.0-RC / 2024-05-16
313
==================
414

README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
66
[![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)
77
[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-blue.svg?logo=kotlin)](http://kotlinlang.org)
8-
[![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)
8+
[![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)
99
[![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://kotlinlang.org/api/kotlinx.serialization/)
1010
[![Slack channel](https://img.shields.io/badge/chat-slack-blue.svg?logo=slack)](https://kotlinlang.slack.com/messages/serialization/)
1111

@@ -95,17 +95,17 @@ Kotlin DSL:
9595

9696
```kotlin
9797
plugins {
98-
kotlin("jvm") version "2.0.0-RC3" // or kotlin("multiplatform") or any other kotlin plugin
99-
kotlin("plugin.serialization") version "2.0.0-RC3"
98+
kotlin("jvm") version "2.0.0" // or kotlin("multiplatform") or any other kotlin plugin
99+
kotlin("plugin.serialization") version "2.0.0"
100100
}
101101
```
102102

103103
Groovy DSL:
104104

105105
```gradle
106106
plugins {
107-
id 'org.jetbrains.kotlin.multiplatform' version '2.0.0-RC3'
108-
id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0-RC3'
107+
id 'org.jetbrains.kotlin.multiplatform' version '2.0.0'
108+
id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0'
109109
}
110110
```
111111

@@ -123,7 +123,7 @@ buildscript {
123123
repositories { mavenCentral() }
124124

125125
dependencies {
126-
val kotlinVersion = "2.0.0-RC3"
126+
val kotlinVersion = "2.0.0"
127127
classpath(kotlin("gradle-plugin", version = kotlinVersion))
128128
classpath(kotlin("serialization", version = kotlinVersion))
129129
}
@@ -134,7 +134,7 @@ Groovy DSL:
134134

135135
```gradle
136136
buildscript {
137-
ext.kotlin_version = '2.0.0-RC3'
137+
ext.kotlin_version = '2.0.0'
138138
repositories { mavenCentral() }
139139
140140
dependencies {
@@ -164,7 +164,7 @@ repositories {
164164
}
165165

166166
dependencies {
167-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0-RC")
167+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
168168
}
169169
```
170170

@@ -176,7 +176,7 @@ repositories {
176176
}
177177
178178
dependencies {
179-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0-RC"
179+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0"
180180
}
181181
```
182182

@@ -266,8 +266,8 @@ Ensure the proper version of Kotlin and serialization version:
266266

267267
```xml
268268
<properties>
269-
<kotlin.version>2.0.0-RC3</kotlin.version>
270-
<serialization.version>1.7.0-RC</serialization.version>
269+
<kotlin.version>2.0.0</kotlin.version>
270+
<serialization.version>1.7.0</serialization.version>
271271
</properties>
272272
```
273273

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
group=org.jetbrains.kotlinx
6-
version=1.7.0-SNAPSHOT
6+
version=1.7.1-SNAPSHOT
77

88
# This version takes precedence if 'bootstrap' property passed to project
99
kotlin.version.snapshot=2.0.255-SNAPSHOT

gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "2.0.0-RC3"
2+
kotlin = "2.0.0"
33
kover = "0.8.0-Beta2"
44
dokka = "1.9.20"
55
knit = "0.5.0"

integration-test/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
#
44

5-
mainKotlinVersion=2.0.0-RC3
6-
mainLibVersion=1.7.0-SNAPSHOT
5+
mainKotlinVersion=2.0.0
6+
mainLibVersion=1.7.1-SNAPSHOT
77

88
kotlin.code.style=official
99
kotlin.js.compiler=ir

0 commit comments

Comments
 (0)