Skip to content

Commit b69770a

Browse files
committed
Upgrade Ruby and Rails dependencies
And fix linting issues. This just does some dependency house cleaning. It removes the end-of-lifed Ruby and Rails versions and adds in all currently supported versions.
1 parent 69e79cd commit b69770a

10 files changed

+39
-26
lines changed

Diff for: .github/workflows/rspec.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
name: Ruby
22

3-
on: [push, pull_request_target]
4-
53
jobs:
6-
test:
7-
8-
runs-on: ubuntu-latest
4+
rspec:
5+
# Pin the Ubuntu version for now to work around https://github.com/ruby/setup-ruby/issues/595
6+
runs-on: ubuntu-22.04
97

108
strategy:
9+
fail-fast: false
1110
matrix:
12-
ruby-version: ['3.2', '3.1', '3.0', '2.7']
11+
ruby-version: ['3.4', '3.3', '3.2']
1312

1413
steps:
15-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1615
- name: Set up Ruby ${{ matrix.ruby-version }}
17-
uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
16+
uses: ruby/setup-ruby@v1
1817
with:
1918
ruby-version: ${{ matrix.ruby-version }}
19+
bundler-cache: true
2020
- name: Install dependencies
2121
run: bundle install
2222
- name: Installing all gem versions via Appraisal

Diff for: .rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
AllCops:
2+
TargetRubyVersion: 2.7
3+
14
Metrics/ParameterLists:
25
Enabled: false

Diff for: .ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.4
1+
3.4.2

Diff for: .tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 3.1.4
1+
ruby 3.4.2

Diff for: Appraisals

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
appraise "rails-6.0" do
2-
gem "railties", "~>6.0.0"
1+
appraise "rails-7.0" do
2+
gem "railties", "~>7.0.8"
3+
# Fixes "uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger"
4+
# See https://github.com/rails/rails/issues/54260
5+
gem 'concurrent-ruby', '1.3.4'
36
end
47

5-
appraise "rails-6.1" do
6-
gem "railties", "~>6.1.0"
8+
appraise "rails-7.1" do
9+
gem "railties", "~>7.1.5"
710
end
811

9-
appraise "rails-7.0" do
10-
gem "railties", "~>7.0.0"
12+
appraise "rails-7.2" do
13+
gem "railties", "~>7.2.2"
14+
end
15+
16+
appraise "rails-8.0" do
17+
gem "railties", "~>8.0.2"
1118
end
1219

1320
appraise "rails-8.0" do

Diff for: Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.1
1+
FROM ruby:3.4
22
WORKDIR /srv/cache_crispies/
33
COPY . /srv/cache_crispies/
44
RUN gem install bundler

Diff for: cache_crispies.gemspec

+8-6
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@ Gem::Specification.new do |spec|
1717
spec.test_files = spec.files.grep(%r{^(spec)/})
1818
spec.require_paths = ['lib']
1919

20-
spec.required_ruby_version = '>= 2.7.0'
20+
spec.required_ruby_version = '>= 3.1.0'
2121

22-
spec.add_dependency 'railties', '>= 6.0.0', '< 9.0'
22+
spec.add_dependency 'railties', '>= 7.0.0', '< 9.0'
2323
spec.add_dependency 'oj', '~> 3.7'
2424

25-
spec.add_development_dependency 'activemodel', '>= 6.0.0', '< 9.0'
26-
spec.add_development_dependency 'appraisal', '~> 2.4'
27-
spec.add_development_dependency 'bundler', '~> 1.8'
25+
spec.add_development_dependency 'activemodel', '>= 7.0.0', '< 9.0'
26+
spec.add_development_dependency 'base64', '~> 0.2'
27+
spec.add_development_dependency 'mutex_m', '~> 0.3'
28+
spec.add_development_dependency 'appraisal', '~> 2.5'
29+
spec.add_development_dependency 'debug', '~> 1.10'
2830
spec.add_development_dependency 'rspec', '~> 3.13.0'
29-
spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
31+
spec.add_development_dependency 'rspec_junit_formatter', '~> 0.6'
3032
spec.add_development_dependency 'simplecov', '~> 0.22'
3133
spec.add_development_dependency 'simplecov-lcov', '~> 0.8'
3234
end

Diff for: gemfiles/rails_7.0.gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "railties", "~>7.0.0"
5+
gem "railties", "~>7.0.8"
6+
gem "concurrent-ruby", "1.3.4"
67

78
gemspec path: "../"

Diff for: gemfiles/rails_6.0.gemfile renamed to gemfiles/rails_7.1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "https://rubygems.org"
44

5-
gem "railties", "~>6.0.0"
5+
gem "railties", "~>7.1.5"
66

77
gemspec path: "../"

Diff for: gemfiles/rails_6.1.gemfile renamed to gemfiles/rails_7.2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "https://rubygems.org"
44

5-
gem "railties", "~>6.1.0"
5+
gem "railties", "~>7.2.2"
66

77
gemspec path: "../"

0 commit comments

Comments
 (0)