From d52ca93ba64a79422e65ddeaef633e2c21f38bdb Mon Sep 17 00:00:00 2001
From: Vladimir Kotikov <v-vlkoti@microsoft.com>
Date: Tue, 9 Sep 2014 09:59:34 +0400
Subject: [PATCH 1/2] CB-7493 Adds test-build command to package.json

---
 .travis.yml  | 5 +++++
 package.json | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..e9919cdf
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: android
+install: npm install
+script:
+    - npm test
+    - npm run test-build
\ No newline at end of file
diff --git a/package.json b/package.json
index 8a6ab09c..a61927a8 100644
--- a/package.json
+++ b/package.json
@@ -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",

From 3f83fdbfc169e5f49bde36700d4ae4d2ff52797f Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Wed, 17 Sep 2014 21:27:06 -0400
Subject: [PATCH 2/2] CB-7512 Fix gradle asking for release password when
 building for debug

---
 bin/templates/project/build.gradle | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index b6994b64..6de8c547 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -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()
+        }
     }
 }