CB-12524: Workaround for obsolete gradle on integration servers
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a9a28d3e Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a9a28d3e Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a9a28d3e Branch: refs/heads/master Commit: a9a28d3e777d603510df36194c7ed9962003e2cf Parents: 6a77acd Author: Joe Bowser <[email protected]> Authored: Mon Mar 13 11:53:59 2017 -0700 Committer: Joe Bowser <[email protected]> Committed: Mon Mar 13 13:51:37 2017 -0700 ---------------------------------------------------------------------- .travis.yml | 1 + bin/templates/cordova/lib/builders/GradleBuilder.js | 3 ++- wrapper.gradle | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a9a28d3e/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 133dc20..a52db17 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 http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a9a28d3e/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 946cc75..b068f64 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'}); } }; http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a9a28d3e/wrapper.gradle ---------------------------------------------------------------------- diff --git a/wrapper.gradle b/wrapper.gradle new file mode 100644 index 0000000..d7ebabd --- /dev/null +++ b/wrapper.gradle @@ -0,0 +1 @@ +//This file is intentionally just a comment --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
