Merge branch '15-improve-signing-process-and-get-application-version' into 'master'

Resolve "Improve signing process and get application version"

Closes #15

See merge request !12

.gitlab-ci.yml

@@ -29,7 +29,7 @@ android:build:
     # Android signing
     - echo "$ANDROID_KEYSTORE_FILE" | base64 -d > android/app/my.keystore
     - echo storeFile=my.keystore > android/key.properties
-    - echo storePassword=$ANDROID_KEY_STORE_PASSWORD >> android/key.properties
+    - echo storePassword=$ANDROID_KEYSTORE_PASSWORD >> android/key.properties
     - echo keyAlias=$ANDROID_KEY_ALIAS >> android/key.properties
     - echo keyPassword=$ANDROID_KEY_PASSWORD >> android/key.properties
     # build flutter app

android/app/build.gradle

@@ -6,19 +6,27 @@ if (localPropertiesFile.exists()) {
     }
 }
 
+def gradleProperties = new Properties()
+def gradlePropertiesFile = rootProject.file('gradle.properties')
+if (gradlePropertiesFile.exists()) {
+    gradlePropertiesFile.withReader('UTF-8') { reader ->
+        gradleProperties.load(reader)
+    }
+}
+
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
     throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+def appVersionCode = gradleProperties.getProperty('app.versionCode')
+if (appVersionCode == null) {
+    appVersionCode = '1'
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+def appVersionName = gradleProperties.getProperty('app.versionName')
+if (appVersionName == null) {
+    appVersionName = '1.0'
 }
 
 apply plugin: 'com.android.application'
@@ -41,8 +49,8 @@ android {
         applicationId "org.benoitharrault.hangman"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        versionCode appVersionCode.toInteger()
+        versionName appVersionName
         archivesBaseName = "$applicationId" + "_" + "$versionCode"
     }
 

android/gradle.properties

@@ -2,3 +2,5 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
+app.versionName=1.1.4
+app.versionCode=4