Skip to content

Commit c68cabf

Browse files
committed
Fix property reference processing
1 parent c1ff6cb commit c68cabf

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.github/workflows/release-drafter.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ on:
88
types: [opened, reopened, synchronize]
99
workflow_dispatch:
1010

11-
permissions:
12-
contents: read
13-
1411
jobs:
1512
update_release_draft:
1613
permissions:

build.gradle.kts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,14 +598,20 @@ fun replaceVersion(ver: String) {
598598
replaceVersionInPluginUtil(ver)
599599
replaceVersionGradleProperty("$ver-beta")
600600
replaceVersionInLogSetting(ver)
601+
println("Replace version in PluginUtil.kt, gradle.properties, logback.xml")
601602

602603
val githubEnv = System.getenv("GITHUB_ENV")
603604
val envFile = File(githubEnv)
604605
envFile.appendText("REPLACE_VERSION=$ver\n")
605606
}
606607

607608
tasks.register("replaceNewVersion") {
608-
val releaseVersion = project.properties["newVersion"]?.toString() ?: "0.0.0"
609+
val releaseVersion =
610+
if (project.hasProperty("newVersion")) {
611+
project.property("newVersion") as String
612+
} else {
613+
"0.0.0"
614+
}
609615
doLast {
610616
val lastVersions = releaseVersion.substringAfter("v").split(".")
611617
val major = lastVersions[0].toInt()
@@ -620,9 +626,11 @@ tasks.register("replaceNewVersion") {
620626

621627
tasks.register("replaceDraftVersion") {
622628
val draftVersion =
623-
project.properties["draftVersion"]
624-
.toString()
625-
.substringBefore("-beta")
629+
if (project.hasProperty("draftVersion")) {
630+
project.property("draftVersion") as String
631+
} else {
632+
"0.0.0"
633+
}
626634

627635
doLast {
628636
println("Release DraftVersion: $draftVersion")

0 commit comments

Comments
 (0)