GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix variable replacement by using Indra

Browse source
This commit is contained in:
RednedEpic 2022-02-27 22:43:06 -06:00
parent b20546c515
commit 7428998d71
2 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/build.gradle.kts
View file

@ -1,7 +1,9 @@
import net.kyori.indra.git.IndraGitExtension
import net.kyori.blossom.BlossomExtension
plugins {
id("net.kyori.blossom")
id("net.kyori.indra.git")
}
dependencies {
@ -76,11 +78,13 @@ dependencies {
}
configure<BlossomExtension> {
val indra = the<IndraGitExtension>()
val mainFile = "src/main/java/org/geysermc/geyser/GeyserImpl.java"
val gitVersion = "git-${branchName()}-${commitHashAbbrev()}"
val gitVersion = "git-${indra.branchName()}-${indra.commit()?.name?.substring(0, 7)}"
replaceToken("\${version}", "${project.version} ($gitVersion)", mainFile)
replaceToken("\${gitVersion}", gitVersion, mainFile)
replaceToken("\${buildNumber}", buildNumber(), mainFile)
replaceToken("\${branch}", branchName(), mainFile)
replaceToken("\${buildNumber}", Integer.parseInt(System.getProperty("BUILD_NUMBER", "-1")), mainFile)
replaceToken("\${branch}", indra.branchName(), mainFile)
}