From 11ac30d76fb28efcba9c3cf26f76f9b1d920867c Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Thu, 19 May 2022 15:26:58 +0200
Subject: [PATCH 1/2] update version number and apk's name

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

diff --git a/app/build.gradle b/app/build.gradle
index 6f4aaa57..1d21cbe7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,9 @@
 import java.text.SimpleDateFormat;
 apply plugin: 'com.android.application'
 def versionMajor = 1
+def versionMinor = 0
+def versionPatch = 0
+
 
 def buildTime() {
     def df = new SimpleDateFormat("yy-MM-dd'T'HHmm") // you can change it
@@ -27,10 +30,9 @@ android {
     defaultConfig {
         applicationId "foundation.e.drive"
         minSdkVersion 26
-        versionCode 1
-        //versionName "1.0"
-        versionName "beta-${versionMajor}-build-o-${buildTime()}"
-        setProperty("archivesBaseName", "$applicationId.$versionName")
+        versionCode versionMajor * 1000000 + versionMinor * 1000 + versionPatch
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+        setProperty("archivesBaseName", "eDrive-$versionName")
         buildConfigField "String", "testAccountName", "\""+getTestProp("testAccountName")+"\""
         buildConfigField "String", "testAccountPWd", "\""+getTestProp("testAccountPwd")+"\""
         buildConfigField "String", "testServerUrl", "\""+getTestProp("testServerUrl")+"\""
-- 
GitLab


From f72930445a6877424c1292873ba7f55bc5302a97 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 20 May 2022 07:23:01 +0000
Subject: [PATCH 2/2] Apply 1 suggestion(s) to 1 file(s)

---
 app/build.gradle | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1d21cbe7..9b0d7aa2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,12 +6,6 @@ def versionMinor = 0
 def versionPatch = 0
 
 
-def buildTime() {
-    def df = new SimpleDateFormat("yy-MM-dd'T'HHmm") // you can change it
-    df.setTimeZone(TimeZone.getTimeZone("UTC"))
-    return df.format(new Date())
-}
-
 def getTestProp(String propName) {
     def result = ""
     if(project.hasProperty(propName)){
-- 
GitLab