Fix build on JDK 23

gnodet · Nov 8, 2024 · 4957ffa · 4957ffa
1 parent 7e937e0
commit 4957ffa
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, ubuntu-20.04, windows-latest, macos-latest ]
-        java: [ '22' ]
+        java: [ '23' ]
     steps:
       - uses: actions/checkout@v4
 

diff --git a/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java b/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java
@@ -25,15 +25,16 @@
  * limitations under the License.
  */
 
-/**
+/*
  * Based on http://antony.lesuisse.org/software/ajaxterm/
  *  Public Domain License
  */
 
-/**
+/*
  * See http://www.ecma-international.org/publications/standards/Ecma-048.htm
  *       and http://vt100.net/docs/vt510-rm/
  */
+
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/demo/src/main/java/org/apache/felix/gogo/jline/Posix.java b/demo/src/main/java/org/apache/felix/gogo/jline/Posix.java
@@ -1865,6 +1865,7 @@ public static class SortComparator implements Comparator<String> {
         private char separator;
         private List<Key> sortKeys;
 
+        @SuppressWarnings("this-escape")
         public SortComparator(
                 boolean caseInsensitive,
                 boolean reverse,

diff --git a/groovy/pom.xml b/groovy/pom.xml
@@ -70,6 +70,9 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
+                <configuration>
+                    <targetBytecode>${java.release.version}</targetBytecode>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>

diff --git a/jansi-core/src/main/java/org/jline/jansi/Ansi.java b/jansi-core/src/main/java/org/jline/jansi/Ansi.java
@@ -900,9 +900,9 @@ public String toString() {
         return builder.toString();
     }
 
-    ///////////////////////////////////////////////////////////////////
+    // =================================================================
     // Private Helper Methods
-    ///////////////////////////////////////////////////////////////////
+    // =================================================================
 
     private Ansi appendEscapeSequence(char command) {
         flushAttributes();

diff --git a/pom.xml b/pom.xml
@@ -104,7 +104,7 @@
         <gogo.jline.version>1.1.8</gogo.jline.version>
         <slf4j.version>2.0.16</slf4j.version>
         <findbugs.version>3.0.2</findbugs.version>
-        <groovy.version>4.0.23</groovy.version>
+        <groovy.version>5.0.0-alpha-10</groovy.version>
         <ivy.version>2.5.2</ivy.version>
         <graal.version>24.1.1</graal.version>
         <graal.plugin.version>21.2.0</graal.plugin.version>

diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java
@@ -189,7 +189,7 @@ public boolean isActive() {
         return !dead;
     } // isClosed
 
-    /****** Event handling ****************/
+    // ============= Event handling =============
 
     /**
      * Method that registers a ConnectionListener with the

diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java
@@ -139,7 +139,7 @@ public class TelnetIO {
      */
     protected static final int AO = 245;
 
-    /**** Implementation of OutputStream ****************************************************/
+    // ============= Implementation of OutputStream ===============
     /**
      * Are You There
      */
@@ -187,9 +187,9 @@ public class TelnetIO {
      */
     protected static final int SEND = 1;
 
-    /**** End implementation of OutputStream ***********************************************/
+    // ============ End implementation of OutputStream ============
 
-    /**** Implementation of InputStream ****************************************************/
+    // ============== Implementation of InputStream ===============
     /**
      * Telnet Option: Logout<br>
      * This allows nice goodbye to time-outed or unwanted clients.
@@ -206,7 +206,7 @@ public class TelnetIO {
     protected static final int LM_EDIT = 1;
     protected static final int LM_TRAPSIG = 2;
 
-    /**** Implementation of InputStream ****************************************************/
+    // ============== Implementation of InputStream ===============
 
     /****
      * Following methods implement init/request/answer procedures for telnet
@@ -219,12 +219,13 @@ public class TelnetIO {
     protected static final int LM_SLC_NOSUPPORT = 0;
     protected static final int LM_SLC_DEFAULT = 3;
 
-    /**** End telnet protocol level communication methods *******************************/
+    // ==== End telnet protocol level communication methods ===
+
     protected static final int LM_SLC_VALUE = 2;
 
-    /** Constants declaration ***********************************************/
+    // ============= Constants declaration ====================
 
-    // Telnet Protocoll Constants
+    // Telnet Protocol Constants
     protected static final int LM_SLC_CANTCHANGE = 1;
 
     protected static final int LM_SLC_LEVELBITS = 3;

diff --git a/terminal/src/main/java/org/jline/utils/InputStreamReader.java b/terminal/src/main/java/org/jline/utils/InputStreamReader.java
@@ -22,8 +22,7 @@
 import java.nio.charset.MalformedInputException;
 import java.nio.charset.UnmappableCharacterException;
 
-/**
- *
+/*
  * NOTE for JLine: the default InputStreamReader that comes from the JRE
  * usually read more bytes than needed from the input stream, which
  * is not usable in a character per character model used in the terminal.