From 93347c311610e4288abe170f5e99b401af2461c8 Mon Sep 17 00:00:00 2001
From: Carter Jernigan <git@carterjernigan.com>
Date: Thu, 3 Mar 2022 15:26:04 -0500
Subject: [PATCH] [#256] Fix release signing config

---
 app/build.gradle.kts | 47 +++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cb8c937e..578cd301 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -52,30 +52,19 @@ android {
         }
     }
 
-    buildTypes {
-        getByName("release").apply {
-            isMinifyEnabled = project.property("IS_MINIFY_ENABLED").toString().toBoolean()
-            isShrinkResources = project.property("IS_MINIFY_ENABLED").toString().toBoolean()
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-project.txt"
-            )
-        }
-    }
+    val releaseKeystorePath = project.property("ZCASH_RELEASE_KEYSTORE_PATH").toString()
+    val releaseKeystorePassword = project.property("ZCASH_RELEASE_KEYSTORE_PASSWORD").toString()
+    val releaseKeyAlias = project.property("ZCASH_RELEASE_KEY_ALIAS").toString()
+    val releaseKeyAliasPassword =
+        project.property("ZCASH_RELEASE_KEY_ALIAS_PASSWORD").toString()
+    val isReleaseSigningConfigured = listOf(
+        releaseKeystorePath,
+        releaseKeystorePassword,
+        releaseKeyAlias,
+        releaseKeyAliasPassword
+    ).all { !it.isNullOrBlank() }
 
     signingConfigs {
-        val releaseKeystorePath = project.property("ZCASH_RELEASE_KEYSTORE_PATH").toString()
-        val releaseKeystorePassword = project.property("ZCASH_RELEASE_KEYSTORE_PASSWORD").toString()
-        val releaseKeyAlias = project.property("ZCASH_RELEASE_KEY_ALIAS").toString()
-        val releaseKeyAliasPassword =
-            project.property("ZCASH_RELEASE_KEY_ALIAS_PASSWORD").toString()
-        val isReleaseSigningConfigured = listOf(
-            releaseKeystorePath,
-            releaseKeystorePassword,
-            releaseKeyAlias,
-            releaseKeyAliasPassword
-        ).all { !it.isNullOrBlank() }
-
         if (isReleaseSigningConfigured) {
             // If this block doesn't execute, the output will be unsigned
             create("release").apply {
@@ -87,6 +76,20 @@ android {
         }
     }
 
+    buildTypes {
+        getByName("release").apply {
+            isMinifyEnabled = project.property("IS_MINIFY_ENABLED").toString().toBoolean()
+            isShrinkResources = project.property("IS_MINIFY_ENABLED").toString().toBoolean()
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-project.txt"
+            )
+            if (isReleaseSigningConfigured) {
+                signingConfig = signingConfigs.getByName("release")
+            }
+        }
+    }
+    
     // TODO [#6]: Figure out how to move this into the build-conventions
     kotlinOptions {
         jvmTarget = libs.versions.java.get()