From 04a91bcee6c8a3a6ec8e7022aca96f3e93d8ffa4 Mon Sep 17 00:00:00 2001 From: Florian Angerer Date: Thu, 13 Jun 2024 10:47:20 +0200 Subject: [PATCH 1/4] bump default max-java-compliance to 24 --- src/mx/_impl/mx_ide_intellij.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mx_ide_intellij.py b/src/mx/_impl/mx_ide_intellij.py index bfa26fbf..28726a98 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 From 696a34b43dcce047aac2e4c1dd020b231e4a9d4e Mon Sep 17 00:00:00 2001 From: Florian Angerer Date: Thu, 13 Jun 2024 10:47:33 +0200 Subject: [PATCH 2/4] Warn if max compliance is lower than requested one --- src/mx/_impl/mx_ide_intellij.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mx/_impl/mx_ide_intellij.py b/src/mx/_impl/mx_ide_intellij.py index 28726a98..83f91ff8 100644 --- a/src/mx/_impl/mx_ide_intellij.py +++ b/src/mx/_impl/mx_ide_intellij.py @@ -324,6 +324,8 @@ 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) From 764d4d420dcbdfc7812751952bf4889ea6e86d8e Mon Sep 17 00:00:00 2001 From: Florian Angerer Date: Thu, 13 Jun 2024 10:50:58 +0200 Subject: [PATCH 3/4] Remove obsolete comment --- src/mx/_impl/mx_ide_intellij.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mx/_impl/mx_ide_intellij.py b/src/mx/_impl/mx_ide_intellij.py index 83f91ff8..c8aee522 100644 --- a/src/mx/_impl/mx_ide_intellij.py +++ b/src/mx/_impl/mx_ide_intellij.py @@ -323,7 +323,6 @@ 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)) From 9009ab49a4be60a08ece79a5ed5f5da7b65ffb84 Mon Sep 17 00:00:00 2001 From: Florian Angerer Date: Tue, 18 Jun 2024 09:55:03 +0200 Subject: [PATCH 4/4] Update version --- src/mx/_impl/mx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()