github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 15:12:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-8548 Allow ant-style property key for key.store.type

Browse Source 
Other properties already allowed ant-style. This one was missed.
This commit is contained in:
Andrew Grieve 2015-03-31 20:42:26 -04:00
parent 1aaba440b5
commit 97718a0a25
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/templates/project/build.gradle
View File

@ -286,16 +286,14 @@ def addSigningProps(propsFilePath, signingConfig) {
signingConfig.keyPassword = props.get('keyPassword', props.get('key.alias.password', signingConfig.keyPassword)) signingConfig.keyPassword = props.get('keyPassword', props.get('key.alias.password', signingConfig.keyPassword))
signingConfig.storeFile = storeFile signingConfig.storeFile = storeFile
signingConfig.storePassword = props.get('storePassword', props.get('key.store.password', signingConfig.storePassword)) signingConfig.storePassword = props.get('storePassword', props.get('key.store.password', signingConfig.storePassword))
def storeType = props.get('storeType') def storeType = props.get('storeType', props.get('key.store.type', signingConfig.storeType))
if (!storeType) { if (!storeType) {
def filename = storeFile.getName().toLowerCase(); def filename = storeFile.getName().toLowerCase();
if (filename.endsWith('.p12') || filename.endsWith('.pfx')) { if (filename.endsWith('.p12') || filename.endsWith('.pfx')) {
storeType = 'pkcs12' storeType = 'pkcs12'
} }
} }
if (storeType) { signingConfig.storeType = storeType
signingConfig.storeType = storeType
}
} }
for (def func : cdvPluginPostBuildExtras) { for (def func : cdvPluginPostBuildExtras) {