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

This commit is contained in:
Andrew Grieve
2014-09-17 21:27:55 -04:00
3 changed files with 13 additions and 5 deletions
+5
View File
@@ -0,0 +1,5 @@
language: android
install: npm install
script:
- npm test
- npm run test-build
+6 -4
View File
@@ -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()
}
}
}
+2 -1
View File
@@ -13,7 +13,8 @@
"apache"
],
"scripts": {
"test": "jasmine-node --color spec"
"test": "jasmine-node --color spec",
"test-build": "rm -rf \"test create\"; ./bin/create \"test create\" com.test.app Test && \"./test create/cordova/build\" && rm -rf \"test create\""
},
"author": "Apache Software Foundation",
"license": "Apache version 2.0",