From 66f4ed9d72bf6712ececc81f35638bc7280a749b Mon Sep 17 00:00:00 2001 From: Anton Keks Date: Thu, 20 Jan 2022 21:08:37 +0200 Subject: [PATCH] fixes #319 allow building if .git is not present (e.g. from source zip) --- CHANGELOG | 3 +++ build.gradle | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 610d6e4f..2247de47 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Unreleased: +- Allow building if .git is not present (e.g. from source zip) #319 + Changes in 3.8.1: - Make 32-bit Windows build still run under Oracle Java 8 - it seems to still be popular #324 - Make deb files install on older Debian without zst compression support #327 diff --git a/build.gradle b/build.gradle index e443576d..dd5a2cd0 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,6 @@ buildscript { plugins { id "java" - id "com.palantir.git-version" version "0.12.2" } def osName = System.getProperty("os.name") @@ -19,7 +18,10 @@ def platform = osName.contains("Linux") ? 'linux' + (is64 ? '64' : '32') : osName.contains("Windows") ? 'win' + (is64 ? '64' : '32') : osName.contains("OS X") ? 'mac' + (isArm ? "Arm64" : "X86") : 'unknown' -version = gitVersion() +def versionGetter = Runtime.getRuntime().exec("git describe --tags") +versionGetter.waitFor() +version = versionGetter.waitFor() == 0 ? new String(versionGetter.inputStream.readAllBytes()) : "unknown" + sourceCompatibility = 8 targetCompatibility = 8