Skip to content

Commit 09857a7

Browse files
committed
[GR-67168] Support broader set of IntelliJ JDK version strings
PullRequest: mx/1953
2 parents 828645c + 5d1a0ff commit 09857a7

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/mx/_impl/mx_ide_intellij.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,13 @@ def verSort(path):
182182
# Examples:
183183
# java version "21"
184184
# GraalVM version 21 (vendor name may change)
185+
# Oracle OpenJDK 11.0.18 - aarch64
185186
# Oracle OpenJDK 21.0.2
187+
# Oracle OpenJDK 26 - aarch64
186188
intellij_java_sdk_type: re.compile(r'^java\s+version\s+"([^"]+)"$|'
187189
r'^(?:.+ )?version\s+(.+)$|'
188190
r'^([\d._]+)$|'
189-
r'^Oracle OpenJDK ([\d._]+)$'),
191+
r'^Oracle OpenJDK ([\d._]+).*$'),
190192
intellij_python_sdk_type: re.compile(r'^Python\s+(.+)$'),
191193

192194
# Examples:

src/mx/mx_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
2-
version = "7.60.1" # GR-68873
2+
version = "7.60.2" # GR-67168: Support broader set of IntelliJ JDK version strings

0 commit comments

Comments
 (0)