Skip to content

Commit

Permalink
Update to Kotlin 2.0 and prepare 1.7.0 release (#2706)
Browse files Browse the repository at this point in the history
  • Loading branch information
sandwwraith authored Jun 5, 2024
1 parent 1cac162 commit d2dc7d2
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 15 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
==================

Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

Expand Down Expand Up @@ -95,17 +95,17 @@ 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"
}
```

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'
}
```

Expand All @@ -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))
}
Expand All @@ -134,7 +134,7 @@ Groovy DSL:

```gradle
buildscript {
ext.kotlin_version = '2.0.0-RC3'
ext.kotlin_version = '2.0.0'
repositories { mavenCentral() }
dependencies {
Expand Down Expand Up @@ -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")
}
```

Expand All @@ -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"
}
```

Expand Down Expand Up @@ -266,8 +266,8 @@ Ensure the proper version of Kotlin and serialization version:

```xml
<properties>
<kotlin.version>2.0.0-RC3</kotlin.version>
<serialization.version>1.7.0-RC</serialization.version>
<kotlin.version>2.0.0</kotlin.version>
<serialization.version>1.7.0</serialization.version>
</properties>
```

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions integration-test/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d2dc7d2

Please sign in to comment.