Prepare 1.2.2 releaseupstream/v1.2.2

4 files changed, 28 insertions, 6 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25b38256..419981ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,26 @@
 
+1.2.2 / 2021-07-08
+==================
+
+This release contains various bugfixes, some useful features and important performance improvements.
+It also uses Kotlin 1.5.20 as default.
+
+### Features
+
+  * Support for `@JsonNames` and `coerceInputValues` in `Json.decodeFromDynamic` (#1479)
+  * Add factory function to wrap a serial descriptor with a custom name for custom delegating serializers (#1547) (thanks to [Fadenfire](https://github.com/Fadenfire))
+  * Allow contextually serialized types to be used as map keys in Json (#1552) (thanks to [pdvrieze](https://github.com/pdvrieze))
+
+### Bugfixes and performance improvements
+
+  * Update size in `JsonStringBuilder` slow-path to avoid excessive array-copies for large strings with escape symbols (#1491)
+  * Optimize integer encoding length in CBOR (#1570) (thanks to [davertay](https://github.com/davertay))
+  * Throw `JsonDecodingException` instead of `ClassCastException` during unexpected null in `TreeJsonDecoder` (#1550)
+  * Prohibit 'null' strings in lenient mode in order to get rid of 'null' and "null" ambiguity (#1549)
+  * Avoid usage of reflective-like `serialDescriptor<KType>` in production sources (#1540)
+  * Added correct error message when deserializing missing enum member for Properties format (#1539)
+  * Make `DescriptorSchemaCache` in Json thread-local on Native (#1484)
+
 1.2.1 / 2021-05-14
 ==================
 
diff --git a/README.md b/README.md
index 7e7a31f8..5d7865e1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,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-1.5.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
-[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-serialization-core/1.2.1)](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.2.1/pom)
+[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-serialization-core/1.2.2)](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-serialization-core/1.2.2/pom)
 [![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://kotlin.github.io/kotlinx.serialization/)
 [![Slack channel](https://img.shields.io/badge/chat-slack-blue.svg?logo=slack)](https://kotlinlang.slack.com/messages/serialization/)
 
@@ -155,7 +155,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2")
 }
 ```
 
@@ -167,7 +167,7 @@ repositories {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2"
 }
 ```
 
@@ -223,7 +223,7 @@ Ensure the proper version of Kotlin and serialization version:
 ```xml
 <properties>
     <kotlin.version>1.5.20</kotlin.version>
-    <serialization.version>1.2.1</serialization.version>
+    <serialization.version>1.2.2</serialization.version>
 </properties>
 ```
 
diff --git a/gradle.properties b/gradle.properties
index 6dc828ef..9a6a6be4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@
 #
 
 group=org.jetbrains.kotlinx
-version=1.2.1-SNAPSHOT
+version=1.2.2-SNAPSHOT
 
 kotlin.version=1.5.20
 
diff --git a/integration-test/gradle.properties b/integration-test/gradle.properties
index 352208e6..33b6be66 100644
--- a/integration-test/gradle.properties
+++ b/integration-test/gradle.properties
@@ -3,7 +3,7 @@
 #
 
 mainKotlinVersion=1.5.20
-mainLibVersion=1.2.1-SNAPSHOT
+mainLibVersion=1.2.2-SNAPSHOT
 
 kotlin.code.style=official
 kotlin.js.compiler=both