From b27d283f21a041739dde3c4732866f46832b0ba9 Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Tue, 7 Apr 2015 20:36:13 -0400 Subject: [PATCH] CB-8548 Fix keystore type detection (broken by 97718a0a25ec50fedf) --- bin/templates/project/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle index c8df6dce..e40af305 100644 --- a/bin/templates/project/build.gradle +++ b/bin/templates/project/build.gradle @@ -287,11 +287,13 @@ def addSigningProps(propsFilePath, signingConfig) { signingConfig.keyPassword = props.get('keyPassword', props.get('key.alias.password', signingConfig.keyPassword)) signingConfig.storeFile = storeFile signingConfig.storePassword = props.get('storePassword', props.get('key.store.password', signingConfig.storePassword)) - def storeType = props.get('storeType', props.get('key.store.type', signingConfig.storeType)) + def storeType = props.get('storeType', props.get('key.store.type', '')) if (!storeType) { def filename = storeFile.getName().toLowerCase(); if (filename.endsWith('.p12') || filename.endsWith('.pfx')) { storeType = 'pkcs12' + } else { + storeType = signingConfig.storeType // "jks" } } signingConfig.storeType = storeType