From dc12d373f6d9fbef8e500a1a94a4b02a9de224ef Mon Sep 17 00:00:00 2001
From: Uipko Berghuis <uipko.berghuis@fox-it.com>
Date: Fri, 6 Dec 2019 20:42:35 +0100
Subject: Move release signing settings to signingConfig

Use keystore for release builds and debug signing for debug builds.
---
 main/build.gradle.kts | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'main')

diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index f7695d18..0a548a68 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -57,7 +57,17 @@ android {
     }
 
     signingConfigs {
-        create("release") {}
+        create("release") {
+            // ~/.gradle/gradle.properties
+            val keystoreFile: String? by project
+            storeFile = keystoreFile?.let { file(it) }
+            val keystorePassword: String? by project
+            storePassword = keystorePassword
+            val keystoreAliasPassword: String? by project
+            keyPassword = keystoreAliasPassword
+            val keystoreAlias: String? by project
+            keyAlias = keystoreAlias
+        }
     }
 
     lintOptions {
@@ -132,20 +142,7 @@ dependencies {
     testImplementation("org.mockito:mockito-core:3.1.0")
     testImplementation("org.robolectric:robolectric:4.3.1")
 }
-// ~/.gradle/gradle.properties
-if (project.hasProperty("keystoreFile") &&
-        project.hasProperty("keystorePassword") &&
-        project.hasProperty("keystoreAliasPassword")) {
-    android.signingConfigs.getByName("release") {
-        storeFile = file(project.properties["keystoreFile"] as String)
-        storePassword = project.properties["keystorePassword"] as String
-        keyPassword = project.properties["keystoreAliasPassword"] as String
-        keyAlias = project.properties["keystoreAlias"] as String
-    }
-} else {
-    logger.warn("Release signing config not found. Using debug signing instead.")
-    android.buildTypes.getByName("release").signingConfig = android.signingConfigs.getByName("debug")
-}
+
 
 /* swig magic for building openvpn3 */
 fun getOpenvpn3SwigFiles(): File {
-- 
cgit v1.2.3