Skip to content

Commit f0a9e02

Browse files
authored
Merge pull request #3555 from ruby/bump-jruby
Bump JRuby version
2 parents 0885356 + 27d284b commit f0a9e02

File tree

5 files changed

+6
-16
lines changed

5 files changed

+6
-16
lines changed

gemfiles/jruby/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby "~> 3.1.4", engine: "jruby", engine_version: "~> 9.4.5"
5+
ruby "~> 3.4.2", engine: "jruby", engine_version: "~> 10.0.0.0"
66

77
gemspec path: "../.."
88

gemfiles/jruby/Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ DEPENDENCIES
3636
test-unit
3737

3838
RUBY VERSION
39-
ruby 3.1.4p0 (jruby 9.4.5.0)
39+
ruby 3.4.2p0 (jruby 10.0.0.0)
4040

4141
BUNDLED WITH
42-
2.3.26
42+
2.6.3

test/prism/ruby/parameters_signature_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_keyrest_anonymous
5454
assert_parameters([[:keyrest, :**]], "**")
5555
end
5656

57-
if RUBY_ENGINE != "truffleruby"
57+
if RUBY_ENGINE == "ruby"
5858
def test_key_ordering
5959
assert_parameters([[:keyreq, :a], [:keyreq, :b], [:key, :c], [:key, :d]], "a:, c: 1, b:, d: 2")
6060
end

test/prism/ruby/parser_test.rb

+1-11
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,6 @@ class ParserTest < TestCase
9999
"seattlerb/regexp_esc_C_slash.txt",
100100
]
101101

102-
# These files are either failing to parse or failing to translate, so we'll
103-
# skip them for now.
104-
skip_all = skip_incorrect | [
105-
]
106-
107-
# Not sure why these files are failing on JRuby, but skipping them for now.
108-
if RUBY_ENGINE == "jruby"
109-
skip_all.push("emoji_method_calls.txt", "symbols.txt")
110-
end
111-
112102
# These files are failing to translate their lexer output into the lexer
113103
# output expected by the parser gem, so we'll skip them for now.
114104
skip_tokens = [
@@ -147,7 +137,7 @@ class ParserTest < TestCase
147137
define_method(fixture.test_name) do
148138
assert_equal_parses(
149139
fixture,
150-
compare_asts: !skip_all.include?(fixture.path),
140+
compare_asts: !skip_incorrect.include?(fixture.path),
151141
compare_tokens: !skip_tokens.include?(fixture.path),
152142
compare_comments: fixture.path != "embdoc_no_newline_at_end.txt"
153143
)

test/prism/ruby/ripper_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
return if RUBY_VERSION < "3.3" || RUBY_ENGINE == "truffleruby"
3+
return if RUBY_VERSION < "3.3" || RUBY_ENGINE != "ruby"
44

55
require_relative "../test_helper"
66

0 commit comments

Comments
 (0)