Merge branch 'master' into 4.0.x (gradle)

2026-05-30 00:00:04 +08:00 · 2014-09-17 21:27:55 -04:00
parent 215adab1f9 3f83fdbfc1
commit d022be547b
3 changed files with 13 additions and 5 deletions
@@ -140,7 +140,7 @@ def promptForPassword(msg) {
    }
 }

-task promptForReleaseKeyPassword {
+def promptForReleaseKeyPassword() {
    if (!System.env.RELEASE_SIGNING_PROPERTIES_FILE) {
        return;
    }
@@ -153,9 +153,11 @@ task promptForReleaseKeyPassword {
    }
 }

-tasks.whenTaskAdded { task ->
-    if (task.name == 'validateReleaseSigning') {
-        task.dependsOn promptForReleaseKeyPassword
+gradle.taskGraph.whenReady { taskGraph ->
+    taskGraph.getAllTasks().each() { task ->
+        if (task.name == 'validateReleaseSigning') {
+            promptForReleaseKeyPassword()
+        }
    }
 }