From 7034d7f611062e12cde370892403c96973a17d3b Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Fri, 16 Sep 2022 14:29:42 +0000
Subject: [PATCH] Add signing on gradle

---
 .drone.yml       | 15 ++++++++-------
 app/build.gradle | 12 ++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9db0457..bc6d46e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,20 +6,20 @@ steps:
   - name: build
     image: mingc/android-build-box
     commands:
-      - curl -sSL -u "$USERNAME:$PASSWORD" -o $KEYFILE https://cloud.crystalyx.net/remote.php/dav/files/$USERNAME/Bordel/$KEYFILE
-      - sh gradlew build bundle
-      - jarsigner -verbose -keystore $KEYFILE -storepass $KEYPASS -keypass $KEYPASS app/build/outputs/bundle/release/app-release.aab $KEYALIAS
-      - /opt/android-sdk/build-tools/30.0.2/apksigner sign -v --ks $KEYFILE --ks-key-alias $KEYALIAS --ks-pass pass:$KEYPASS --key-pass pass:$KEYPASS app/build/outputs/apk/debug/app-debug.apk
+      - curl -sSL -u "$USERNAME:$PASSWORD" -o $STORE_FILE https://cloud.crystalyx.net/remote.php/dav/files/$USERNAME/Bordel/$STORE_FILE
+      - sh gradlew build bundleRelease assembleRelease
     environment:
       USERNAME:
         from_secret: nextcloud_user
       PASSWORD:
         from_secret: nextcloud_password
-      KEYFILE:
+      STORE_FILE:
         from_secret: android_keyfile
-      KEYALIAS:
+      STORE_PASSWORD:
+        from_secret: android_keypass
+      KEY_ALIAS:
         from_secret: android_keyalias
-      KEYPASS:
+      KEY_PASSWORD:
         from_secret: android_keypass
   - name: release
     image: plugins/gitea-release
@@ -29,6 +29,7 @@ steps:
       base_url: https://git.crystalyx.net
       files:
         - app/build/outputs/apk/debug/app-debug.apk
+        - app/build/outputs/apk/release/app-release.apk
         - app/build/outputs/bundle/release/app-release.aab
     when:
       event: tag
diff --git a/app/build.gradle b/app/build.gradle
index 43f7701..6d8c70a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,10 +14,22 @@ android {
         versionName "3.0"
     }
 
+    signingConfigs {
+        release {
+            if (System.env.STORE_FILE) {
+                storeFile file(System.env.STORE_FILE)
+                storePassword System.env.STORE_PASSWORD
+                keyAlias System.env.KEY_ALIAS
+                keyPassword System.env.KEY_PASSWORD
+            }
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }