Skip to content

Commit

Permalink
Merge pull request #136 from zendesk/bquorning/upgrade-standard
Browse files Browse the repository at this point in the history
Upgrade standard gem
  • Loading branch information
bquorning authored Nov 18, 2024
2 parents b80cf07 + 3917f23 commit 77abc8c
Show file tree
Hide file tree
Showing 18 changed files with 121 additions and 560 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ jobs:
ruby: ['3.0', '3.1', '3.2', '3.3']
rails: ['6.0', '6.1', '7.0', '7.1']
include:
- {ruby: '2.7', rails: '5.0'}
- {ruby: '2.7', rails: '5.1'}
- {ruby: '2.7', rails: '5.2'}
- {ruby: '3.3', rails: '_main'}
name: ruby${{ matrix.ruby }} rails${{ matrix.rails }} rake test
env:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ inherit_gem:

AllCops:
SuggestExtensions: false
TargetRubyVersion: "2.7"
TargetRubyVersion: "3.0"
Exclude:
- vendor/**/*
2 changes: 2 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# NEXT
- Drop Ruby 2.7 support.
- Drop Rails 5 support.

# v2.23.1
- Fix an incompatibility with the Rails main branch.
Expand Down
33 changes: 15 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
stronger_parameters (2.23.1)
actionpack (>= 5.0)
actionpack (>= 6.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -51,7 +51,7 @@ GEM
irb (1.14.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.7.2)
json (2.8.2)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
loofah (2.22.0)
Expand All @@ -72,7 +72,7 @@ GEM
parallel (1.26.3)
parallel_tests (4.7.2)
parallel
parser (3.3.5.0)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
psych (5.1.2)
Expand Down Expand Up @@ -108,37 +108,35 @@ GEM
regexp_parser (2.9.2)
reline (0.5.10)
io-console (~> 0.5)
rexml (3.3.7)
rubocop (1.59.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.4)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
rubocop-ast (1.36.1)
parser (>= 3.3.1.0)
rubocop-performance (1.21.1)
rubocop-performance (1.22.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
single_cov (1.11.0)
standard (1.33.0)
standard (1.42.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.59.0)
rubocop (~> 1.68.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.3)
standard-performance (~> 1.5)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.4.0)
standard-performance (1.5.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.21.0)
rubocop-performance (~> 1.22.0)
stringio (3.1.1)
thor (1.3.2)
tzinfo (2.0.6)
Expand All @@ -154,7 +152,6 @@ PLATFORMS

DEPENDENCIES
bump
bundler
forking_test_runner
maxitest
railties (~> 7.1.0)
Expand All @@ -164,4 +161,4 @@ DEPENDENCIES
stronger_parameters!

BUNDLED WITH
2.5.11
2.5.23
7 changes: 7 additions & 0 deletions gemfiles/common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@
source "https://rubygems.org"

gemspec path: ".."

gem "rake"
gem "maxitest"
gem "bump"
gem "single_cov"
gem "standard"
gem "forking_test_runner"
5 changes: 0 additions & 5 deletions gemfiles/rails5.0.gemfile

This file was deleted.

136 changes: 0 additions & 136 deletions gemfiles/rails5.0.gemfile.lock

This file was deleted.

5 changes: 0 additions & 5 deletions gemfiles/rails5.1.gemfile

This file was deleted.

Loading

0 comments on commit 77abc8c

Please sign in to comment.