From a0e08c9cee98d79dccefc0be1ccc1622d49bf6cc Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 22 May 2017 17:35:48 +0200
Subject: [PATCH] Move the versionCode and versionName into the gradle file.

Google itself says it is better to specify the versions in the gradle file:
https://developer.android.com/studio/publish/versioning.html

And it allow us the specify a specific versionCode by environment variable
instead of by modifying files.
---
 app/build.gradle                 | 19 +++++++++++++++++--
 app/src/main/AndroidManifest.xml |  4 +---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0b159360a..47c6d5d84 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,6 +188,8 @@ android {
       buildConfigField "String", "ENFORCED_LANG", "\"\""
       resValue "string", "app_name", "Kiwix"
       resValue "string", "app_search_string", "Search Kiwix"
+      versionCode 54
+      versionName "2.3"
     }
     // Custom apps built from a json file, zim file and icon set
     map.each { name, directory ->
@@ -227,9 +229,22 @@ android {
         buildConfigField "String", "ZIM_FILE_NAME", "\"$filename\""
         long length = zimfile.length()
         buildConfigField "long", "ZIM_FILE_SIZE", "$length"
-        if (parsedJson.content_version_code != null) {
-          buildConfigField "int", "CONTENT_VERSION_CODE", "$parsedJson.content_version_code"
+        if (project.hasProperty('version_code')) {
+          def version_code = project.property('version_code')
+          versionCode version_code.toInteger()
+          versionName "$version_code"
         } else {
+          versionCode parsedJson.version_code.toInteger()
+        }
+        if (project.hasProperty('content_version_code')) {
+          def content_version_code = project.property('content_version_code')
+          buildConfigField "int", "CONTENT_VERSION_CODE", "$content_version_code"
+        } else if (parsedJson.content_version_code != null) {
+          buildConfigField "int", "CONTENT_VERSION_CODE", "$parsedJson.content_version_code"
+        } else if (project.hasProperty('version_code'))  {
+          def version_code = project.property('version_code')
+          buildConfigField "int", "CONTENT_VERSION_CODE", "$version_code"
+        } else if (parsedJson.version_code != null) {
           buildConfigField "int", "CONTENT_VERSION_CODE", "$parsedJson.version_code"
         }
         buildConfigField "String", "ENFORCED_LANG", "\"$parsedJson.enforced_lang\""
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0e8723736..e0953f257 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.kiwix.kiwixmobile"
-  android:installLocation="auto"
-  android:versionCode="54"
-  android:versionName="2.3">
+  android:installLocation="auto">
 
   <supports-screens
     android:anyDensity="true"