github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 07:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove java 1.8 version check (#1241)

Browse Source
This commit is contained in:
jcesarmobile 2021-07-07 13:19:09 +02:00 committed by GitHub
parent b31e024dbb
commit 8a9cb8f6b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/templates/cordova/lib/check_reqs.js vendored
View File

@ -25,11 +25,8 @@ const java = require('./env/java');
var REPO_ROOT = path.join(__dirname, '..', '..', '..', '..'); var REPO_ROOT = path.join(__dirname, '..', '..', '..', '..');
const { CordovaError, ConfigParser, events } = require('cordova-common'); const { CordovaError, ConfigParser, events } = require('cordova-common');
var android_sdk = require('./android_sdk'); var android_sdk = require('./android_sdk');
const semver = require('semver');
const { SDK_VERSION } = require('./gradle-config-defaults'); const { SDK_VERSION } = require('./gradle-config-defaults');
const EXPECTED_JAVA_VERSION = '1.8.x';
// Re-exporting these for backwards compatibility and for unit testing. // Re-exporting these for backwards compatibility and for unit testing.
// TODO: Remove uses and use the ./utils module directly. // TODO: Remove uses and use the ./utils module directly.
Object.assign(module.exports, { isWindows, isDarwin }); Object.assign(module.exports, { isWindows, isDarwin });
@ -123,14 +120,6 @@ module.exports.check_gradle = function () {
*/ */
module.exports.check_java = async function () { module.exports.check_java = async function () {
const javaVersion = await java.getVersion(); const javaVersion = await java.getVersion();
if (!semver.satisfies(javaVersion.version, EXPECTED_JAVA_VERSION)) {
throw new CordovaError(
`Requirements check failed for JDK ${EXPECTED_JAVA_VERSION}! Detected version: ${javaVersion.version}\n` +
'Check your ANDROID_SDK_ROOT / JAVA_HOME / PATH environment variables.'
);
}
return javaVersion; return javaVersion;
}; };

10
spec/unit/check_reqs.spec.js
View File

@ -23,7 +23,6 @@ var fs = require('fs-extra');
var path = require('path'); var path = require('path');
var events = require('cordova-common').events; var events = require('cordova-common').events;
var which = require('which'); var which = require('which');
const { CordovaError } = require('cordova-common');
const { const {
SDK_VERSION: DEFAULT_TARGET_API SDK_VERSION: DEFAULT_TARGET_API
@ -49,15 +48,6 @@ describe('check_reqs', function () {
}); });
describe('check_java', () => { describe('check_java', () => {
it('detects if unexpected JDK version is installed', async () => {
check_reqs.__set__({
EXPECTED_JAVA_VERSION: '9999.9999.9999',
java: { getVersion: async () => ({ version: '1.8.0' }) }
});
await expectAsync(check_reqs.check_java()).toBeRejectedWithError(CordovaError, /Requirements check failed for JDK 9999.9999.9999! Detected version: 1.8.0/);
});
it('should return the version', async () => { it('should return the version', async () => {
check_reqs.__set__({ check_reqs.__set__({
java: { getVersion: async () => ({ version: '1.8.0' }) } java: { getVersion: async () => ({ version: '1.8.0' }) }