Merge pull request #5255 from sul-dlss/upgrade_ruby

[HOLD] Upgrade to ruby 3.4.1.
sul-dlss · Jan 27, 2025 · 79d9a26 · 79d9a26
2 parents 5b0c174 + ce73661
commit 79d9a26
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.2.3
+  ruby-rails: sul-dlss/ruby-rails@4.3.0
 workflows:
   build:
     jobs:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -9,7 +9,7 @@ require:
   - rubocop-rspec_rails
 
 AllCops:
-  TargetRubyVersion: 3.3
+  TargetRubyVersion: 3.4
   Exclude:
     - "bin/console"
     - "bin/rails"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3.1-bookworm
+FROM ruby:3.4.1-bookworm
 
 ENV RAILS_ENV=production
 ENV BUNDLER_WITHOUT="development test"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -87,8 +87,6 @@ GEM
     attr_extras (7.1.0)
     base64 (0.2.0)
     bcrypt_pbkdf (1.1.1)
-    bcrypt_pbkdf (1.1.1-arm64-darwin)
-    bcrypt_pbkdf (1.1.1-x86_64-darwin)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
     bootsnap (1.18.4)