Skip to content

Commit 2b4657a

Browse files
committed
[GR-45896] Upgrade JLine to 3.23.
PullRequest: truffleruby/3827
2 parents ab9f1a6 + 47b1c1a commit 2b4657a

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

common.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "6.22.0",
7+
"mx_version": "6.23.6",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -34,12 +34,12 @@
3434
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-debug", "platformspecific": true },
3535
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
3636

37-
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b02", "platformspecific": true },
38-
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b02-debug", "platformspecific": true },
39-
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b02-sulong", "platformspecific": true },
40-
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b02", "platformspecific": true },
41-
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b02-debug", "platformspecific": true },
42-
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b02-sulong", "platformspecific": true }
37+
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+22-jvmci-23.1-b03", "platformspecific": true },
38+
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+22-jvmci-23.1-b03-debug", "platformspecific": true },
39+
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+22-jvmci-23.1-b03-sulong", "platformspecific": true },
40+
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+22-jvmci-23.1-b03", "platformspecific": true },
41+
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+22-jvmci-23.1-b03-debug", "platformspecific": true },
42+
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+22-jvmci-23.1-b03-sulong", "platformspecific": true }
4343

4444
},
4545

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"name": "regex",
99
"subdir": True,
10-
"version": "1278cae8aab28d43939aefaf699e1c09d529715b",
10+
"version": "f3bac55b14efba68af24e04608eab21a518e192d",
1111
"urls": [
1212
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1313
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
1616
{
1717
"name": "sulong",
1818
"subdir": True,
19-
"version": "1278cae8aab28d43939aefaf699e1c09d529715b",
19+
"version": "f3bac55b14efba68af24e04608eab21a518e192d",
2020
"urls": [
2121
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2222
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/main/java/org/truffleruby/stdlib/readline/ConsoleHolder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.graalvm.shadowed.org.jline.terminal.Terminal;
5656
import org.graalvm.shadowed.org.jline.terminal.impl.DumbTerminal;
5757
import org.graalvm.shadowed.org.jline.terminal.impl.ExecPty;
58+
import org.graalvm.shadowed.org.jline.terminal.spi.TerminalProvider;
5859
import org.truffleruby.RubyContext;
5960
import org.truffleruby.RubyLanguage;
6061
import org.truffleruby.core.support.RubyIO;
@@ -124,7 +125,7 @@ private ConsoleHolder(
124125
terminal = new PosixSysTerminalKeepSignalHandlers(
125126
"TruffleRuby",
126127
getType(),
127-
ExecPty.current(),
128+
ExecPty.current(TerminalProvider.Stream.Output),
128129
StandardCharsets.UTF_8);
129130
} else {
130131
try (Terminal inherit = new DumbTerminal(in.getIn(), out.getOut())) {

0 commit comments

Comments
 (0)