Merge pull request #4436 from mwichmann/java21

Add support for Java 21
SCons · Oct 17, 2023 · 58eb211 · 58eb211
2 parents 2bfab82 + ac5d139
commit 58eb211
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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 = []
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
@@ Expand Down Expand Up / @@ -251,6 +252,7 @@ def addAnonClass(self) -> None: @@
                     '18.0',
                     '19.0',
                     '20.0',
+                    '21.0',
                 ):
                     self.stackAnonClassBrackets.append(self.brackets)
                     className = []
@@ Expand Down @@