From f50fd578c81897b4d194798802f3c1980a3e9bb4 Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Fri, 30 Aug 2024 21:24:45 +0200
Subject: [PATCH] Fix fdroid build ci

---
 .gitlab-ci.yml   |  2 +-
 app/build.gradle | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f10e24d..2df29b05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,7 +126,7 @@ fdroid build:
       - .gradle
   script:
       # Put the correct versionName and versionCode in the .fdroid.yml
-    - sed -e "s/\${versionName}/$(grep "versionName " app/build.gradle | awk '{print $2}' | tr -d \")$(grep "versionCode" app/build.gradle -m 1 | awk '{print $2}')/" -e "s/\${versionCode}/$(grep "versionCode" app/build.gradle -m 1 | awk '{print $2}')/" .fdroid.yml.template > .fdroid.yml
+    - sed -e "s/\${versionName}/$(./gradlew -q printVersionName)/" -e "s/\${versionCode}/$(./gradlew -q printVersionCode)/" .fdroid.yml.template > .fdroid.yml
     - rm .fdroid.yml.template
     # each `fdroid build --on-server` run expects sudo, then uninstalls it
     - set -x
diff --git a/app/build.gradle b/app/build.gradle
index 896c2410..02c59c6f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -166,6 +166,17 @@ android {
     }
 }
 
+tasks.register('printVersionName') {
+    doLast {
+        println android.defaultConfig.versionName
+    }
+}
+tasks.register('printVersionCode') {
+    doLast {
+        println android.defaultConfig.versionCode
+    }
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.hilt:hilt-common:1.2.0'