Skip to content

Commit

Permalink
Merge pull request #405 from Shopify/drop-old-ruby
Browse files Browse the repository at this point in the history
Drop support for Ruby 2.7 and 3.0
  • Loading branch information
jenshenny authored Jul 3, 2024
2 parents 11f86d2 + 5c46e68 commit 99fcfb1
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 65 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
matrix:
gemfile:
- Gemfile
- gemfiles/Gemfile-rails-6-0
- gemfiles/Gemfile-rails-6-1
ruby:
- "3.0"
- "3.1"
- "3.2"
- "3.3"
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
name: "Tests: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}"
steps:
- uses: actions/checkout@v2
- name: Deletes Gemfile.lock
run: rm Gemfile.lock
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
Expand All @@ -39,14 +39,15 @@ jobs:
gemfile:
- Gemfile
ruby:
- "3.0"
- "3.1"
- "3.2"
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
name: "Loading Tests: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}"
steps:
- uses: actions/checkout@v2
- name: Delete Gemfile.lock
run: rm Gemfile.lock
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require:
- rubocop-sorbet

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.1
NewCops: disable
UseCache: true
SuggestExtensions: false
Expand Down
15 changes: 7 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ gem("rubocop-sorbet", require: false)
gem("mocha", require: false)
gem("rubocop-shopify", require: false)
gem("tapioca", require: false)
gem("railties")

group :development do
gem("byebug", require: false)
gem("minitest-focus", require: false)
gem("byebug")
gem("minitest-focus")

gem("m")
gem("rake")
gem("sorbet-static-and-runtime")
gem("zeitwerk")
end
gem("m")
gem("rake")
gem("sorbet-static-and-runtime")
gem("zeitwerk")
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ GEM
minitest (>= 4, < 6)
mocha (1.14.0)
netrc (0.11.0)
nokogiri (1.15.3-aarch64-linux)
nokogiri (1.16.4-aarch64-linux)
racc (~> 1.4)
nokogiri (1.15.3-arm64-darwin)
nokogiri (1.16.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-darwin)
nokogiri (1.16.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-linux)
nokogiri (1.16.4-x86_64-linux)
racc (~> 1.4)
parallel (1.24.0)
parser (3.3.1.0)
ast (~> 2.4.1)
racc
prism (0.27.0)
racc (1.7.1)
racc (1.7.3)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
Expand Down
22 changes: 0 additions & 22 deletions gemfiles/Gemfile-rails-6-0

This file was deleted.

22 changes: 0 additions & 22 deletions gemfiles/Gemfile-rails-6-1

This file was deleted.

4 changes: 1 addition & 3 deletions packwerk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
spec.files = Dir["CHANGELOG.md", "LICENSE.md", "README.md", "lib/**/*", "sorbet/**/*"]
spec.require_paths = ["lib"]

spec.required_ruby_version = ">= 2.7"
spec.required_ruby_version = ">= 3.1"

spec.add_dependency("activesupport", ">= 6.0")
spec.add_dependency("bundler")
Expand All @@ -52,6 +52,4 @@ Gem::Specification.new do |spec|

# For ERB parsing
spec.add_dependency("better_html")

spec.add_development_dependency("railties")
end

0 comments on commit 99fcfb1

Please sign in to comment.