From ee3931cdc2ed89fb251fd39860ebac6c2abf4ac6 Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Mon, 25 Mar 2024 15:10:16 +0200
Subject: [PATCH] fixed the commit hash in the version name to 8 characters to
 avoid discrepancies with the F-droid build

---
 app/src/main/AndroidManifest.xml | 2 +-
 app/version-tools.gradle         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc8c6939..5b75ec99 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:tools="http://schemas.android.com/tools"
-	android:versionCode="411"
+	android:versionCode="412"
 	android:versionName="29.0"
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
diff --git a/app/version-tools.gradle b/app/version-tools.gradle
index 2ee9dcf5..374b2f63 100644
--- a/app/version-tools.gradle
+++ b/app/version-tools.gradle
@@ -17,7 +17,7 @@ def execThing (String cmdStr) {
 }
 
 def getCurrentGitHash() {
-	return execThing('git log -1 --format=%h')
+	return execThing('git rev-parse --short=8 HEAD')
 }
 
 def generateVersionName() {