From ac5d1398b2658a1ab9e0c278b637175e026c6773 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Tue, 17 Oct 2023 15:46:48 -0600 Subject: [PATCH] Add support for Java 21 Released in Sept 2023 - LTS version. Signed-off-by: Mats Wichmann --- CHANGES.txt | 1 + RELEASE.txt | 1 + SCons/Tool/JavaCommon.py | 2 ++ 3 files changed, 4 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index b9c41446d8..9076faa536 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -188,6 +188,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER avoid the GNU linker issuing warnings for its absence. - Eliminate more http: references (mostly in comments/docstrings where they really weren't harmful). A few links labeled dead with no alt. + - Add JDK 21 LTS support From Jonathon Reinhart: diff --git a/RELEASE.txt b/RELEASE.txt index 764cc40932..c0925bb5e0 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -78,6 +78,7 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY although the preferred usage remains to import from SCons.Util only. Any code that did the direct import will have to change to import from SCons.Util.sctypes. +- Add JDK 21 LTS support FIXES ----- diff --git a/SCons/Tool/JavaCommon.py b/SCons/Tool/JavaCommon.py index 0722f008cf..31695c21b2 100644 --- a/SCons/Tool/JavaCommon.py +++ b/SCons/Tool/JavaCommon.py @@ -124,6 +124,7 @@ def __init__(self, version=default_java_version) -> None: '18.0', '19.0', '20.0', + '21.0', ): msg = "Java version %s not supported" % version raise NotImplementedError(msg) @@ -251,6 +252,7 @@ def addAnonClass(self) -> None: '18.0', '19.0', '20.0', + '21.0', ): self.stackAnonClassBrackets.append(self.brackets) className = []