From 7cfcb1e5dc75c088f6e370e3e0ed2e53dca15b1c Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Fri, 27 Apr 2018 00:36:29 +0700 Subject: [PATCH] [version] Don't specify build number and meta for release builds --- .../org/jetbrains/kotlin/VersionGenerator.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 a587ece983a..419f0daf568 100644 --- a/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt +++ b/shared/buildSrc/src/main/kotlin/org/jetbrains/kotlin/VersionGenerator.kt @@ -68,17 +68,17 @@ open class VersionGenerator: DefaultTask() { | append(build) | } | } - | private val versionString by lazy { versionToString(true, true) } + | + | private val isRelease: Boolean + | get() = meta == MetaVersion.RELEASE + | + | private val versionString by lazy { versionToString(!isRelease, !isRelease) } + | | override fun toString() = versionString | - | val gradlePluginVersion by lazy { - | if (meta == MetaVersion.RELEASE) - | versionToString(false, false) - | else - | versionString - | } + | val gradlePluginVersion by lazy { versionString } |} - """.trimMargin() + """.trimMargin() } versionFile.printWriter().use { it.println(content)