From b142faaac359afc74e965e8f05fd71e707f414d7 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Tue, 28 Feb 2023 08:35:42 +0700 Subject: [PATCH] build number in jar name --- build.gradle.kts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 18a4cca4a..84e10ceca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,7 @@ configurations { 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 publishVersion: String get() { @@ -40,16 +40,18 @@ data class GitInfo(val version: String, val count: String, val tag: String) { } val jarName: String get() { + val buildNumber = if (buildNumber != "") "-$buildNumber" else "" + if (tag != "") - return "$mod_version-$version" + return "$mod_version-$version$buildNumber" // if (count != "") // return "$mod_version-SNAPSHOT-${version}_$count" if (version != "") { - return "$mod_version-SNAPSHOT-$version" + return "$mod_version-SNAPSHOT-$version$buildNumber" } 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 group = "ru.dbotthepony" @@ -102,7 +104,7 @@ fun getCommitVersion(): GitInfo? { 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() - return GitInfo(version, count, tag) + return GitInfo(version, count, tag, System.getenv("BUILD_NUMBER") ?: "") } catch(err: Throwable) { println("Error getting git version") println(err)