From cca49913ab9efcab3c064f287be79ad84ed5c357 Mon Sep 17 00:00:00 2001
From: Dominic Tubach <dnt@luki.org>
Date: Fri, 5 Feb 2021 20:12:03 +0100
Subject: [PATCH] Add an extra version number to get in sync with upstream
 versions

---
 vector/build.gradle | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 4c45994748b..170d5ee06cd 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,6 +14,7 @@ kapt {
 ext.versionMajor = 1
 ext.versionMinor = 0
 ext.versionPatch = 15
+ext.versionSynod = 1
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -30,7 +31,7 @@ static def generateVersionCodeFromTimestamp() {
 def generateVersionCodeFromVersionName() {
     // plus 4_000_000 for compatibility reason with the previous way the Version Code was computed
     // Note that the result will be multiplied by 10 when adding the digit for the arch
-    return (versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch) + 4_000_000
+    return (versionMajor * 1_00_00_00 + versionMinor * 1_00_00 + versionPatch * 1_00 + versionSynod) + 4_000_000
 }
 
 def getVersionCode() {
@@ -120,7 +121,7 @@ android {
         versionCode project.getVersionCode()
 
         // Required for sonar analysis
-        versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar"
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}-${versionSynod}-sonar"
 
         buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
         resValue "string", "git_revision", "\"${gitRevision()}\""
@@ -234,7 +235,7 @@ android {
         gplay {
             dimension "store"
 
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}"
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}-${versionSynod}${getGplayVersionSuffix()}"
 
             resValue "bool", "isGplay", "true"
             buildConfigField "boolean", "ALLOW_FCM_USE", "true"
@@ -245,7 +246,7 @@ android {
         fdroid {
             dimension "store"
 
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}-${versionSynod}${getFdroidVersionSuffix()}"
 
             resValue "bool", "isGplay", "false"
             buildConfigField "boolean", "ALLOW_FCM_USE", "false"