mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-01 02:12:58 +08:00
CB-8898 Report expected gradle location properly
This commit is contained in:
parent
b5d8b51310
commit
096e1e3caa
@ -86,7 +86,7 @@ module.exports.check_gradle = function() {
|
|||||||
if (!sdkDir) return Q.reject(message + 'Might need to install Android SDK or set up \'ADROID_HOME\' env variable.');
|
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');
|
var wrapper = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper', 'gradlew');
|
||||||
return tryCommand('"' + wrapper + '" -v', message + 'Might need to update your Android SDK.\n' +
|
return tryCommand('"' + wrapper + '" -v', message + 'Might need to update your Android SDK.\n' +
|
||||||
'Looked here: ' + path.basename(wrapper))
|
'Looked here: ' + path.dirname(wrapper))
|
||||||
.then(function (output) {
|
.then(function (output) {
|
||||||
// Parse Gradle version from command output
|
// Parse Gradle version from command output
|
||||||
return/^gradle ((?:\d+\.)+(?:\d+))/gim.exec(output)[1];
|
return/^gradle ((?:\d+\.)+(?:\d+))/gim.exec(output)[1];
|
||||||
|
Loading…
Reference in New Issue
Block a user