Skip to content

Commit 98cfa0d

Browse files
committed
Avoid direct reference to encoding property inside doLast block
1 parent 32c322b commit 98cfa0d

File tree

1 file changed

+27
-10
lines changed

1 file changed

+27
-10
lines changed

build.gradle.kts

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -545,9 +545,12 @@ spotless {
545545
}
546546
}
547547

548-
val encoding: String by project
548+
val projectEncoding: String by project
549549

550-
fun replaceVersionInPluginUtil(ver: String) {
550+
fun replaceVersionInPluginUtil(
551+
ver: String,
552+
encoding: String,
553+
) {
551554
ant.withGroovyBuilder {
552555
"replaceregexp"(
553556
"match" to """(const val PLUGIN_VERSION = ")(\d+\.\d+\.\d+)((?:-beta)*)""",
@@ -562,7 +565,10 @@ fun replaceVersionInPluginUtil(ver: String) {
562565
}
563566
}
564567

565-
fun replaceVersionGradleProperty(ver: String) {
568+
fun replaceVersionGradleProperty(
569+
ver: String,
570+
encoding: String,
571+
) {
566572
ant.withGroovyBuilder {
567573
"replaceregexp"(
568574
"match" to """(pluginVersion = )(\d+\.\d+\.\d+)((?:-beta)*)""",
@@ -577,7 +583,10 @@ fun replaceVersionGradleProperty(ver: String) {
577583
}
578584
}
579585

580-
fun replaceVersionInLogSetting(ver: String) {
586+
fun replaceVersionInLogSetting(
587+
ver: String,
588+
encoding: String,
589+
) {
581590
ant.withGroovyBuilder {
582591
"replaceregexp"(
583592
"match" to """(org.domaframework.doma.intellij.plugin.version:-)(\d+\.\d+\.\d+)((?:-beta)*)(})""",
@@ -593,16 +602,21 @@ fun replaceVersionInLogSetting(ver: String) {
593602
}
594603
}
595604

596-
fun replaceVersion(ver: String) {
605+
fun replaceVersion(
606+
ver: String,
607+
encoding: String,
608+
) {
597609
checkNotNull(ver)
598-
replaceVersionInPluginUtil(ver)
599-
replaceVersionGradleProperty("$ver-beta")
600-
replaceVersionInLogSetting(ver)
610+
replaceVersionInPluginUtil(ver, encoding)
611+
replaceVersionGradleProperty("$ver-beta", encoding)
612+
replaceVersionInLogSetting(ver, encoding)
601613
println("Replace version in PluginUtil.kt, gradle.properties, logback.xml")
602614

603615
val githubEnv = System.getenv("GITHUB_ENV")
604616
val envFile = File(githubEnv)
605617
envFile.appendText("REPLACE_VERSION=$ver\n")
618+
619+
println("Set Replace version in GITHUB_ENV: $ver")
606620
}
607621

608622
tasks.register("replaceNewVersion") {
@@ -612,6 +626,8 @@ tasks.register("replaceNewVersion") {
612626
} else {
613627
"0.0.0"
614628
}
629+
630+
val encoding = projectEncoding
615631
doLast {
616632
val lastVersions = releaseVersion.substringAfter("v").split(".")
617633
val major = lastVersions[0].toInt()
@@ -620,7 +636,7 @@ tasks.register("replaceNewVersion") {
620636

621637
val newVersion = "$major.$minor.$patch"
622638
println("Release newVersion: $newVersion")
623-
replaceVersion(newVersion)
639+
replaceVersion(newVersion, encoding)
624640
}
625641
}
626642

@@ -631,9 +647,10 @@ tasks.register("replaceDraftVersion") {
631647
} else {
632648
"0.0.0"
633649
}
650+
val encoding = projectEncoding
634651

635652
doLast {
636653
println("Release DraftVersion: $draftVersion")
637-
replaceVersion(draftVersion)
654+
replaceVersion(draftVersion, encoding)
638655
}
639656
}

0 commit comments

Comments
 (0)