From a9a28d3e777d603510df36194c7ed9962003e2cf Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Mon, 13 Mar 2017 11:53:59 -0700 Subject: [PATCH] CB-12524: Workaround for obsolete gradle on integration servers --- .travis.yml | 1 + bin/templates/cordova/lib/builders/GradleBuilder.js | 3 ++- wrapper.gradle | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 wrapper.gradle diff --git a/.travis.yml b/.travis.yml index 133dc206..a52db177 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ jdk: before_install: - nvm install 6 - node --version + - gradle --version install: - npm install - npm install -g codecov diff --git a/bin/templates/cordova/lib/builders/GradleBuilder.js b/bin/templates/cordova/lib/builders/GradleBuilder.js index 946cc75e..b068f641 100644 --- a/bin/templates/cordova/lib/builders/GradleBuilder.js +++ b/bin/templates/cordova/lib/builders/GradleBuilder.js @@ -71,10 +71,11 @@ GradleBuilder.prototype.getArgs = function(cmd, opts) { GradleBuilder.prototype.runGradleWrapper = function(gradle_cmd) { var gradlePath = path.join(this.root, 'gradlew'); + var wrapperGradle = path.join(this.root, 'wrapper.gradle'); if(fs.existsSync(gradlePath)) { //Literally do nothing, for some reason this works, while !fs.existsSync didn't on Windows } else { - return spawn(gradle_cmd, ['-p', this.root, 'wrapper'], {stdio: 'inherit'}); + return spawn(gradle_cmd, ['-p', this.root, 'wrapper', '-b', wrapperGradle], {stdio: 'inherit'}); } }; diff --git a/wrapper.gradle b/wrapper.gradle new file mode 100644 index 00000000..d7ebabd7 --- /dev/null +++ b/wrapper.gradle @@ -0,0 +1 @@ +//This file is intentionally just a comment