From a99667d471709073dce176e6bb89a29c67697122 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 6 Nov 2023 12:28:28 +0100
Subject: [PATCH] feat: New fastfile to build Libre in github

---
 fastlane/Fastfile                | 16 +++++++++++-----
 fastlane/README.md               | 14 +++++++++++---
 fastlane/releaseDescGenerator.sh | 22 +++++++++++++++-------
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 303efcc2e..f7aee1053 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -18,11 +18,11 @@ platform :android do
     gradle(task: "test")
   end
 
-  desc "Build a new Beta version"
-  lane :build_beta do |options|
+  desc "Build a new version"
+  lane :build do |options|
     gradle(
       task: "assemble",
-      flavor: "free",
+      flavor: options[:flavor],
       build_type: "Release",
       print_command: false,
       properties: {
@@ -33,8 +33,14 @@ platform :android do
       }
     )
     sh("mkdir", "-p", "../releases")
-    @releaseFile = "../releases/KeePassDX-" + android_get_version_name + ".apk"
-    sh("cp", "../app/build/outputs/apk/free/release/app-free-release.apk", @releaseFile)
+    @releaseFile = "../releases/KeePassDX-" + android_get_version_name + "-" + options[:flavor] + ".apk"
+    sh("cp", "../app/build/outputs/apk/" + options[:flavor] + "/release/app-" + options[:flavor] + "-release.apk", @releaseFile)
+  end
+  
+  desc "Build each flavor and create release"
+  lane :build_release do |options|
+    build(flavor: "free", storefile: options[:storefile], storepass: options[:storepass], keyalias: options[:keyalias], keypass: options[:keypass])
+    build(flavor: "libre", storefile: options[:storefile], storepass: options[:storepass], keyalias: options[:keyalias], keypass: options[:keypass])
     sh("./releaseDescGenerator.sh", android_get_version_code, android_get_version_name)
   end
 
diff --git a/fastlane/README.md b/fastlane/README.md
index fc18d75e5..a8c37ba85 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -23,13 +23,21 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 Runs all the tests
 
-### android build_beta
+### android build
 
 ```sh
-[bundle exec] fastlane android build_beta
+[bundle exec] fastlane android build
 ```
 
-Build a new Beta version
+Build a new version
+
+### android build_release
+
+```sh
+[bundle exec] fastlane android build_release
+```
+
+Build each flavor and create release
 
 ### android deploy_beta_free
 
diff --git a/fastlane/releaseDescGenerator.sh b/fastlane/releaseDescGenerator.sh
index a1da0cbec..92eb3f3a1 100755
--- a/fastlane/releaseDescGenerator.sh
+++ b/fastlane/releaseDescGenerator.sh
@@ -3,12 +3,20 @@
 # $1 versionCode
 # $2 version Name
 CHANGELOGPATH="./metadata/android/en-US/changelogs/$1.txt"
-PACKAGEPATH="../releases/KeePassDX-$2.apk"
-RELEASEDESCPATH="../releases/KeePassDX-$2_desc"
+PACKAGEFREEPATH="../releases/KeePassDX-$2-free.apk"
+PACKAGELIBREPATH="../releases/KeePassDX-$2-libre.apk"
+RELEASEDESCPATH="../releases/KeePassDX-$2-desc"
 
 echo "$(<$CHANGELOGPATH)" $'\n' >> $RELEASEDESCPATH
-# Checksum
-echo "MD5 : $(md5sum $PACKAGEPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
-echo "SHA1 : $(sha1sum $PACKAGEPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
-echo "SHA256 : $(sha256sum $PACKAGEPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
-echo "CRC32 : $(crc32 $PACKAGEPATH)" >> $RELEASEDESCPATH
+# Checksum Free
+echo "Build Free" >> $RELEASEDESCPATH
+echo "MD5 : $(md5sum $PACKAGEFREEPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
+echo "SHA1 : $(sha1sum $PACKAGEFREEPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
+echo "SHA256 : $(sha256sum $PACKAGEFREEPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
+echo "CRC32 : $(crc32 $PACKAGEFREEPATH)" >> $RELEASEDESCPATH
+# Checksum Libre
+echo $'\n'"Build Libre" >> $RELEASEDESCPATH
+echo "MD5 : $(md5sum $PACKAGELIBREPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
+echo "SHA1 : $(sha1sum $PACKAGELIBREPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
+echo "SHA256 : $(sha256sum $PACKAGELIBREPATH  | cut -d ' ' -f 1)" >> $RELEASEDESCPATH
+echo "CRC32 : $(crc32 $PACKAGELIBREPATH)" >> $RELEASEDESCPATH