From 50f928feee2ff243b777be8b90c5bf56b8955898 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Fri, 1 Sep 2023 00:16:48 +0200
Subject: [PATCH] build: include tags in versioncode count
---
.../convention/src/main/kotlin/AndroidApplicationConvention.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
index 034284bbc..19d57b839 100644
--- a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
+++ b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
@@ -27,7 +27,7 @@ class AndroidApplicationConvention : Plugin<Project> {
val commit = git("rev-parse", "HEAD")
val name = git("describe", "--always", "--tags", "HEAD")
- versionCode = git("rev-list", "--count", "HEAD")?.toIntOrNull()
+ versionCode = git("rev-list", "--count", "HEAD", "--tags")?.toIntOrNull()
versionName = git("describe", "--always", "--tags", "HEAD")
val fancyVersionName = if (commit == null || name == null) name
--
GitLab