You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/09/18 03:28:30 UTC
[1/4] android commit: CB-7493 Adds test-build command to package.json
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x 215adab1f -> d022be547
CB-7493 Adds test-build command to package.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d52ca93b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d52ca93b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d52ca93b
Branch: refs/heads/4.0.x
Commit: d52ca93ba64a79422e65ddeaef633e2c21f38bdb
Parents: 8354651
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Tue Sep 9 09:59:34 2014 +0400
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Tue Sep 9 17:53:22 2014 +0400
----------------------------------------------------------------------
.travis.yml | 5 +++++
package.json | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d52ca93b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e9919cd
--- /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
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d52ca93b/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 8a6ab09..a61927a 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",
[4/4] android commit: Merge branch 'master' into 4.0.x (gradle)
Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (gradle)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d022be54
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d022be54
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d022be54
Branch: refs/heads/4.0.x
Commit: d022be547befb8926e4220fa9681e466dc9800b6
Parents: 215adab 3f83fdb
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Sep 17 21:27:55 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Sep 17 21:27:55 2014 -0400
----------------------------------------------------------------------
.travis.yml | 5 +++++
bin/templates/project/build.gradle | 10 ++++++----
package.json | 3 ++-
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d022be54/package.json
----------------------------------------------------------------------
[3/4] android commit: CB-7512 Fix gradle asking for release password
when building for debug
Posted by ag...@apache.org.
CB-7512 Fix gradle asking for release password when building for debug
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/3f83fdbf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/3f83fdbf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/3f83fdbf
Branch: refs/heads/4.0.x
Commit: 3f83fdbfc169e5f49bde36700d4ae4d2ff52797f
Parents: 9491525
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Sep 17 21:27:06 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Sep 17 21:27:06 2014 -0400
----------------------------------------------------------------------
bin/templates/project/build.gradle | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/3f83fdbf/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index b6994b6..6de8c54 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()
+ }
}
}
[2/4] android commit: Merge branch 'CB-7493' of
https://github.com/MSOpenTech/cordova-android
Posted by ag...@apache.org.
Merge branch 'CB-7493' of https://github.com/MSOpenTech/cordova-android
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/94915253
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/94915253
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/94915253
Branch: refs/heads/4.0.x
Commit: 949152532c05dfc3db17866551e013221cf00355
Parents: 7ce46ed d52ca93
Author: purplecabbage <pu...@gmail.com>
Authored: Wed Sep 17 14:58:08 2014 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Wed Sep 17 14:58:08 2014 -0700
----------------------------------------------------------------------
.travis.yml | 5 +++++
package.json | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------