From b16af4b1e93bbba41edf69f30fe4c1453bd5161d Mon Sep 17 00:00:00 2001 From: sspanak Date: Tue, 11 Mar 2025 14:41:56 +0200 Subject: [PATCH] simplified the version generation during build time and got rid of the deprecated exec{} --- app/version-tools.gradle | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/app/version-tools.gradle b/app/version-tools.gradle index 2010f643..061c51e7 100644 --- a/app/version-tools.gradle +++ b/app/version-tools.gradle @@ -1,26 +1,12 @@ -def execThing (String cmdStr) { - def stdout = new ByteArrayOutputStream() - String prefix = System.getenv("GITCMDPREFIX") - if (prefix != null) { - String cmd = prefix + cmdStr - exec { - commandLine cmd.tokenize() - standardOutput = stdout - } - } else { - exec { - commandLine cmdStr.tokenize() - standardOutput = stdout - } - } - return stdout.toString().trim() +static def execThing (String cmd) { + return cmd.execute().text.trim() } -def getCurrentGitHash() { +static def getCurrentGitHash() { return execThing('git rev-parse --short=8 HEAD') } -def generateVersionName() { +static def generateVersionName() { // major version String versionTagsRaw = execThing('git tag --list v[0-9]*') int versionTagsCount = versionTagsRaw == "" ? 0 : versionTagsRaw.split('\n').size()