Skip to content

Commit 4576fdd

Browse files
committed
Update to Rails 8.1 and Ruby 3.4
* Use ruby:3.4-slim for Docker base image. * Update configuration for Rails 8.1 changes. * Update Brakeman to 8.x for Rails 8.1 compatibility. * Skip Metrics/BlockLength Rubocop on RSpec examples. * Various minor edits for Rubocop conformance. Closes: AP-761
1 parent e4b3864 commit 4576fdd

24 files changed

Lines changed: 476 additions & 412 deletions

.idea/lost-and-found.iml

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

.rubocop.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ Layout/MultilineMethodCallIndentation:
3333
Layout/MultilineOperationIndentation:
3434
Enabled: false
3535

36+
Metrics/BlockLength:
37+
Exclude:
38+
- 'spec/**/*'
39+
3640
Metrics/MethodLength:
3741
Max: 25
3842

@@ -370,4 +374,4 @@ Style/SuperArguments: # new in 1.64
370374
Style/SuperWithArgsParentheses: # new in 1.58
371375
Enabled: true
372376
Style/YAMLFileRead: # new in 1.53
373-
Enabled: true
377+
Enabled: true

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
# This declares that the container intends to listen on port 3000. It doesn't
1010
# actually "expose" the port anywhere -- it is just metadata. It advises tools
@@ -114,7 +114,7 @@ RUN apt-get install -y --no-install-recommends \
114114
USER $APP_USER
115115

116116
# Use a recent version of Bundler
117-
RUN gem install bundler -v 2.5.23
117+
RUN gem install bundler -v 4.0.15
118118

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

Gemfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,32 @@
33
source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
ruby '~> 3.3.6'
6+
ruby '~> 3.4'
77

88
gem 'activerecord-import'
99
gem 'berkeley_library-docker', '~> 0.2.0'
1010
gem 'berkeley_library-logging', '~> 0.2', '>= 0.2.5'
1111
gem 'bootsnap', '>= 1.4.2', require: false
1212
gem 'bootstrap'
13+
gem 'csv'
1314
gem 'kaminari'
1415
gem 'lograge', '>=0.11.2'
1516
gem 'okcomputer', '~> 1.19'
1617
gem 'omniauth-cas',
1718
git: 'https://github.com/dlindahl/omniauth-cas.git',
1819
ref: '7087bda829e14c0f7cab2aece5045ad7015669b1'
19-
gem 'paper_trail', '~> 16.0'
20+
gem 'paper_trail', '~> 17.0'
2021
gem 'pg'
2122
gem 'pg_search'
2223
gem 'puma', '~> 7.2'
2324
gem 'puma-plugin-delayed_stop', '~> 0.1.2'
24-
gem 'rails', '~> 8.0.5'
25+
gem 'rails', '~> 8.1.3'
2526
gem 'sass-rails', '~> 6.0'
2627
gem 'typesafe_enum'
2728
gem 'webpacker', '~> 5.4'
2829

2930
group :development, :test do
30-
gem 'brakeman', '~> 4.8'
31+
gem 'brakeman', '~> 8.0'
3132
gem 'bundler-audit'
3233
gem 'colorize'
3334
gem 'factory_bot_rails'

0 commit comments

Comments
 (0)