From 68fe66a21f5490caaa746ddb94f0e88abb3f6bfa Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 14 Mar 2018 17:43:24 +0300 Subject: [PATCH] v0.6.2 preparations --- CHANGELOG.md | 5 +++++ .../src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt | 2 +- gradle.properties | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6fae4b2968..d133c5bc699 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v0.6.2 (Mar 2018) + * Support several `expectedBy`-dependencies in Gradle plugin. + * Improved interaction between Gradle plugin and IDE. + * Various bugfixes + ## v0.6.1 (Mar 2018) * Various bugfixes * Support total ordering in FP comparisons 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 99b1dd43c37..73c33132785 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, 1, 0) + val CURRENT = KonanVersion(MetaVersion.EAP, 0, 6, 2, 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 188347dcc2a..198399f116c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,6 +22,6 @@ remoteRoot=konan_tests testDataVersion=1226829:id kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.40-dev-1038/artifacts/content/maven kotlinVersion=1.2.40-dev-1038 -konanVersion=0.6.1 +konanVersion=0.6.2 org.gradle.jvmargs='-Dfile.encoding=UTF-8'