DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

build number in jar name

Browse Source
This commit is contained in:
DBotThePony 2023-02-28 08:35:42 +07:00
parent bd9ec5f4a3
commit b142faaac3
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle.kts
View File

@ -29,7 +29,7 @@ configurations {
get("implementation").extendsFrom(get("library"), get("klibrary")) get("implementation").extendsFrom(get("library"), get("klibrary"))
} }
data class GitInfo(val version: String, val count: String, val tag: String) { data class GitInfo(val version: String, val count: String, val tag: String, val buildNumber: String) {
// val tagIsVersion: Boolean get() = tag != "" && tag.matches(Regex("v[0-9]+\\.[0-9]\\.[0-9]")) // val tagIsVersion: Boolean get() = tag != "" && tag.matches(Regex("v[0-9]+\\.[0-9]\\.[0-9]"))
val publishVersion: String get() { val publishVersion: String get() {
@ -40,16 +40,18 @@ data class GitInfo(val version: String, val count: String, val tag: String) {
} }
val jarName: String get() { val jarName: String get() {
val buildNumber = if (buildNumber != "") "-$buildNumber" else ""
if (tag != "") if (tag != "")
return "$mod_version-$version" return "$mod_version-$version$buildNumber"
// if (count != "") // if (count != "")
// return "$mod_version-SNAPSHOT-${version}_$count" // return "$mod_version-SNAPSHOT-${version}_$count"
if (version != "") { if (version != "") {
return "$mod_version-SNAPSHOT-$version" return "$mod_version-SNAPSHOT-$version$buildNumber"
} else { } else {
return "$mod_version-SNAPSHOT" return "$mod_version-SNAPSHOT$buildNumber"
} }
} }
@ -65,7 +67,7 @@ data class GitInfo(val version: String, val count: String, val tag: String) {
} }
} }
val gitVersion = getCommitVersion() ?: GitInfo("", "", "") val gitVersion = getCommitVersion() ?: GitInfo("", "", "", "")
version = gitVersion.modVersion version = gitVersion.modVersion
group = "ru.dbotthepony" group = "ru.dbotthepony"
@ -102,7 +104,7 @@ fun getCommitVersion(): GitInfo? {
val tag = tagStream.array.copyOfRange(0, tagStream.length).toString(Charsets.UTF_8).trim() val tag = tagStream.array.copyOfRange(0, tagStream.length).toString(Charsets.UTF_8).trim()
val count = countStream.array.copyOfRange(0, countStream.length).toString(Charsets.UTF_8).trim() val count = countStream.array.copyOfRange(0, countStream.length).toString(Charsets.UTF_8).trim()
return GitInfo(version, count, tag) return GitInfo(version, count, tag, System.getenv("BUILD_NUMBER") ?: "")
} catch(err: Throwable) { } catch(err: Throwable) {
println("Error getting git version") println("Error getting git version")
println(err) println(err)