From 54f1690478730ba49b08bf59e844bb01bb9e764b Mon Sep 17 00:00:00 2001
From: Peter Storch <peter.storch@tuta.io>
Date: Sat, 20 Nov 2021 23:04:12 +0100
Subject: [PATCH] Change versionCode for nightlies to commit count

---
 build.gradle | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3b2dbd45f..eea07938f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,10 +30,17 @@ def getVersionName = { ->
     }
 }
 
-def versionCodeFromDate = { ->
-    def date = new Date()
-    def formattedDate = date.format('yyyyMMdd')
-    return Integer.valueOf(formattedDate)
+def getVersionCode = { ->
+    try {
+        def stdout = new ByteArrayOutputStream()
+        exec {
+            commandLine 'git', 'rev-list', 'HEAD', '--count'
+            standardOutput = stdout
+        }
+        return Integer.valueOf(stdout.toString().trim())
+    } catch (ignored) {
+        return null
+    }
 }
 
 android {
@@ -105,7 +112,7 @@ android {
 
         if (variant.buildType.name == 'nightly') {
             variant.outputs.all {
-                setVersionCodeOverride(versionCodeFromDate())
+                setVersionCodeOverride(getVersionCode())
                 setVersionNameOverride(getVersionName())
                 outputFileName = "${applicationId}_${variant.versionCode}.apk"
             }