From 212345dea1b336af9441da4bae9dbccaac6770ca Mon Sep 17 00:00:00 2001
From: Peter Storch <peter.storch@tuta.io>
Date: Tue, 9 Nov 2021 22:12:23 +0100
Subject: [PATCH] Set distinct versionCode and name for nightlies

---
 build.gradle | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index ed62a5378..29587379b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,12 @@ def getVersionName = { ->
     }
 }
 
+def versionCodeFromDate = { ->
+    def date = new Date()
+    def formattedDate = date.format('yyyyMMdd')
+    return Integer.valueOf(formattedDate)
+}
+
 android {
     compileOptions {
         coreLibraryDesugaringEnabled true
@@ -41,7 +47,7 @@ android {
     compileSdkVersion 31
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
     }
 
     aaptOptions {
@@ -82,7 +88,6 @@ android {
         nightly {
             signingConfig signingConfigs.nightly
             applicationIdSuffix ".nightly"
-            versionNameSuffix "-nightly"
         }
 
         release {
@@ -97,6 +102,14 @@ android {
 
     applicationVariants.all { variant ->
         variant.resValue "string", "applicationId", variant.applicationId
+
+        if (variant.buildType.name == 'nightly') {
+            variant.outputs.all {
+                setVersionCodeOverride(versionCodeFromDate())
+                setVersionNameOverride(getVersionName())
+                outputFileName = "${applicationId}_${variant.versionCode}.apk"
+            }
+        }
     }
 }