Skip to content

Commit

Permalink
Upgraded Ruby to 3.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@schinery
schinery committed Jan 7, 2025
1 parent 03b0b56 commit 0565f85
Show file tree
Hide file tree
Showing 17 changed files with 1,137 additions and 52 deletions.
29 changes: 26 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,40 @@ jobs:
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: "3.3.6"
ruby-version: "3.4.1"
- run: bundle exec rubocop
test:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: ["3.0", "3.1", "3.2", "3.3"]
ruby:
[
{ version: "3.1", gemfile: activerecord_7 },
{ version: "3.1", gemfile: activerecord_7_1 },
{ version: "3.1", gemfile: activerecord_7_2 },
{ version: "3.2", gemfile: activerecord_7 },
{ version: "3.2", gemfile: activerecord_7_1 },
{ version: "3.2", gemfile: activerecord_7_2 },
{ version: "3.2", gemfile: activerecord_8 },
{ version: "3.2", gemfile: activerecord_main },
{ version: "3.3", gemfile: activerecord_7 },
{ version: "3.3", gemfile: activerecord_7_1 },
{ version: "3.3", gemfile: activerecord_7_2 },
{ version: "3.3", gemfile: activerecord_8 },
{ version: "3.3", gemfile: activerecord_main },
{ version: "3.4", gemfile: activerecord_7 },
{ version: "3.4", gemfile: activerecord_7_1 },
{ version: "3.4", gemfile: activerecord_7_2 },
{ version: "3.4", gemfile: activerecord_8 },
{ version: "3.4", gemfile: activerecord_main },
]
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.ruby.gemfile }}.gemfile
BUNDLE_PATH_RELATIVE_TO_CWD: true
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: ${{ matrix.ruby }}
ruby-version: ${{ matrix.ruby.version }}
- run: bundle exec rake test
8 changes: 7 additions & 1 deletion .rubocop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ inherit_gem:
boxt_rubocop:
- rspec.yml

inherit_mode:
merge:
- Exclude

require:
- boxt_rubocop
- rubocop-rake
- rubocop-rspec

AllCops:
TargetRubyVersion: 3.0
TargetRubyVersion: 3.1
Exclude:
- gemfiles/**/*
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.6
3.4.1
38 changes: 38 additions & 0 deletions Appraisals
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# frozen_string_literal: true

# Currently doesn't work with Appraisal 2.5.0 and Ruby >= 3.1
# customize_gemfiles do
# {
# heading: <<~HEADING
# # frozen_string_literal: true
#
# `%<gemfile>s` has been generated by Appraisal, do NOT modify it or `%<lockfile>s` directly!
# Make the changes to the "%<appraisal>s" block in `Appraisals` instead.
# HEADING
# }
# end

appraise "activerecord-7" do
gem "activerecord", "~> 7.0.0"
gem "sqlite3", "~> 1.7"
end

appraise "activerecord-7-1" do
gem "activerecord", "~> 7.1.0"
gem "sqlite3", "~> 1.7"
end

appraise "activerecord-7-2" do
gem "activerecord", "~> 7.2.0"
gem "sqlite3", "~> 1.7"
end

appraise "activerecord-8" do
gem "activerecord", "~> 8.0.0"
gem "sqlite3", "~> 2.0"
end

appraise "activerecord-main" do
gem "activerecord", github: "rails/rails", branch: "main"
gem "sqlite3", "~> 2.0"
end
11 changes: 5 additions & 6 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ source "https://rubygems.org"

gemspec

group :development do
gem "boxt_rubocop", "2.15.0"
gem "rake", "~> 13.2"
gem "rspec", "~> 3.13"
gem "simplecov", "~> 0.22"
end
gem "appraisal", "~> 2.5"
gem "boxt_rubocop", "2.15.0"
gem "rake", "~> 13.2"
gem "rspec", "~> 3.13"
gem "simplecov", "~> 0.22"
86 changes: 46 additions & 40 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,39 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionview (7.1.3.4)
activesupport (= 7.1.3.4)
actionview (8.0.1)
activesupport (= 8.0.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activemodel (7.1.3.4)
activesupport (= 7.1.3.4)
activerecord (7.1.3.4)
activemodel (= 7.1.3.4)
activesupport (= 7.1.3.4)
activemodel (8.0.1)
activesupport (= 8.0.1)
activerecord (8.0.1)
activemodel (= 8.0.1)
activesupport (= 8.0.1)
timeout (>= 0.4.0)
activesupport (7.1.3.4)
activesupport (8.0.1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
benchmark (0.4.0)
bigdecimal (3.1.9)
boxt_rubocop (2.15.0)
rubocop (= 1.69.0)
rubocop-factory_bot (= 2.26.1)
Expand All @@ -45,14 +53,14 @@ GEM
connection_pool (2.4.1)
crass (1.0.6)
diff-lcs (1.5.1)
docile (1.4.0)
docile (1.4.1)
drb (2.2.1)
erubi (1.13.0)
erubi (1.13.1)
faker (3.5.1)
i18n (>= 1.8.11, < 2)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
json (2.9.0)
json (2.9.1)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand All @@ -66,16 +74,16 @@ GEM
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
language_server-protocol (3.17.0.3)
loofah (2.22.0)
logger (1.6.4)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
minitest (5.25.4)
mutex_m (0.3.0)
nokogiri (1.16.6-arm64-darwin)
nokogiri (1.18.1-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-darwin)
nokogiri (1.18.1-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.18.1-x86_64-linux-gnu)
racc (~> 1.4)
parallel (1.26.3)
parser (3.3.6.0)
Expand All @@ -87,25 +95,25 @@ GEM
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (~> 1.14)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rainbow (3.1.1)
rake (13.2.1)
regexp_parser (2.9.3)
regexp_parser (2.10.0)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-core (3.13.2)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rspec-support (3.13.2)
rubocop (1.69.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand All @@ -116,7 +124,7 @@ GEM
rubocop-ast (>= 1.36.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.36.2)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
Expand All @@ -136,36 +144,34 @@ GEM
rubocop-rspec (3.2.0)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
securerandom (0.4.1)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
timeout (0.4.1)
thor (1.3.2)
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.1.2)
unicode-display_width (3.1.3)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.2)

PLATFORMS
arm64-darwin-20
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
arm64-darwin-24
x86_64-darwin-19
x86_64-darwin-20
x86_64-darwin-21
arm64-darwin
x86_64-darwin
x86_64-linux

DEPENDENCIES
appraisal (~> 2.5)
boxt_rubocop (= 2.15.0)
kaminari-api-meta-data!
rake (~> 13.2)
rspec (~> 3.13)
simplecov (~> 0.22)

BUNDLED WITH
2.5.22
2.6.2
13 changes: 13 additions & 0 deletions gemfiles/activerecord_7.gemfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "appraisal", "~> 2.5"
gem "boxt_rubocop", "2.15.0"
gem "rake", "~> 13.2"
gem "rspec", "~> 3.13"
gem "simplecov", "~> 0.22"
gem "activerecord", "~> 7.0.0"
gem "sqlite3", "~> 1.7"

gemspec path: "../"
Loading

0 comments on commit 0565f85

Please sign in to comment.