Skip to content

Commit 1705f16

Browse files
committed
[GR-35989] Wrong IntelliJ language level for projects with Java compliance 11+.
PullRequest: mx/1425
2 parents 7cbb641 + 1744f22 commit 1705f16

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"pip:isort": "==4.3.19",
4747
"pip:logilab-common": "==1.4.4",
4848
"pip:pylint": "==1.9.3",
49+
"pip:lazy-object-proxy": "==1.6.0",
4950
"pip:ninja_syntax": "==1.7.2"
5051
}
5152
},

mx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17876,7 +17876,7 @@ def alarm_handler(signum, frame):
1787617876

1787717877

1787817878
# The version must be updated for every PR (checked in CI)
17879-
version = VersionSpec("5.317.5") # GR-34982
17879+
version = VersionSpec("5.317.6") # GR-35989
1788017880

1788117881
currentUmask = None
1788217882
_mx_start_datetime = datetime.utcnow()

mx_ide_intellij.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ def _intellij_exclude_if_exists(xml, p, name, output=False):
242242

243243
def _complianceToIntellijLanguageLevel(compliance):
244244
# they changed the name format starting with JDK_10
245-
if compliance.value >= 16:
245+
if compliance.value >= 10:
246246
# latest Idea 2021.2 requires the acceptance of a legal notice for beta Java specification to enable support for JDK17. Clamp at JDK16.
247247
return 'JDK_' + str(min(compliance.value, 16))
248248
return 'JDK_1_' + str(compliance.value)

0 commit comments

Comments
 (0)