Skip to content

Commit 43d5f78

Browse files
authored
Update Kotlin to 1.4.30 release and prepare 1.1.0 release (#1340)
1 parent f10d8c6 commit 43d5f78

File tree

7 files changed

+33
-19
lines changed

7 files changed

+33
-19
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2+
1.1.0 / 2021-02-17
3+
==================
4+
5+
This release contains all features and bugfixes from 1.1.0-RC plus an additional fix for incorrect exception type
6+
(#1325 — Throw `SerializationException` instead of `IllegalStateException` in `EnumSerializer`) and uses release version of Kotlin 1.4.30.
7+
8+
In the light of [JCenter shutdown](https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/), starting from 1.1.0-RC and now on,
9+
all new releases of kotlinx.serialization are published directly to Maven Central and therefore are not available in `https://kotlin.bintray.com/kotlinx/` repository.
10+
We suggest you to remove `jcenter()` and other kotlin bintray repositories from your buildscripts and to use `mavenCentral()` repository instead.
11+
112
1.1.0-RC / 2021-02-03
213
==================
314

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![official JetBrains project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
44
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
55
[![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)
6-
[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-serialization-core/1.1.0-RC)](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.1.0-RC/pom)
6+
[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-serialization-core/1.1.0)](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.1.0/pom)
77

88
Kotlin serialization consists of a compiler plugin, that generates visitor code for serializable classes,
99
runtime library with core serialization API and support libraries with various serialization formats.
@@ -81,17 +81,17 @@ Kotlin DSL:
8181

8282
```kotlin
8383
plugins {
84-
kotlin("jvm") version "1.4.10" // or kotlin("multiplatform") or any other kotlin plugin
85-
kotlin("plugin.serialization") version "1.4.10"
84+
kotlin("jvm") version "1.4.30" // or kotlin("multiplatform") or any other kotlin plugin
85+
kotlin("plugin.serialization") version "1.4.30"
8686
}
8787
```
8888

8989
Groovy DSL:
9090

9191
```gradle
9292
plugins {
93-
id 'org.jetbrains.kotlin.multiplatform' version '1.4.10'
94-
id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.10'
93+
id 'org.jetbrains.kotlin.multiplatform' version '1.4.30'
94+
id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.30'
9595
}
9696
```
9797

@@ -108,7 +108,7 @@ buildscript {
108108
repositories { mavenCentral() }
109109

110110
dependencies {
111-
val kotlinVersion = "1.4.10"
111+
val kotlinVersion = "1.4.30"
112112
classpath(kotlin("gradle-plugin", version = kotlinVersion))
113113
classpath(kotlin("serialization", version = kotlinVersion))
114114
}
@@ -119,7 +119,7 @@ Groovy DSL:
119119

120120
```gradle
121121
buildscript {
122-
ext.kotlin_version = '1.4.10'
122+
ext.kotlin_version = '1.4.30'
123123
repositories { mavenCentral() }
124124
125125
dependencies {
@@ -148,7 +148,7 @@ repositories {
148148
}
149149

150150
dependencies {
151-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
151+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
152152
}
153153
```
154154

@@ -160,7 +160,7 @@ repositories {
160160
}
161161
162162
dependencies {
163-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
163+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0"
164164
}
165165
```
166166

@@ -215,8 +215,8 @@ Ensure the proper version of Kotlin and serialization version:
215215

216216
```xml
217217
<properties>
218-
<kotlin.version>1.4.10</kotlin.version>
219-
<serialization.version>1.0.1</serialization.version>
218+
<kotlin.version>1.4.30</kotlin.version>
219+
<serialization.version>1.1.0</serialization.version>
220220
</properties>
221221
```
222222

RELEASING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ To release new `<version>` of `kotlinx.serialization`:
2222

2323
[git changelog](https://github.com/tj/git-extras/blob/master/Commands.md#git-changelog) from git-extras may help you with that.
2424

25+
6. If necessary, commit your changes to a new branch called `<version>-release` and send it for review, then merge it to `dev` branch.<br>
26+
If review is not required, commit directly to `dev`.
27+
2528
6. Tag version:<br>
2629
`git tag v<version>`
2730

docs/basic-serialization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ fun main() {
297297
It produces the exception:
298298

299299
```text
300-
Exception in thread "main" kotlinx.serialization.MissingFieldException: Field 'language' is required, but it was missing
300+
Exception in thread "main" kotlinx.serialization.MissingFieldException: Field 'language' is required for type with serial name 'example.exampleClasses04.Project', but it was missing
301301
```
302302

303303
<!--- TEST LINES_START -->
@@ -383,7 +383,7 @@ fun main() {
383383
We get the following exception.
384384

385385
```text
386-
Exception in thread "main" kotlinx.serialization.MissingFieldException: Field 'language' is required, but it was missing
386+
Exception in thread "main" kotlinx.serialization.MissingFieldException: Field 'language' is required for type with serial name 'example.exampleClasses07.Project', but it was missing
387387
```
388388

389389
<!--- TEST LINES_START -->

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#
44

55
group=org.jetbrains.kotlinx
6-
version=1.1.0-RC
6+
version=1.1.0
77

8-
kotlin.version=1.4.30-270
8+
kotlin.version=1.4.30
99

1010
# This version take precedence if 'bootstrap' property passed to project
1111
kotlin.version.snapshot=1.4.255-SNAPSHOT

guide/test/BasicSerializationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class BasicSerializationTest {
5151
@Test
5252
fun testExampleClasses04() {
5353
captureOutput("ExampleClasses04") { example.exampleClasses04.main() }.verifyOutputLinesStart(
54-
"Exception in thread \"main\" kotlinx.serialization.MissingFieldException: Field 'language' is required, but it was missing"
54+
"Exception in thread \"main\" kotlinx.serialization.MissingFieldException: Field 'language' is required for type with serial name 'example.exampleClasses04.Project', but it was missing"
5555
)
5656
}
5757

@@ -72,7 +72,7 @@ class BasicSerializationTest {
7272
@Test
7373
fun testExampleClasses07() {
7474
captureOutput("ExampleClasses07") { example.exampleClasses07.main() }.verifyOutputLinesStart(
75-
"Exception in thread \"main\" kotlinx.serialization.MissingFieldException: Field 'language' is required, but it was missing"
75+
"Exception in thread \"main\" kotlinx.serialization.MissingFieldException: Field 'language' is required for type with serial name 'example.exampleClasses07.Project', but it was missing"
7676
)
7777
}
7878

integration-test/gradle.properties

Lines changed: 2 additions & 2 deletions
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=1.4.30-270
6-
mainLibVersion=1.1.0-RC
5+
mainKotlinVersion=1.4.30
6+
mainLibVersion=1.1.0
77

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

0 commit comments

Comments
 (0)