Skip to content

Commit 471ff67

Browse files
committed
Update to Rails 8.1, Ruby 3.4
* Gem updates for Rails 8.1 compatibility and latest security fixes. * Load the 8.1 config defaults. * Update config files with new 8.1 configuration. * Ensure Docker library doesn't crash inside Podman. * Minor style fixes for Rubocop. * Update SimpleCov to 1.0.0.rc4; it gets confused otherwise. * Update .simplecov file to new standards to avoid deprecation warnings. Closes: AP-758
1 parent d5c9b4b commit 471ff67

27 files changed

Lines changed: 410 additions & 353 deletions

.idea/galc-api.iml

Lines changed: 158 additions & 151 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.rubocop.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins:
22
- rubocop-rails
33

44
AllCops:
5-
TargetRailsVersion: 8.0
5+
TargetRailsVersion: 8.1
66
UseCache: false
77
Exclude:
88
# Exclude generated files
@@ -12,6 +12,12 @@ AllCops:
1212
# Exclude vendor files in GitHub build
1313
- 'vendor/**/*'
1414

15+
# Disable block length check in spec files.
16+
Layout/BlockLength:
17+
Exclude:
18+
- 'config/environments/*'
19+
- 'spec/**/*'
20+
1521
# Allow one line around block body (Layout/EmptyLines will still disallow two or more)
1622
Layout/EmptyLinesAroundBlockBody:
1723
Enabled: false

.simplecov

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
require 'simplecov-rcov'
22

3-
SimpleCov.start 'rails' do
4-
add_filter %w[/bin/ /db/]
5-
coverage_dir 'artifacts'
6-
formatter SimpleCov::Formatter::RcovFormatter
7-
minimum_coverage 100
8-
end
3+
SimpleCov.load_profile 'rails'
4+
SimpleCov.skip %w[/bin/ /db/]
5+
SimpleCov.coverage_dir 'artifacts'
6+
SimpleCov.formatter SimpleCov::Formatter::RcovFormatter
7+
SimpleCov.minimum_coverage 100

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The base stage scaffolds elements which are common to building and running
55
# the application, such as installing ca-certificates, creating the app user,
66
# and installing runtime system dependencies.
7-
FROM ruby:3.3-slim AS base
7+
FROM ruby:3.4-slim AS base
88

99
# ------------------------------------------------------------
1010
# Declarative metadata
@@ -88,7 +88,7 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends \
8888
USER $APP_USER
8989

9090
# Base image ships with an older version of bundler
91-
RUN gem install bundler --version 2.7.2
91+
RUN gem install bundler --version 4.0.8
9292

9393
# Install gems. We don't enforce the validity of the Gemfile.lock until the
9494
# final (production) stage.

Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby '~> 3.3'
4+
ruby '~> 3.4'
55

66
gem 'berkeley_library-alma', '~> 0.1.1'
77
gem 'berkeley_library-logging', '~> 0.3'
@@ -10,16 +10,16 @@ gem 'drb'
1010
gem 'image_processing', '~> 1.12'
1111
gem 'jsonapi.rb', '~> 2.0'
1212
gem 'jsonapi-serializer', '~> 2.2'
13-
gem 'jwt', '~> 2.4'
13+
gem 'jwt', '~> 2.10', '>= 2.10.3'
1414
gem 'mutex_m'
1515
gem 'omniauth', '~> 2.1'
1616
gem 'omniauth-cas', '~> 3.0'
1717
gem 'pg', '~> 1.4'
1818
gem 'pg_search', '~> 2.3'
19-
gem 'puma', '~> 7.2'
19+
gem 'puma', '~> 7.2', '>= 7.2.1'
2020
gem 'puma-plugin-delayed_stop', '~> 0.1.2'
2121
gem 'rack-cors'
22-
gem 'rails', '~> 8.0.5'
22+
gem 'rails', '~> 8.1.3'
2323
gem 'ransack', '~> 4.2'
2424
gem 'zaru', '~> 0.3.0'
2525

@@ -44,7 +44,7 @@ group :test do
4444
gem 'rspec', '~> 3.13'
4545
gem 'rspec_junit_formatter', '~> 0.6'
4646
gem 'rspec-rails', '~> 8.0'
47-
gem 'simplecov', '~> 0.22', require: false
47+
gem 'simplecov', '~> 1.0.0.rc4', require: false
4848
gem 'simplecov-rcov', '~> 0.3', require: false
4949
gem 'webmock', require: false
5050
end

0 commit comments

Comments
 (0)