From b3419539e0de2a1f3d278daac2727b08c89f1d05 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Mon, 17 Oct 2022 14:44:58 -0500
Subject: [PATCH] "sub version" code for pre-releases

---
 build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a89af52f7c680c46218b69b2efa48dce9d7fe680..cf7315c280b9e74812359e8de981e8c6db3d79d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,8 @@ def urlFile = { url, name ->
     files(file.absolutePath)
 }
 
+def tags = grgit.tag.list().findAll { it.dateTime != null }.sort { it.dateTime }
+
 configurations {
     playstoreImplementation
     freeImplementation
@@ -122,7 +124,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 42024 + grgit.tag.list().findAll { it.dateTime != null }.size()
+        versionCode 42024 + tags.size()
         versionName grgit.describe(always: true)
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
@@ -282,7 +284,7 @@ android {
             if (baseAbiVersionCode != null) {
                 output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + baseAbiVersionCode
             } else {
-                output.versionCodeOverride = 100 * project.android.defaultConfig.versionCode
+                output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + grgit.log(includes: ["HEAD"], excludes: [tags.last()]).size()
             }
         }