From eb346191fbcdc9479c8ee92c11996ba1d72a2a39 Mon Sep 17 00:00:00 2001 From: Mark Whitaker Date: Sat, 13 Jul 2024 10:01:40 +0100 Subject: [PATCH] Simplify getGitVersion() in build.gradle.kts --- build.gradle.kts | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b018450..5b1a759 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,3 @@ -import java.io.BufferedReader -import java.io.InputStreamReader - plugins { `java-library` } @@ -12,7 +9,7 @@ repositories { } group = "uk.co.mainwave.mimetypes" -version = getVersionFromGit() +version = getGitVersion() java.sourceCompatibility = JavaVersion.VERSION_1_8 @@ -20,15 +17,12 @@ dependencies { testImplementation("junit:junit:$junitVersion") } -fun getVersionFromGit(): String { - val processBuilder = ProcessBuilder(listOf("git", "describe", "--tags", "--always")) +fun getGitVersion(): String { try { - val process = processBuilder.start() - val reader = BufferedReader(InputStreamReader(process.inputStream)) - val output = StringBuilder() - output.append(reader.readLine()) + val process = ProcessBuilder("git", "describe", "--tags", "--always").start() + val output = process.inputStream.bufferedReader().readLine() process.waitFor() - return output.toString() + return output } catch (e: Exception) { return "1.0.0" }