From cea9b4379e3602313348862b7669ad7932e1cfaf Mon Sep 17 00:00:00 2001
From: Leonid Startsev <sandwwraith@gmail.com>
Date: Tue, 19 Nov 2019 14:14:26 +0300
Subject: [PATCH] Bump version to 0.14.0 @ Kotlin 1.3.60

---
 build.gradle                                             | 4 ++--
 gradle.properties                                        | 4 ++--
 integration-test/gradle.properties                       | 4 ++--
 integration-test/src/commonMain/kotlin/sample/Helpers.kt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 06ef192cea..ca224a8dbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@
 buildscript {
     if (project.hasProperty("bootstrap")) {
         ext.kotlin_version = property('kotlin.version.snapshot')
-        ext["org.jetbrains.kotlin.native.home"] = System.getenv("KONAN_LOCAL_DIST")
+        ext["kotlin.native.home"] = System.getenv("KONAN_LOCAL_DIST")
     } else {
         ext.kotlin_version = property('kotlin.version')
     }
@@ -25,7 +25,7 @@ buildscript {
     ]
 
     /*
-    * These property group is used to build kotlinx.serialization against Kotlin compiler snapshot.
+    * This property group is used to build kotlinx.serialization against Kotlin compiler snapshot.
     * When build_snapshot_train is set to true, kotlin_version property is overridden with kotlin_snapshot_version.
     * DO NOT change the name of these properties without adapting kotlinx.train build chain.
     */
diff --git a/gradle.properties b/gradle.properties
index 97f447a526..fac53f0184 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,9 @@
 #
 
 group=org.jetbrains.kotlinx
-version=0.14.0-1.3.60-eap-76
+version=0.14.0
 
-kotlin.version=1.3.60-eap-100
+kotlin.version=1.3.60
 
 # This version take precedence if 'bootstrap' property passed to project
 kotlin.version.snapshot=1.3-SNAPSHOT
diff --git a/integration-test/gradle.properties b/integration-test/gradle.properties
index 0972b15f31..c414eafe6f 100644
--- a/integration-test/gradle.properties
+++ b/integration-test/gradle.properties
@@ -2,8 +2,8 @@
 # Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
 #
 
-mainKotlinVersion=1.3.50
-mainLibVersion=0.13.0
+mainKotlinVersion=1.3.60
+mainLibVersion=0.14.0
 
 kotlin.code.style=official
 
diff --git a/integration-test/src/commonMain/kotlin/sample/Helpers.kt b/integration-test/src/commonMain/kotlin/sample/Helpers.kt
index 554be6f9b3..7b552e1b2f 100644
--- a/integration-test/src/commonMain/kotlin/sample/Helpers.kt
+++ b/integration-test/src/commonMain/kotlin/sample/Helpers.kt
@@ -78,7 +78,7 @@ class KeyValueInput(val inp: Parser) : ElementValueDecoder() {
     override fun decodeFloat(): Float = readToken().toFloat()
     override fun decodeDouble(): Double = readToken().toDouble()
 
-    override fun decodeEnum(enumDescription: EnumDescriptor): Int {
+    override fun decodeEnum(enumDescription: SerialDescriptor): Int {
         return readToken().toInt()
     }