github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-9389 Fixes build/check_reqs hang

Browse Source 
This removes gradle version check since it requires downloading and
installing of gradle distributive if it is not installed yet.

Partial revert of 4bf705a

(cherry picked from commit f9ce1c607b)
This commit is contained in:
Vladimir Kotikov
2015-07-22 13:20:39 +03:00
committed by Nikhil Khandelwal
parent 4a7cbb5eb4
commit 5fa4728ebe
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/lib/check_reqs.js
+6 -9
View File
@@ -82,15 +82,12 @@ module.exports.check_ant = function() {
// Returns a promise. Called only by build and clean commands.
module.exports.check_gradle = function() {
var sdkDir = process.env['ANDROID_HOME'];
var message = 'Could not find gradle wrapper within Android SDK. ';
if (!sdkDir) return Q.reject(message + 'Might need to install Android SDK or set up \'ADROID_HOME\' env variable.');
var wrapper = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper', 'gradlew');
return tryCommand('"' + wrapper + '" -v', message + 'Might need to update your Android SDK.\n' +
'Looked here: ' + path.dirname(wrapper))
.then(function (output) {
// Parse Gradle version from command output
return/^gradle ((?:\d+\.)+(?:\d+))/gim.exec(output)[1];
});
var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
if (!fs.existsSync(wrapperDir)) {
return Q.reject(new Error('Could not find gradle wrapper within android sdk. Might need to update your Android SDK.\n' +
'Looked here: ' + wrapperDir));
}
return Q.when();
};
// Returns a promise.