[GR-61383] Adapt to JLine 3.28.

PullRequest: truffleruby/4441
oracle · Jan 17, 2025 · 85b1c41 · 85b1c41
2 parents 88b3e12 + c3cdfaa
commit 85b1c41
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/common.json b/common.json
@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+2-128", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+5-417", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
 
     "oraclejdk23":       {"name": "jpg-jdk",   "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+4", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+4-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+4-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+4-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+4-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+4-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+4-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+5", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+5-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+5-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+5-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+5-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+5-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+5-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -22,7 +22,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "ad01302fe7d8dea1b56975033a163a7adbb24833",
+                "version": "c243a612eee9f3793b79ee455e26df3e33cf45e4",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -31,7 +31,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "ad01302fe7d8dea1b56975033a163a7adbb24833",
+                "version": "c243a612eee9f3793b79ee455e26df3e33cf45e4",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

diff --git a/src/main/java/org/truffleruby/stdlib/readline/ConsoleHolder.java b/src/main/java/org/truffleruby/stdlib/readline/ConsoleHolder.java
@@ -54,8 +54,9 @@
 import org.graalvm.shadowed.org.jline.terminal.Size;
 import org.graalvm.shadowed.org.jline.terminal.Terminal;
 import org.graalvm.shadowed.org.jline.terminal.impl.DumbTerminal;
-import org.graalvm.shadowed.org.jline.terminal.impl.ExecPty;
-import org.graalvm.shadowed.org.jline.terminal.spi.TerminalProvider;
+import org.graalvm.shadowed.org.jline.terminal.impl.exec.ExecPty;
+import org.graalvm.shadowed.org.jline.terminal.impl.exec.ExecTerminalProvider;
+import org.graalvm.shadowed.org.jline.terminal.spi.SystemStream;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.support.RubyIO;
@@ -124,7 +125,7 @@ private ConsoleHolder(
                 terminal = new PosixSysTerminalKeepSignalHandlers(
                         "TruffleRuby",
                         getType(),
-                        ExecPty.current(TerminalProvider.Stream.Output),
+                        ExecPty.current(new ExecTerminalProvider(), SystemStream.Output),
                         StandardCharsets.UTF_8);
             } else {
                 try (Terminal inherit = new DumbTerminal(in.getIn(), out.getOut())) {

diff --git a/src/main/java/org/truffleruby/stdlib/readline/SingleThreadTerminal.java b/src/main/java/org/truffleruby/stdlib/readline/SingleThreadTerminal.java
@@ -19,6 +19,8 @@
 import org.graalvm.shadowed.org.jline.terminal.Attributes;
 import org.graalvm.shadowed.org.jline.terminal.Size;
 import org.graalvm.shadowed.org.jline.terminal.impl.AbstractTerminal;
+import org.graalvm.shadowed.org.jline.terminal.spi.SystemStream;
+import org.graalvm.shadowed.org.jline.terminal.spi.TerminalProvider;
 import org.graalvm.shadowed.org.jline.utils.NonBlocking;
 import org.graalvm.shadowed.org.jline.utils.NonBlockingInputStream;
 import org.graalvm.shadowed.org.jline.utils.NonBlockingReader;
@@ -97,4 +99,13 @@ public void setSize(Size size) {
         this.size.copy(size);
     }
 
+    @Override
+    public TerminalProvider getProvider() {
+        return null;
+    }
+
+    @Override
+    public SystemStream getSystemStream() {
+        return null;
+    }
 }