From 08666761fc06621f60b0153bec16331982a01566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Wed, 17 Mar 2021 17:19:10 +0100
Subject: [PATCH] Fix get version code/name
---
.gitlab-ci.yml | 2 +-
android/app/build.gradle | 24 ++++++++++++++++--------
android/gradle.properties | 2 ++
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2e30ad..2441471 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/android/app/build.gradle b/android/app/build.gradle
index fff9287..2f9bebd 100644
--- a/android/app/build.gradle
+++ b/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"
}
diff --git a/android/gradle.properties b/android/gradle.properties
index a673820..e71f00e 100644
--- a/android/gradle.properties
+++ b/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
--
GitLab