From d525fea65ca8654856310835c9d25e9c66fea284 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 7 May 2018 15:50:36 +0700 Subject: [PATCH] Pass konanVersion to TeamCity --- build.gradle | 9 +++++++++ .../main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8a97ce8dab8..d9860294ef5 100644 --- a/build.gradle +++ b/build.gradle @@ -427,6 +427,15 @@ task performance { dependsOn ':performance:bench' } +task teamcityKonanVersion { + doLast { + println("##teamcity[setParameter name='kotlin.native.version.base' value='$konanVersion']") + println("##teamcity[setParameter name='kotlin.native.version.full' value='$KonanVersion.CURRENT']") + println("##teamcity[setParameter name='kotlin.native.version.meta' value='${KonanVersion.CURRENT.meta.toString().toLowerCase()}']") + println("##teamcity[buildNumber '${KonanVersion.CURRENT.toString(true, true)}']") + } +} + task clean { dependsOn subprojects.collect { it.tasks.matching { it.name == "clean" } } doLast { diff --git a/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt b/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt index 419f0daf568..0e1e76fdb41 100644 --- a/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt +++ b/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt @@ -51,7 +51,7 @@ open class VersionGenerator: DefaultTask() { | companion object { | val CURRENT = KonanVersion($meta, $major, $minor, $maintenance, $build) | } - | private fun versionToString(showMeta: Boolean = true, showBuild: Boolean = true) = buildString { + | fun toString(showMeta: Boolean, showBuild: Boolean) = buildString { | append(major) | append('.') | append(minor) @@ -72,7 +72,7 @@ open class VersionGenerator: DefaultTask() { | private val isRelease: Boolean | get() = meta == MetaVersion.RELEASE | - | private val versionString by lazy { versionToString(!isRelease, !isRelease) } + | private val versionString by lazy { toString(!isRelease, !isRelease) } | | override fun toString() = versionString |