You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2021/04/13 10:13:08 UTC
[cordova-android] branch master updated: breaking: remove keystore
password prompt (#1048)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new eefa91b breaking: remove keystore password prompt (#1048)
eefa91b is described below
commit eefa91b3eaa28f594c6dd0557bd0cd6d4385bb4d
Author: Norman Breau <no...@normanbreau.com>
AuthorDate: Tue Apr 13 07:13:01 2021 -0300
breaking: remove keystore password prompt (#1048)
---
bin/templates/project/app/build.gradle | 24 ++----------------------
framework/cordova.gradle | 25 -------------------------
2 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/bin/templates/project/app/build.gradle b/bin/templates/project/app/build.gradle
index 7f82d47..022bb89 100644
--- a/bin/templates/project/app/build.gradle
+++ b/bin/templates/project/app/build.gradle
@@ -308,9 +308,9 @@ android {
release {
// These must be set or Gradle will complain (even if they are overridden).
keyAlias = ""
- keyPassword = "__unset" // And these must be set to non-empty in order to have the signing step added to the task graph.
+ keyPassword = ""
storeFile = null
- storePassword = "__unset"
+ storePassword = ""
}
}
buildTypes {
@@ -350,26 +350,6 @@ dependencies {
// SUB-PROJECT DEPENDENCIES END
}
-def promptForReleaseKeyPassword() {
- if (!cdvReleaseSigningPropertiesFile) {
- return;
- }
- if ('__unset'.equals(android.signingConfigs.release.storePassword)) {
- android.signingConfigs.release.storePassword = privateHelpers.promptForPassword('Enter key store password: ')
- }
- if ('__unset'.equals(android.signingConfigs.release.keyPassword)) {
- android.signingConfigs.release.keyPassword = privateHelpers.promptForPassword('Enter key password: ');
- }
-}
-
-gradle.taskGraph.whenReady { taskGraph ->
- taskGraph.getAllTasks().each() { task ->
- if(['validateReleaseSigning', 'validateSigningRelease', 'validateSigningArmv7Release', 'validateSigningX76Release'].contains(task.name)) {
- promptForReleaseKeyPassword()
- }
- }
-}
-
def addSigningProps(propsFilePath, signingConfig) {
def propsFile = file(propsFilePath)
def props = new Properties()
diff --git a/framework/cordova.gradle b/framework/cordova.gradle
index 36750b6..ba9b37a 100644
--- a/framework/cordova.gradle
+++ b/framework/cordova.gradle
@@ -131,30 +131,6 @@ def doExtractStringFromManifest(name) {
return matcher.group(1)
}
-def doPromptForPassword(msg) {
- if (System.console() == null) {
- def ret = null
- new SwingBuilder().edt {
- dialog(modal: true, title: 'Enter password', alwaysOnTop: true, resizable: false, locationRelativeTo: null, pack: true, show: true) {
- vbox {
- label(text: msg)
- def input = passwordField()
- button(defaultButton: true, text: 'OK', actionPerformed: {
- ret = input.password;
- dispose();
- })
- }
- }
- }
- if (!ret) {
- throw new GradleException('User canceled build')
- }
- return new String(ret)
- } else {
- return System.console().readPassword('\n' + msg);
- }
-}
-
def doGetConfigXml() {
def xml = file("src/main/res/xml/config.xml").getText()
// Disable namespace awareness since Cordova doesn't use them properly
@@ -183,7 +159,6 @@ ext {
privateHelpers.findLatestInstalledBuildTools = { doFindLatestInstalledBuildTools('19.1.0') }
privateHelpers.extractIntFromManifest = { name -> doExtractIntFromManifest(name) }
privateHelpers.extractStringFromManifest = { name -> doExtractStringFromManifest(name) }
- privateHelpers.promptForPassword = { msg -> doPromptForPassword(msg) }
privateHelpers.ensureValueExists = { filePath, props, key -> doEnsureValueExists(filePath, props, key) }
// These helpers can be used by plugins / projects and will not change.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org