diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index b7e32dd3..bb79a4d3 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -18173,7 +18173,7 @@ def alarm_handler(signum, frame): _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache')) # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue -version = VersionSpec("7.26.0") # GR-54502 +version = VersionSpec("7.26.1") # GR-54784 _mx_start_datetime = datetime.utcnow() diff --git a/src/mx/_impl/mx_ide_intellij.py b/src/mx/_impl/mx_ide_intellij.py index bfa26fbf..c8aee522 100644 --- a/src/mx/_impl/mx_ide_intellij.py +++ b/src/mx/_impl/mx_ide_intellij.py @@ -60,7 +60,7 @@ class IntellijConfig: external_projects: bool = True java_modules: bool = True native_projects: bool = False - max_java_compliance: int = 21 + max_java_compliance: int = 99 import_inner_classes: bool = False on_save_actions: bool = False refresh_only: bool = False @@ -323,7 +323,8 @@ def _intellij_exclude_if_exists(xml, p, name, output=False): def _complianceToIntellijLanguageLevel(compliance): # they changed the name format starting with JDK_10 if compliance.value >= 10: - # latest Idea 2021.2 requires the acceptance of a legal notice for beta Java specification to enable support for JDK17. Clamp at JDK16 by default + if config.max_java_compliance < compliance.value: + mx.warn(f"Requested Java compliance {compliance.value} is higher than maximum ({config.max_java_compliance}). Consider passing '--max-java-compliance'.") return 'JDK_' + str(min(compliance.value, config.max_java_compliance)) return 'JDK_1_' + str(compliance.value)