Skip to content

Commit 116196b

Browse files
committed
[GR-32352] Switch from JDK 16 to JDK 17
1 parent 037dadf commit 116196b

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

mx.truffleruby/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
suite = {
2-
"mxversion": "5.302.0",
2+
"mxversion": "5.309.0",
33
"name": "truffleruby",
44

55
"imports": {

src/main/java/org/truffleruby/builtins/YieldingCoreMethodNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class YieldingCoreMethodNode extends CoreMethodArrayArgumentsNod
1616

1717
@Child private CallBlockNode yieldNode = CallBlockNode.create();
1818

19-
// Not called yield() because that warns in JDK16
19+
// Not called yield() because that warns in Java 13+
2020
public Object callBlock(RubyProc block, Object... arguments) {
2121
return yieldNode.yield(block, arguments);
2222
}

tool/jt.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ def help
710710
Default value is --use jvm, therefore all commands run on truffleruby-jvm by default.
711711
The default can be changed with `export RUBY_BIN=RUBY_SELECTOR`
712712
--silent Does not print the command and which Ruby is used
713-
--jdk Specifies which version of the JDK should be used: 8, 11 (default) or 16
713+
--jdk Specifies which version of the JDK should be used: 8, 11 (default) or 17
714714
715715
jt build [graalvm|parser|options] ... by default it builds graalvm
716716
jt build [parser|options] [options]
@@ -812,7 +812,7 @@ def help
812812
OPENSSL_PREFIX Where to find OpenSSL headers and libraries
813813
ECLIPSE_EXE Where to find Eclipse
814814
SYSTEM_RUBY The Ruby interpreter to run 'jt' itself, when using 'bin/jt'
815-
JT_JDK The default JDK version to use: 8, 11 (default) or 16
815+
JT_JDK The default JDK version to use: 8, 11 (default) or 17
816816
JT_ENV The default value for 'jt build --env JT_ENV' and for 'jt --use JT_ENV'
817817
JT_PROFILE_SUBCOMMANDS Print the time each subprocess takes on stderr
818818
TXT
@@ -2024,8 +2024,8 @@ def install(name, *options)
20242024
jdk_name = ee ? 'oraclejdk8' : 'openjdk8'
20252025
elsif jdk_version == 11
20262026
jdk_name = ee ? 'labsjdk-ee-11' : 'labsjdk-ce-11'
2027-
elsif jdk_version == 16
2028-
jdk_name = ee ? 'labsjdk-ee-16' : 'labsjdk-ce-16'
2027+
elsif jdk_version == 17
2028+
jdk_name = ee ? 'labsjdk-ee-17' : 'labsjdk-ce-17'
20292029
else
20302030
raise "Unknown JDK version: #{jdk_version}"
20312031
end
@@ -2850,7 +2850,7 @@ def process_pre_args(args)
28502850
end
28512851
end
28522852

2853-
raise "Invalid JDK version: #{@jdk_version}" unless [8, 11, 16].include?(@jdk_version)
2853+
raise "Invalid JDK version: #{@jdk_version}" unless [8, 11, 17].include?(@jdk_version)
28542854

28552855
if needs_rebuild
28562856
rebuild

0 commit comments

Comments
 (0)