"sub version" code for pre-releases

Stephen Paul Weber created 3 years ago

Change summary

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

Detailed changes

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()
             }
         }