From 02296b9f8e410e3449853314fc0829c6da6d109a Mon Sep 17 00:00:00 2001 From: Fabian Te Date: Thu, 17 Jan 2019 20:07:11 +0100 Subject: [PATCH 1/3] Add missing log to Java version check --- bin/templates/cordova/lib/check_reqs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/templates/cordova/lib/check_reqs.js b/bin/templates/cordova/lib/check_reqs.js index 141042d7da..107a4f7108 100644 --- a/bin/templates/cordova/lib/check_reqs.js +++ b/bin/templates/cordova/lib/check_reqs.js @@ -357,6 +357,7 @@ module.exports.run = function () { return Q.all([this.check_java(), this.check_android()]).then(function (values) { console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']); console.log('JAVA_HOME=' + process.env['JAVA_HOME']); + console.log('Detected Java version: ' + values[0]); if (!String(values[0]).startsWith('1.8.')) { throw new CordovaError(`Requirements check failed for JDK 8 ('1.8.*')`); From b3211435b0160b9c722c15d3a88d1043be68092a Mon Sep 17 00:00:00 2001 From: Fabian Te Date: Thu, 17 Jan 2019 20:38:20 +0100 Subject: [PATCH 2/3] Simplify version check output --- bin/templates/cordova/lib/check_reqs.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/templates/cordova/lib/check_reqs.js b/bin/templates/cordova/lib/check_reqs.js index 107a4f7108..933962e102 100644 --- a/bin/templates/cordova/lib/check_reqs.js +++ b/bin/templates/cordova/lib/check_reqs.js @@ -355,16 +355,16 @@ module.exports.check_android_target = function (originalError) { // Returns a promise. module.exports.run = function () { return Q.all([this.check_java(), this.check_android()]).then(function (values) { - console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']); - console.log('JAVA_HOME=' + process.env['JAVA_HOME']); - console.log('Detected Java version: ' + values[0]); + console.log('Checking Java JDK and Android SDK versions'); if (!String(values[0]).startsWith('1.8.')) { - throw new CordovaError(`Requirements check failed for JDK 8 ('1.8.*')`); + throw new CordovaError( + `Requirements check failed for JDK 8 ('1.8.*')! Detected version: ${values[0]}\nCheck your JAVA_HOME / PATH environment variables.` + ); } if (!values[1]) { - throw new CordovaError('Requirements check failed for Android SDK'); + throw new CordovaError('Requirements check failed for Android SDK! Android SDK was not detected.'); } }); }; From 33ffdc48061c78ecca47794bfec68b08ed0c3f0d Mon Sep 17 00:00:00 2001 From: Fabian Te Date: Sat, 26 Jan 2019 08:40:44 +0100 Subject: [PATCH 3/3] Fix eslint error and re-add logging of ANDROID_HOME --- bin/templates/cordova/lib/check_reqs.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/templates/cordova/lib/check_reqs.js b/bin/templates/cordova/lib/check_reqs.js index 933962e102..affbefd654 100644 --- a/bin/templates/cordova/lib/check_reqs.js +++ b/bin/templates/cordova/lib/check_reqs.js @@ -356,10 +356,12 @@ module.exports.check_android_target = function (originalError) { module.exports.run = function () { return Q.all([this.check_java(), this.check_android()]).then(function (values) { console.log('Checking Java JDK and Android SDK versions'); + console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']); if (!String(values[0]).startsWith('1.8.')) { throw new CordovaError( - `Requirements check failed for JDK 8 ('1.8.*')! Detected version: ${values[0]}\nCheck your JAVA_HOME / PATH environment variables.` + 'Requirements check failed for JDK 8 (\'1.8.*\')! Detected version: ' + values[0] + '\n' + + 'Check your JAVA_HOME / ANDROID_HOME / PATH environment variables.' ); }