You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/10/19 16:50:04 UTC
[5/5] android commit: CB-11083: Fixing syncronous file check and
future-proofing the JS for Travis
CB-11083: Fixing syncronous file check and future-proofing the JS for Travis
This closes #323
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6aa4b1b3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6aa4b1b3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6aa4b1b3
Branch: refs/heads/master
Commit: 6aa4b1b301889c91656469d233e2fde93f150834
Parents: 304cbef
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Aug 10 15:29:24 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Oct 19 09:49:42 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/builders/GradleBuilder.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6aa4b1b3/bin/templates/cordova/lib/builders/GradleBuilder.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/builders/GradleBuilder.js b/bin/templates/cordova/lib/builders/GradleBuilder.js
index 6241091..8d6e76b 100644
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -73,11 +73,13 @@ GradleBuilder.prototype.prepBuildFiles = function() {
var subProjects = propertiesObj.libs;
var checkAndCopy = function(subProject, root) {
var subProjectGradle = path.join(root, subProject, 'build.gradle');
- fs.exists(subProject, function(exists) {
- if (!exists) {
+ // This is the future-proof way of checking if a file exists
+ // This must be synchronous to satisfy a Travis test
+ try {
+ fs.accessSync(subProjectGradle, fs.F_OK);
+ } catch (e) {
shell.cp('-f', pluginBuildGradle, subProjectGradle);
- }
- });
+ }
};
for (var i = 0; i < subProjects.length; ++i) {
if (subProjects[i] !== 'CordovaLib') {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org