From 9f72f74345ed63171267262ef812add25d4f9765 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Wed, 30 Aug 2023 15:27:03 +0200
Subject: [PATCH] build: attempt to fix issues with automatic version
generation in ci
---
.../src/main/kotlin/AndroidApplicationConvention.kt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
index 5f424cb73..7db2ae17d 100644
--- a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
+++ b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
@@ -24,18 +24,18 @@ class AndroidApplicationConvention : Plugin<Project> {
applicationId = "${rootProject.group}.${rootProject.name.lowercase(Locale.ROOT)}"
- val commit = git("rev-parse", "HEAD")
- val name = git("describe", "--always", "--tags", "HEAD")
+ val commit = rootProject.git("rev-parse", "HEAD")
+ val name = rootProject.git("describe", "--always", "--tags", "HEAD")
- versionCode = git("rev-list", "--count", "HEAD")?.toIntOrNull() ?: 1
- versionName = git("describe", "--always", "--tags", "HEAD") ?: "1.0.0"
+ versionCode = rootProject.git("rev-list", "--count", "HEAD")?.toIntOrNull() ?: 1
+ versionName = rootProject.git("describe", "--always", "--tags", "HEAD") ?: "1.0.0"
val fancyVersionName = if (commit == null || name == null) name
else "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>"
- buildConfigField("String", "GIT_HEAD", "\"${git("rev-parse", "HEAD") ?: ""}\"")
+ buildConfigField("String", "GIT_HEAD", "\"${rootProject.git("rev-parse", "HEAD") ?: ""}\"")
buildConfigField("String", "FANCY_VERSION_NAME", "\"${fancyVersionName ?: ""}\"")
- buildConfigField("long", "GIT_COMMIT_DATE", "${git("show", "-s", "--format=%ct") ?: 0}L")
+ buildConfigField("long", "GIT_COMMIT_DATE", "${rootProject.git("show", "-s", "--format=%ct") ?: 0}L")
signingConfig = signingConfigs.findByName("default")
--
GitLab