Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
- "3.1"
- "3.2"
- "3.3"
- "3.4"
- "4.0"
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
name: "Tests: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}"
Expand All @@ -26,7 +28,7 @@ jobs:
- name: Deletes Gemfile.lock
run: rm Gemfile.lock
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
uses: ruby/setup-ruby@90be1154f987f4dc0fe0dd0feedac9e473aa4ba8 # v1.286.0
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
Expand All @@ -49,7 +51,7 @@ jobs:
- name: Delete Gemfile.lock
run: rm Gemfile.lock
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
uses: ruby/setup-ruby@90be1154f987f4dc0fe0dd0feedac9e473aa4ba8 # v1.286.0
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
Expand All @@ -61,7 +63,7 @@ jobs:
steps:
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
- name: Set up Ruby
uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
uses: ruby/setup-ruby@90be1154f987f4dc0fe0dd0feedac9e473aa4ba8 # v1.286.0
with:
bundler-cache: true
- name: Run style checks
Expand All @@ -72,7 +74,7 @@ jobs:
steps:
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
- name: Set up Ruby
uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
uses: ruby/setup-ruby@90be1154f987f4dc0fe0dd0feedac9e473aa4ba8 # v1.286.0
with:
bundler-cache: true
- name: Run static type checks
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ gem("railties")

gem("byebug")
gem("minitest-focus")
gem("minitest-mock")

gem("m")
gem("rake")
Expand Down
19 changes: 12 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PATH
constant_resolver (>= 0.3)
parallel
parser
prism (>= 0.25.0)
prism (>= 1.4.0)
sorbet-runtime (>= 0.5.9914)
zeitwerk (>= 2.6.1)

Expand Down Expand Up @@ -88,6 +88,7 @@ GEM
minitest (5.25.5)
minitest-focus (1.3.1)
minitest (>= 4, < 6)
minitest-mock (5.27.0)
mocha (2.5.0)
ruby2_keywords (>= 0.0.5)
netrc (0.11.0)
Expand All @@ -106,7 +107,7 @@ GEM
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
prism (0.27.0)
prism (1.6.0)
psych (5.2.6)
date
stringio
Expand Down Expand Up @@ -136,9 +137,11 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rbi (0.1.12)
prism (>= 0.18.0, < 0.28)
sorbet-runtime (>= 0.5.9204)
rbi (0.3.7)
prism (~> 1.0)
rbs (>= 3.4.4)
rbs (3.9.5)
logger
rdoc (6.14.0)
erb
psych (>= 4.0.0)
Expand Down Expand Up @@ -186,11 +189,12 @@ GEM
thor (>= 0.19.2)
spring (4.0.0)
stringio (3.1.7)
tapioca (0.13.3)
tapioca (0.16.11)
benchmark
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (>= 0.1.4, < 0.2)
rbi (~> 0.2)
sorbet-static-and-runtime (>= 0.5.11087)
spoom (>= 1.2.0)
thor (>= 1.2.0)
Expand Down Expand Up @@ -220,6 +224,7 @@ DEPENDENCIES
constant_resolver
m
minitest-focus
minitest-mock
mocha
packwerk!
railties
Expand Down
2 changes: 1 addition & 1 deletion lib/packwerk/parsers/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def valid_error?(error)
end
end

class TolerateInvalidUtf8Builder < Parser::Builders::Default
class TolerateInvalidUtf8Builder < Prism::Translation::Parser::Builder
extend T::Sig

sig { params(token: T.untyped).returns(T.untyped) }
Expand Down
2 changes: 1 addition & 1 deletion packwerk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
# For Ruby parsing
spec.add_dependency("ast")
spec.add_dependency("parser")
spec.add_dependency("prism", ">= 0.25.0")
spec.add_dependency("prism", ">= 1.4.0")

# For ERB parsing
spec.add_dependency("better_html")
Expand Down
Loading