From 9ea6642b494f52c0cbf622de9859cf51c09ba9af Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <olonho@users.noreply.github.com>
Date: Thu, 1 Mar 2018 17:00:46 +0300
Subject: [PATCH] v0.6.1 preparations. (#1373)

---
 CHANGELOG.md                                             | 9 +++++++++
 .../org/jetbrains/kotlin/backend/konan/KonanVersion.kt   | 2 +-
 gradle.properties                                        | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 224081c6ce1..83b0de52e33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## v0.6.1 (Mar 2018)
+  * Various bugfixes
+  * Support total ordering in FP comparisons
+  * Interop generate string constants from string macrodefinitions
+  * STM32 blinky demo in pure Kotlin/Native
+  * Top level variables initialization redesign (proper dependency order)
+  * Support kotlin.math on WebAssembly targets
+  * Support embedded targets on Windows hosts
+
 ## v0.6 (Feb 2018)
   * Support multiplatform projects (expect/actual) in compiler and Gradle plugin
   * Support first embedded target (STM32 board)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt
index 79e0dbde4f8..99b1dd43c37 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt
@@ -30,7 +30,7 @@ enum class MetaVersion {
 
 class KonanVersion(val meta: MetaVersion?, val major: Int, val minor: Int, val maintenance: Int, val build:Int) {
     companion object {
-        val CURRENT = KonanVersion(MetaVersion.EAP, 0, 6, 0, 0)
+        val CURRENT = KonanVersion(MetaVersion.EAP, 0, 6, 1, 0)
     }
     override fun toString() = if (meta != null) "$meta $major.$minor.$maintenance.$build" else "$major.$minor.$maintenance.$build"
 }
diff --git a/gradle.properties b/gradle.properties
index d77a99ede45..8ec3c0da656 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,7 @@ kotlinCompilerVersion=1.2.40-dev-610
 kotlinScriptRuntimeVersion=1.2.40-dev-610
 kotlinStdLibVersion=1.2.40-dev-610
 kotlinReflectVersion=1.2.40-dev-610
-konanVersion=0.6
+konanVersion=0.6.1
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 
 ##