You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/02/25 21:43:04 UTC
android commit: CB-8548 Allow ant-style property keys in
signing.properties files
Repository: cordova-android
Updated Branches:
refs/heads/master 2a49e8a93 -> beab74adf
CB-8548 Allow ant-style property keys in signing.properties files
Provides easier backwards compatibility
close #155
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/beab74ad
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/beab74ad
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/beab74ad
Branch: refs/heads/master
Commit: beab74adf54ee5914e76b2a39737e6018f23d4fc
Parents: 2a49e8a
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Feb 25 15:41:58 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Feb 25 15:41:58 2015 -0500
----------------------------------------------------------------------
bin/templates/project/build.gradle | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/beab74ad/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 82fb04a..f482909 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -274,17 +274,18 @@ def addSigningProps(propsFilePath, signingConfig) {
propsFile.withReader { reader ->
props.load(reader)
}
- def storeFile = new File(privateHelpers.ensureValueExists(propsFilePath, props, 'storeFile'))
+
+ def storeFile = new File(props.get('key.store') ?: privateHelpers.ensureValueExists(propsFilePath, props, 'storeFile'))
if (!storeFile.isAbsolute()) {
storeFile = RelativePath.parse(true, storeFile.toString()).getFile(propsFile.getParentFile())
}
if (!storeFile.exists()) {
throw new FileNotFoundException('Keystore file does not exist: ' + storeFile.getAbsolutePath())
}
- signingConfig.keyAlias = privateHelpers.ensureValueExists(propsFilePath, props, 'keyAlias')
- signingConfig.keyPassword = props.get('keyPassword', signingConfig.keyPassword)
+ signingConfig.keyAlias = props.get('key.alias') ?: privateHelpers.ensureValueExists(propsFilePath, props, 'keyAlias')
+ signingConfig.keyPassword = props.get('keyPassword', props.get('key.alias.password', signingConfig.keyPassword))
signingConfig.storeFile = storeFile
- signingConfig.storePassword = props.get('storePassword', signingConfig.storePassword)
+ signingConfig.storePassword = props.get('storePassword', props.get('key.store.password', signingConfig.storePassword))
def storeType = props.get('storeType')
if (!storeType) {
def filename = storeFile.getName().toLowerCase();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org