Merge pull request #411 from Keyclic/master

infil00p · web-flow · commit 93efe71080d0 · 2017-10-16T11:23:29.000-07:00
CB-12802: (android) Fix build.gradle to sign when building with multiple APK is enable.
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
@@ -268,7 +268,7 @@ def promptForReleaseKeyPassword() {
 
 gradle.taskGraph.whenReady { taskGraph ->
     taskGraph.getAllTasks().each() { task ->
-        if (task.name == 'validateReleaseSigning' || task.name == 'validateSigningRelease') {
+        if (['validateReleaseSigning', 'validateSigningRelease', 'validateSigningArmv7Release', 'validateSigningX86Release'].contains(task.name)) {
             promptForReleaseKeyPassword()
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ def promptForReleaseKeyPassword() {`
`268`	`268`
`269`	`269`	`gradle.taskGraph.whenReady { taskGraph ->`
`270`	`270`	`taskGraph.getAllTasks().each() { task ->`
`271`		`- if (task.name == 'validateReleaseSigning' \|\| task.name == 'validateSigningRelease') {`
	`271`	`+ if (['validateReleaseSigning', 'validateSigningRelease', 'validateSigningArmv7Release', 'validateSigningX86Release'].contains(task.name)) {`
`272`	`272`	`promptForReleaseKeyPassword()`
`273`	`273`	`}`
`274`	`274`	`}`