Skip to content

Commit

Permalink
Update Kotlin to 1.4.30 release and prepare 1.1.0 release (#1340)
Browse files Browse the repository at this point in the history
  • Loading branch information
sandwwraith authored Feb 19, 2021
1 parent f10d8c6 commit 43d5f78
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 19 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@

1.1.0 / 2021-02-17
==================

This release contains all features and bugfixes from 1.1.0-RC plus an additional fix for incorrect exception type
(#1325 — Throw `SerializationException` instead of `IllegalStateException` in `EnumSerializer`) and uses release version of Kotlin 1.4.30.

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,
all new releases of kotlinx.serialization are published directly to Maven Central and therefore are not available in `https://kotlin.bintray.com/kotlinx/` repository.
We suggest you to remove `jcenter()` and other kotlin bintray repositories from your buildscripts and to use `mavenCentral()` repository instead.

1.1.0-RC / 2021-02-03
==================

Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![official JetBrains project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
[![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)
[![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)
[![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)

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

```kotlin
plugins {
kotlin("jvm") version "1.4.10" // or kotlin("multiplatform") or any other kotlin plugin
kotlin("plugin.serialization") version "1.4.10"
kotlin("jvm") version "1.4.30" // or kotlin("multiplatform") or any other kotlin plugin
kotlin("plugin.serialization") version "1.4.30"
}
```

Groovy DSL:

```gradle
plugins {
id 'org.jetbrains.kotlin.multiplatform' version '1.4.10'
id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.10'
id 'org.jetbrains.kotlin.multiplatform' version '1.4.30'
id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.30'
}
```

Expand All @@ -108,7 +108,7 @@ buildscript {
repositories { mavenCentral() }

dependencies {
val kotlinVersion = "1.4.10"
val kotlinVersion = "1.4.30"
classpath(kotlin("gradle-plugin", version = kotlinVersion))
classpath(kotlin("serialization", version = kotlinVersion))
}
Expand All @@ -119,7 +119,7 @@ Groovy DSL:

```gradle
buildscript {
ext.kotlin_version = '1.4.10'
ext.kotlin_version = '1.4.30'
repositories { mavenCentral() }
dependencies {
Expand Down Expand Up @@ -148,7 +148,7 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0")
}
```

Expand All @@ -160,7 +160,7 @@ repositories {
}
dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0"
}
```

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

```xml
<properties>
<kotlin.version>1.4.10</kotlin.version>
<serialization.version>1.0.1</serialization.version>
<kotlin.version>1.4.30</kotlin.version>
<serialization.version>1.1.0</serialization.version>
</properties>
```

Expand Down
3 changes: 3 additions & 0 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ To release new `<version>` of `kotlinx.serialization`:

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

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>
If review is not required, commit directly to `dev`.

6. Tag version:<br>
`git tag v<version>`

Expand Down
4 changes: 2 additions & 2 deletions docs/basic-serialization.md
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ fun main() {
It produces the exception:

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

<!--- TEST LINES_START -->
Expand Down Expand Up @@ -383,7 +383,7 @@ fun main() {
We get the following exception.

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

<!--- TEST LINES_START -->
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#

group=org.jetbrains.kotlinx
version=1.1.0-RC
version=1.1.0

kotlin.version=1.4.30-270
kotlin.version=1.4.30

# This version take precedence if 'bootstrap' property passed to project
kotlin.version.snapshot=1.4.255-SNAPSHOT
Expand Down
4 changes: 2 additions & 2 deletions guide/test/BasicSerializationTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class BasicSerializationTest {
@Test
fun testExampleClasses04() {
captureOutput("ExampleClasses04") { example.exampleClasses04.main() }.verifyOutputLinesStart(
"Exception in thread \"main\" kotlinx.serialization.MissingFieldException: Field 'language' is required, but it was missing"
"Exception in thread \"main\" kotlinx.serialization.MissingFieldException: Field 'language' is required for type with serial name 'example.exampleClasses04.Project', but it was missing"
)
}

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

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=1.4.30-270
mainLibVersion=1.1.0-RC
mainKotlinVersion=1.4.30
mainLibVersion=1.1.0

kotlin.code.style=official
kotlin.js.compiler=both
Expand Down

0 comments on commit 43d5f78

Please sign in to comment.