From de67ed4e0d0585160c456fb2afaa019c259cfb1a Mon Sep 17 00:00:00 2001 From: scroix Date: Thu, 4 Apr 2024 14:51:47 +1100 Subject: [PATCH] Rename branch in support of .jar generation - This tackles a tiny regression which saw us lose -dev- handled in the generated .jar filename - We also handle the odd case of building in a git branch which includes a forward slash --- build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle b/build.gradle index 0911ac1..4cbfdcd 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,14 @@ ext { hostname = InetAddress.getLocalHost().getHostName().toUpperCase() now = DateTime.now().toString() rev = gitInfo.rev.replaceAll(/[^a-zA-Z0-9]/, '') + branch = gitInfo.branch + if (branch == 'master') { + branch = 'dev' + } else if (branch.contains('/')) { + branch = branch.substring(branch.indexOf('/') + 1) + } + version = gitInfo.branch != 'stable' ? "${project.version}-${branch}_r${rev}" : project.version }