From 1846c9b69dea87fa47e3deef1b6dfbc0a28795cf Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Sun, 19 Jan 2025 16:30:26 -0800 Subject: [PATCH] Update to Ruby 3.4.1 (#583) * Update to Ruby 3.4.1 --- .rubocop.yml | 4 +-- .ruby-version | 2 +- Dockerfile | 2 +- Gemfile | 2 +- Gemfile.lock | 67 +++++++++++++++++++++++++++--------------- development.Dockerfile | 2 +- 6 files changed, 49 insertions(+), 30 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index a51c864..7321f10 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,8 +7,8 @@ inherit_gem: rubocop-rails-omakase: rubocop.yml AllCops: - TargetRubyVersion: 3.3.6 - TargetRailsVersion: 7.1.0 + TargetRubyVersion: 3.4.1 + TargetRailsVersion: 7.2.2 DisabledByDefault: true Exclude: - "bin/**/*" diff --git a/.ruby-version b/.ruby-version index 9c25013..47b322c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.6 +3.4.1 diff --git a/Dockerfile b/Dockerfile index dbb566e..c5c6934 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # docker run -d -p 80:80 -p 443:443 --name my-app -e RAILS_MASTER_KEY= my-app # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.3.6 +ARG RUBY_VERSION=3.4.1 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base # Rails app lives here diff --git a/Gemfile b/Gemfile index b959d9f..19d8825 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.3.6" +ruby "3.4.1" # Bundle edge Rails instead: # gem "rails", github: "rails/rails", branch: "7-2-stable" diff --git a/Gemfile.lock b/Gemfile.lock index 4c578e9..7bf51f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,16 +99,21 @@ GEM concurrent-ruby (1.3.5) connection_pool (2.5.0) crass (1.0.6) - date (3.4.0) + date (3.4.1) debug (1.10.0) irb (~> 1.10) reline (>= 0.3.8) diff-lcs (1.5.1) drb (2.2.1) erubi (1.13.1) - ffi (1.17.0-aarch64-linux-gnu) - ffi (1.17.0-arm64-darwin) - ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) globalid (1.2.1) activesupport (>= 6.1) i18n (1.14.7) @@ -143,8 +148,8 @@ GEM mini_magick (4.13.2) mini_mime (1.1.5) minitest (5.25.4) - msgpack (1.7.3) - net-imap (0.5.1) + msgpack (1.7.5) + net-imap (0.5.5) date net-protocol net-pop (0.1.2) @@ -152,16 +157,25 @@ GEM net-protocol (0.2.2) timeout net-smtp (0.5.0) - net-protocol nio4r (2.7.4) nokogiri (1.18.2-aarch64-linux-gnu) racc (~> 1.4) + nokogiri (1.18.2-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.2-arm-linux-musl) + racc (~> 1.4) nokogiri (1.18.2-arm64-darwin) racc (~> 1.4) + nokogiri (1.18.2-x86_64-darwin) + racc (~> 1.4) nokogiri (1.18.2-x86_64-linux-gnu) racc (~> 1.4) + nokogiri (1.18.2-x86_64-linux-musl) + racc (~> 1.4) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc pg (1.5.9) @@ -217,12 +231,12 @@ GEM psych (>= 4.0.0) redis (5.3.0) redis-client (>= 0.22.0) - redis-client (0.22.2) + redis-client (0.23.2) connection_pool regexp_parser (2.10.0) reline (0.6.0) io-console (~> 0.5) - rexml (3.3.9) + rexml (3.4.0) rspec-core (3.13.2) rspec-support (~> 3.13.0) rspec-expectations (3.13.3) @@ -239,8 +253,8 @@ GEM rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) rspec-support (~> 3.13) - rspec-support (3.13.1) - rubocop (1.69.2) + rspec-support (3.13.2) + rubocop (1.70.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -255,10 +269,10 @@ GEM rubocop-minitest (0.36.0) rubocop (>= 1.61, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-performance (1.22.1) + rubocop-performance (1.23.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.28.0) + rubocop-rails (2.29.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) @@ -274,7 +288,7 @@ GEM ruby-vips (2.2.2) ffi (~> 1.12) logger - rubyzip (2.3.2) + rubyzip (2.4.1) securerandom (0.4.1) selenium-webdriver (4.27.0) base64 (~> 0.2) @@ -293,13 +307,13 @@ GEM railties (>= 6.0.0) stringio (3.1.2) thor (1.3.2) - timeout (0.4.2) + timeout (0.4.3) turbo-rails (2.0.11) actionpack (>= 6.0.0) railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (3.1.2) + unicode-display_width (3.1.4) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) useragent (0.16.11) @@ -309,7 +323,8 @@ GEM bindex (>= 0.4.0) railties (>= 6.0.0) websocket (1.2.11) - websocket-driver (0.7.6) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -317,10 +332,14 @@ GEM zeitwerk (2.7.1) PLATFORMS - aarch64-linux - arm64-darwin-23 - arm64-darwin-24 - x86_64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES bootsnap @@ -348,7 +367,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 3.3.6p108 + ruby 3.4.1p0 BUNDLED WITH - 2.5.23 + 2.6.3 diff --git a/development.Dockerfile b/development.Dockerfile index a9e4c03..43dff24 100644 --- a/development.Dockerfile +++ b/development.Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.3.6 +ARG RUBY_VERSION=3.4.1 FROM docker.io/library/ruby:$RUBY_VERSION-slim as base # OS Level Dependencies