Skip to content

Commit 89f236b

Browse files
committed
upgrade github release plugin
1 parent 262a07d commit 89f236b

3 files changed

Lines changed: 18 additions & 55 deletions

File tree

bot/build.gradle.kts

Lines changed: 11 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2121
import org.apache.tools.ant.filters.ReplaceTokens
2222
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2323
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
24-
import java.io.ByteArrayOutputStream
2524
import kotlin.math.min
2625

2726
plugins {
@@ -85,47 +84,9 @@ val clean: Task by tasks
8584
val build: Task by tasks
8685
val jar: Jar by tasks
8786

88-
val getGitHashTask = tasks.register<Exec>("getGitHash") {
89-
val envHash = System.getenv("GIT_HASH")
90-
91-
if (envHash != null) {
92-
val getter: () -> String = {
93-
envHash.substring(0, min(8, envHash.length))
94-
}
95-
96-
ext.set("gitVersionOut", getter)
97-
98-
commandLine("echo", "'hi'")
99-
} else {
100-
val stdout = ByteArrayOutputStream()
101-
102-
commandLine("git", "rev-parse", "--short", "HEAD")
103-
standardOutput = stdout
104-
isIgnoreExitValue = true
105-
106-
val getter: () -> String = {
107-
val item = standardOutput.toString().trim()
108-
109-
item.ifBlank {
110-
"DEV"
111-
}
112-
}
113-
114-
ext.set("gitVersionOut", getter)
115-
}
116-
}
117-
11887
val printVersion = tasks.register<Task>("printVersion") {
119-
dependsOn(getGitHashTask)
120-
121-
doLast {
122-
@Suppress("UNCHECKED_CAST") val versionGetter = project.ext.get("gitVersionOut") as () -> String
123-
124-
project.version = "${numberVersion}_${versionGetter()}"
125-
126-
println("CI: ${System.getenv("CI")}")
127-
println(project.version)
128-
}
88+
println("CI: ${System.getenv("CI")}")
89+
println(project.version)
12990
}
13091

13192
tasks.register<Exec>("botVersion") {
@@ -236,20 +197,20 @@ pmd {
236197

237198
tasks.register<Task>("lintAll") {
238199
// dependsOn(tasks.lintKotlin)
239-
dependsOn(tasks.pmdMain)
200+
dependsOn("lintKotlin", tasks.pmdMain)
240201
}
241202

242203
githubRelease {
243204
token(System.getenv("GITHUB_TOKEN"))
244-
owner("DuncteBot")
245-
repo("SkyBot")
246-
tagName("v$numberVersion")
247-
targetCommitish("main")
205+
owner.set("DuncteBot")
206+
repo.set("SkyBot")
207+
tagName.set("v$numberVersion")
208+
targetCommitish.set("main")
248209
releaseAssets(shadowJar.outputs.files.toList())
249-
overwrite(false)
250-
prerelease(false)
251-
dryRun(false)
252-
body(changelog())
210+
overwrite.set(false)
211+
prerelease.set(false)
212+
dryRun.set(false)
213+
body.set(provider(changelog()))
253214
}
254215

255216
fun getGitHash(): String {

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ plugins {
2626
id("org.liquibase.gradle") version "3.1.0" apply false
2727
id("org.jmailen.kotlinter") version "5.4.2" apply false
2828
id("com.gradleup.shadow") version "9.3.1" apply false
29-
id("com.github.breadmoirai.github-release") version "2.2.12" apply false
29+
id("com.github.breadmoirai.github-release") version "2.5.2" apply false
3030
}
3131

3232
buildscript {

shared/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.gradle.kotlin.dsl.register
2+
13
/*
24
* MIT License
35
*
@@ -70,12 +72,12 @@ jar.apply {
7072
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
7173
}
7274

73-
val sourcesJar = task<Jar>("sourcesJar") {
75+
val sourcesJar = tasks.register<Jar>("sourcesJar") {
7476
archiveClassifier.set("sources")
7577
from(sourceSets["main"].allJava)
7678
}
7779

78-
val javadocJar = task<Jar>("javadocJar") {
80+
val javadocJar = tasks.register<Jar>("javadocJar") {
7981
dependsOn(javadoc)
8082
archiveClassifier.set("javadoc")
8183
from(javadoc.destinationDir)
@@ -87,6 +89,6 @@ build.apply {
8789
dependsOn(sourcesJar)
8890

8991
jar.mustRunAfter(clean)
90-
javadocJar.mustRunAfter(jar)
91-
sourcesJar.mustRunAfter(javadocJar)
92+
javadocJar.get().mustRunAfter(jar)
93+
sourcesJar.get().mustRunAfter(javadocJar)
9294
}

0 commit comments

Comments
 (0)