From 163b2ec559eb07d4db4a49e654cace814e3900cb Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Sat, 7 Aug 2021 17:35:31 +0300 Subject: [PATCH] [android] Remove git commit sha from user-visible version Solve a hen-and-egg issue: we needed to put in the commit hash before the commit. Thanks @IzzySoft, @rugk and @relan for help! See #825 Signed-off-by: Roman Tsisyk --- android/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index c3c2713729..8a8f3cd7a5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -112,7 +112,6 @@ def run(cmd) { } def getVersion() { - def gitsha = run(['git', 'rev-parse', '--short', 'HEAD']).trim() def time = Integer.parseInt(run(['git', 'log', '-1', '--format=%ct']).trim()) def cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ENGLISH); cal.setTimeInMillis((long) time * 1000); @@ -133,8 +132,8 @@ def getVersion() { def versionCode = (year - 2000) * 1_00_00_00 + month * 1_00_00 + day * 1_00 + hour; // Use the current date to generate the version name: - // 2021.04.11-12-gae0bcb54f9-Google (-Google added by flavor) - def versionName = String.format("%04d.%02d.%02d-%d-g%s", year, month, day, hour, gitsha) + // 2021.04.11-12-Google (-Google added by flavor) + def versionName = String.format("%04d.%02d.%02d-%d", year, month, day, hour) return new Tuple2(versionCode, versionName) }