From fd6467505ffdc9a5c2b5fe4fc6edcab61fdfdfce Mon Sep 17 00:00:00 2001 From: Nikita Klimenko Date: Mon, 22 May 2023 17:49:22 +0300 Subject: [PATCH] give release flag priority when choosing version number build number property is actually present even for release build and i don't know a good way to disable it for specific build chain. (cherry picked from commit 7eac8e6c73fdf0feeb755a632e9370381a2b9553) --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bf8d1e5a3..7406202de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,14 +76,14 @@ group = "org.jetbrains.kotlinx" fun detectVersion(): String { val buildNumber = rootProject.findProperty("build.number") as String? val versionProp = property("version") as String - return if (buildNumber != null) { + return if (hasProperty("release")) { + versionProp + } else if (buildNumber != null) { if (rootProject.findProperty("build.number.detection") == "true") { "$versionProp-dev-$buildNumber" } else { error("use build.number + build.number.detection = true or release build") } - } else if (hasProperty("release")) { - versionProp } else { "$versionProp-dev" }