Fix versionCode and build both flavours

medic · Nov 18, 2020 · 5377975 · 5377975
1 parent 8ff29b6
commit 5377975
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,9 @@ jobs:
       script: make test
 
     - stage: alpha
-      script: fastlane deploy flavor:unbranded
+      script:
+        - fastlane deploy flavor:unbrandedWebview
+        - fastlane deploy flavor:unbrandedXwalk
 
     - stage: deploy
     # flavors sorted alphabetically with three per job

diff --git a/build.gradle b/build.gradle
@@ -52,8 +52,7 @@ def getVersionCode = {
     if (versionCode > 2100000000 / 10)
       throw new RuntimeException('versionCode bigger than max allowed by Google Play.')
   }
-
-  return versionCode
+  return versionCode * 10
 }
 
 def getVersionName = {
@@ -69,7 +68,6 @@ android {
   }
 
   defaultConfig {
-    versionCode getVersionCode()
     versionName getVersionName()
     archivesBaseName = "${project.name}-${versionName}"
     targetSdkVersion 29
@@ -162,12 +160,16 @@ android {
     webview {
       dimension 'version'
       minSdkVersion 29 // Android 10
+      // the APK with a higher minSdkVersion value must have a higher versionCode value
+      // https://developer.android.com/google/play/publishing/multiple-apks
+      versionCode getVersionCode() + 1;
       versionNameSuffix '-webview'
     }
 
     xwalk {
       dimension 'version'
       minSdkVersion 19 // Android 4.4
+      versionCode getVersionCode();
       versionNameSuffix '-xwalk'
     }
 

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -9,7 +9,8 @@ platform :android do
   lane :deploy do |options|
     gradleTaskName = "assemble#{options[:flavor]}Release"
     version = ENV['TRAVIS_TAG'].empty? ? 'SNAPSHOT' : ENV['TRAVIS_TAG']
-    package_name = options[:flavor] == 'unbranded' ? "org.medicmobile.webapp.mobile" : "org.medicmobile.webapp.mobile.#{options[:flavor]}"
+    brand = options[:flavor].replace("Webview", "").replace("Xwalk", "")
+    package_name = brand == 'unbranded' ? "org.medicmobile.webapp.mobile" : "org.medicmobile.webapp.mobile.#{brand}"
 
     gradle(task: gradleTaskName)