You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/10/03 21:41:24 UTC
[3/3] android commit: CB-11640: Changing requirements check to ask
for Java 8
CB-11640: Changing requirements check to ask for Java 8
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/47abde2f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/47abde2f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/47abde2f
Branch: refs/heads/master
Commit: 47abde2f8d98df6a8c4ae547398c74ca8bd56e0a
Parents: 30325e4
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Sep 19 13:35:16 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Oct 3 14:41:14 2016 -0700
----------------------------------------------------------------------
bin/lib/check_reqs.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/47abde2f/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index f27f325..7790b22 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -152,7 +152,9 @@ module.exports.check_java = function() {
// javac writes version info to stderr instead of stdout
return tryCommand('javac -version', msg, true)
.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];
});
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org