Skip to content

Commit e8b7ec5

Browse files
committed
Bump minimum Ruby to 3.2, add rbs dependency, update CI
RBS 4.0 requires Ruby >= 3.2. Bump RDoc's own minimum to match and add `rbs >= 4.0.0` as a gemspec dependency. Bump prism minimum to `>= 1.6.0` (required by rbs). Drop JRuby and TruffleRuby from CI matrix (rbs has a C extension that cannot build on them).
1 parent caad3b9 commit e8b7ec5

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
ruby-versions:
1515
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
1616
with:
17-
# 2.7 breaks `test_parse_statements_nodoc_identifier_alias_method`
18-
min_version: 3.0
17+
min_version: 3.2
1918
versions: '["mswin"]'
19+
engine: cruby
2020

2121
test:
2222
needs: ruby-versions
@@ -26,14 +26,6 @@ jobs:
2626
ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
2727
os: [ubuntu-latest, macos-latest, windows-latest]
2828
exclude:
29-
- os: windows-latest
30-
ruby: truffleruby
31-
- os: windows-latest
32-
ruby: truffleruby-head
33-
- os: windows-latest
34-
ruby: jruby
35-
- os: windows-latest
36-
ruby: jruby-head
3729
- os: macos-latest
3830
ruby: mswin
3931
- os: ubuntu-latest
@@ -68,7 +60,7 @@ jobs:
6860
strategy:
6961
fail-fast: false
7062
matrix:
71-
prism_version: ['1.0.0', '1.3.0', '1.7.0', 'head']
63+
prism_version: ['1.6.0', '1.7.0', 'head']
7264
runs-on: ubuntu-latest
7365
env:
7466
RUBYOPT: --enable-frozen_string_literal

Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@ elsif ENV['PRISM_VERSION']
1818
end
1919

2020
platforms :ruby do
21-
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2')
22-
gem 'mini_racer' # For testing the searcher.js file
23-
end
21+
gem 'mini_racer' # For testing the searcher.js file
2422
end

rdoc.gemspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentat
6363
s.rdoc_options = ["--main", "README.md"]
6464
s.extra_rdoc_files += s.files.grep(%r[\A[^\/]+\.(?:rdoc|md)\z])
6565

66-
s.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
66+
s.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
6767
s.required_rubygems_version = Gem::Requirement.new(">= 2.2")
6868

6969
s.add_dependency 'psych', '>= 4.0.0'
7070
s.add_dependency 'erb'
7171
s.add_dependency 'tsort'
72-
s.add_dependency 'prism', '>= 1.0.0'
72+
s.add_dependency 'prism', '>= 1.6.0'
73+
s.add_dependency 'rbs', '>= 4.0.0'
7374
end

0 commit comments

Comments
 (0)