From ed2f01d5241c082315bed835cd55f5655f9b6eb5 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Tue, 25 Jul 2023 07:12:42 -0600 Subject: Add Java 18, 19, 20 to support list. Signed-off-by: Mats Wichmann --- CHANGES.txt | 1 + RELEASE.txt | 1 + SCons/Tool/JavaCommon.py | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 265b4f8..db96df0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -130,6 +130,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Fix platform unit test on Windows for Py 3.12+. Fixes #4376. - More tweaking of test framework overview (which is duplicated onto the website, but not in the regular documentation section). + - Extend range of recognized Java versions to 20. From Jonathon Reinhart: - Fix another instance of `int main()` in CheckLib() causing failures diff --git a/RELEASE.txt b/RELEASE.txt index a881d7b..f72a2a6 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -59,6 +59,7 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY batch file exists but an individual msvc toolset may not support the host/target architecture combination. For example, when using VS2022 on arm64, the arm64 native tools are only installed for the 14.3x toolsets. +- Extend range of recognized Java versions to 20. FIXES ----- diff --git a/SCons/Tool/JavaCommon.py b/SCons/Tool/JavaCommon.py index 4a5a7c5..b3557c7 100644 --- a/SCons/Tool/JavaCommon.py +++ b/SCons/Tool/JavaCommon.py @@ -121,6 +121,9 @@ if java_parsing: '15.0', '16.0', '17.0', + '18.0', + '19.0', + '20.0', ): msg = "Java version %s not supported" % version raise NotImplementedError(msg) @@ -245,6 +248,9 @@ if java_parsing: '15.0', '16.0', '17.0', + '18.0', + '19.0', + '20.0', ): self.stackAnonClassBrackets.append(self.brackets) className = [] -- cgit v0.12