From 7dd9277d6410c2aa1b00283294ba87ab3c143a38 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 30 Nov 2021 22:46:40 +0100
Subject: [PATCH] adapt versioning scheme, so that gplay users can migrate from
 split apks to aab

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

diff --git a/app/build.gradle b/app/build.gradle
index c2cc5aff6..904d95065 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,9 @@ android {
 
   defaultConfig {
     applicationId "se.leap.bitmaskclient"
-    versionCode 158
+    // the factor 1000 is used so that gplay users can upgrade from split apks ((current version number - 1) * 1000) + n
+    // to extracted bundle apks, supplied by google
+    versionCode 158 * 1000
     versionName "1.1.0"
     minSdkVersion 16
     targetSdkVersion 30
@@ -430,7 +432,7 @@ android.applicationVariants.all { variant ->
   variant.outputs.each { output ->
       // if not a fat build
       if (abiDimension.abiVersionCode > 0) {
-          output.versionCodeOverride = android.defaultConfig.versionCode * 1000 + abiDimension.abiVersionCode
+          output.versionCodeOverride = android.defaultConfig.versionCode + abiDimension.abiVersionCode
       }
   }
 
-- 
GitLab