Skip to content

Commit

Permalink
Merge pull request #625 from Shopify/centralize_ruby_version
Browse files Browse the repository at this point in the history
Centralize Ruby Version to `.ruby-version`
  • Loading branch information
alexcrocha authored Mar 25, 2024
2 parents dfff102 + d4fd1cf commit d5474e2
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
gemfile: [Gemfile, gemfiles/minimum_rubocop.gemfile]
ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
ruby: ["3.0", "3.1", "3.2", "3.3"]

env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GEM
parser (3.3.0.5)
ast (~> 2.4.1)
racc
pry (0.14.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.10.1)
Expand Down Expand Up @@ -59,4 +59,4 @@ DEPENDENCIES
rubocop-shopify!

BUNDLED WITH
2.3.25
2.5.3
3 changes: 0 additions & 3 deletions rubocop-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ AllCops:
Exclude:
- 'vendor/**/*'

# Mac OS Catalina ships with 2.6.3
TargetRubyVersion: 2.6

# We disable this at entrypoint.
# Due to CLI apps being invoked via an entry point,
# we can exclude this from all files
Expand Down
2 changes: 1 addition & 1 deletion rubocop-shopify.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |s|
"allowed_push_host" => "https://rubygems.org",
}

s.required_ruby_version = ">= 2.7.0"
s.required_ruby_version = ">= 3.0.0"

s.add_dependency("rubocop", "~> 1.51")
end

0 comments on commit d5474e2

Please sign in to comment.