Skip to content

Commit 8979f3e

Browse files
authored
Merge pull request #382 from Kotlin/fix-publishing-1
give release flag priority when choosing version number
2 parents 9e6d526 + 7eac8e6 commit 8979f3e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ group = "org.jetbrains.kotlinx"
7676
fun detectVersion(): String {
7777
val buildNumber = rootProject.findProperty("build.number") as String?
7878
val versionProp = property("version") as String
79-
return if (buildNumber != null) {
79+
return if (hasProperty("release")) {
80+
versionProp
81+
} else if (buildNumber != null) {
8082
if (rootProject.findProperty("build.number.detection") == "true") {
8183
"$versionProp-dev-$buildNumber"
8284
} else {
8385
error("use build.number + build.number.detection = true or release build")
8486
}
85-
} else if (hasProperty("release")) {
86-
versionProp
8787
} else {
8888
"$versionProp-dev"
8989
}

0 commit comments

Comments
 (0)