From e997d3eb33a3f40a695f22b7f75d8ef253e1df47 Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Thu, 30 Nov 2023 12:50:10 +0100 Subject: [PATCH] Prepare 1.6.2 release (#2515) --- CHANGELOG.md | 9 +++++++++ README.md | 24 ++++++++++++------------ gradle.properties | 4 ++-- integration-test/gradle.properties | 4 ++-- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dad1a13e..ce3d1e05f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +1.6.2 / 2023-11-30 +================== + +This is a patch release accompanying Kotlin 1.9.21. It also provides additional targets that were not available in 1.6.1: +wasm-wasi and (deprecated) linuxArm32Hfp. + +* Add Wasm WASI target (#2510) +* Bring back linuxArm32Hfp target because it is deprecated, but not removed yet. (#2505) + 1.6.1 / 2023-11-15 ================== diff --git a/README.md b/README.md index 4069cc32c..64c33d1a2 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ [![JetBrains official 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) -[![Kotlin](https://img.shields.io/badge/kotlin-1.9.20-blue.svg?logo=kotlin)](http://kotlinlang.org) -[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-serialization-core/1.6.1)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.6.1) +[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-blue.svg?logo=kotlin)](http://kotlinlang.org) +[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-serialization-core/1.6.2)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.6.2) [![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 "1.9.20" // or kotlin("multiplatform") or any other kotlin plugin - kotlin("plugin.serialization") version "1.9.20" + kotlin("jvm") version "1.9.21" // or kotlin("multiplatform") or any other kotlin plugin + kotlin("plugin.serialization") version "1.9.21" } ``` @@ -104,8 +104,8 @@ Groovy DSL: ```gradle plugins { - id 'org.jetbrains.kotlin.multiplatform' version '1.9.20' - id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.20' + id 'org.jetbrains.kotlin.multiplatform' version '1.9.21' + id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21' } ``` @@ -123,7 +123,7 @@ buildscript { repositories { mavenCentral() } dependencies { - val kotlinVersion = "1.9.20" + val kotlinVersion = "1.9.21" classpath(kotlin("gradle-plugin", version = kotlinVersion)) classpath(kotlin("serialization", version = kotlinVersion)) } @@ -134,7 +134,7 @@ Groovy DSL: ```gradle buildscript { - ext.kotlin_version = '1.9.20' + ext.kotlin_version = '1.9.21' repositories { mavenCentral() } dependencies { @@ -164,7 +164,7 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") } ``` @@ -176,7 +176,7 @@ repositories { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1" + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" } ``` @@ -266,8 +266,8 @@ Ensure the proper version of Kotlin and serialization version: ```xml - 1.9.20 - 1.6.1 + 1.9.21 + 1.6.2 ``` diff --git a/gradle.properties b/gradle.properties index 4d7a648ea..ff245336b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ # group=org.jetbrains.kotlinx -version=1.6.2-SNAPSHOT +version=1.6.3-SNAPSHOT -kotlin.version=1.9.20 +kotlin.version=1.9.21 # This version takes precedence if 'bootstrap' property passed to project kotlin.version.snapshot=1.9.255-SNAPSHOT diff --git a/integration-test/gradle.properties b/integration-test/gradle.properties index df0ae0cc0..059a58e9d 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=1.9.20 -mainLibVersion=1.6.2-SNAPSHOT +mainKotlinVersion=1.9.21 +mainLibVersion=1.6.3-SNAPSHOT kotlin.code.style=official kotlin.js.compiler=ir