public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-11640: Changing requirements check to ask for Java 8

Browse Source
This commit is contained in:
Joe Bowser 2016-09-19 13:35:16 -07:00
parent 30325e4f32
commit 47abde2f8d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/lib/check_reqs.js
View File

@ -152,7 +152,9 @@ module.exports.check_java = function() {
// javac writes version info to stderr instead of stdout // javac writes version info to stderr instead of stdout
return tryCommand('javac -version', msg, true) return tryCommand('javac -version', msg, true)
.then(function (output) { .then(function (output) {
var match = /javac ((?:\d+\.)+(?:\d+))/i.exec(output); console.log(output);
//Let's check for at least Java 8, and keep it future proof so we can support Java 10
var match = /javac ((?:1\.)(?:[8-9]\.)(?:\d+))|((?:1\.)(?:[1-9]\d+\.))(?:\d+)/i.exec(output);
return match && match[1]; return match && match[1];
}); });
}); });