From ea40808264d8c690d518428765fd0a3acd6c8ec1 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 14 Oct 2023 12:15:27 +0200 Subject: [PATCH] Update to ruby 3.2 --- .rubocop.yml | 2 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 62 ++++++++++++++++++++++++++--------------------- runner.dockerfile | 2 +- server.dockerfile | 2 +- 6 files changed, 39 insertions(+), 33 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index c82d525..8c1f749 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,7 +13,7 @@ AllCops: - "node_modules/**/*" - "repos/**/*" - "config/unicorn.rb" - TargetRubyVersion: 3.1 + TargetRubyVersion: 3.2 NewCops: enable Layout/FirstArrayElementIndentation: diff --git a/.ruby-version b/.ruby-version index 7bde84d..9e79f6c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.1.2 +ruby-3.2.2 diff --git a/Gemfile b/Gemfile index 4988d94..6ecd352 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '~> 3.1.2' +ruby '~> 3.2.2' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem 'rails', '~> 7.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 868b90a..e295a39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) @@ -114,7 +114,7 @@ GEM drb (2.1.1) ruby2_keywords erubi (1.12.0) - faraday (1.10.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -130,8 +130,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -149,13 +149,14 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.6.4) - reline (>= 0.3.0) + irb (1.8.2) + rdoc + reline (>= 0.3.8) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) json (2.6.3) - jwt (2.3.0) + jwt (2.7.1) kgio (2.11.4) language_server-protocol (3.17.0.3) loofah (2.21.4) @@ -170,10 +171,10 @@ GEM matrix (0.4.2) mini_mime (1.1.5) minitest (5.20.0) - msgpack (1.6.0) + msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) + multipart-post (2.3.0) mutex_m (0.1.2) net-imap (0.4.1) date @@ -187,31 +188,33 @@ GEM nio4r (2.5.9) nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) - oauth2 (1.4.9) + oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) + rack (>= 1.2, < 4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc pg (1.5.4) - public_suffix (5.0.1) + psych (5.1.1) + stringio + public_suffix (5.0.3) puma (6.4.0) nio4r (~> 2.0) racc (1.7.1) - rack (2.2.8) + rack (3.0.8) rack-cors (2.0.1) rack (>= 2.0.0) - rack-session (1.0.1) - rack (< 3) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rackup (1.0.0) - rack (< 3) - webrick + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) rails (7.1.1) actioncable (= 7.1.1) actionmailbox (= 7.1.1) @@ -242,18 +245,20 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - raindrops (0.20.0) + raindrops (0.20.1) rake (13.0.6) - regexp_parser (2.8.1) - reline (0.3.3) + rdoc (6.5.0) + psych (>= 4.0.0) + regexp_parser (2.8.2) + reline (0.3.9) io-console (~> 0.5) rexml (3.2.6) - rubocop (1.56.4) + rubocop (1.57.1) base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) @@ -281,19 +286,20 @@ GEM sentry-ruby (~> 5.12.0) sentry-ruby (5.12.0) concurrent-ruby (~> 1.0, >= 1.0.2) - sprockets (4.0.3) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) + stringio (3.0.8) thor (1.2.2) thread_safe (0.3.6) timeout (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -344,7 +350,7 @@ DEPENDENCIES webdrivers RUBY VERSION - ruby 3.1.2p20 + ruby 3.2.2p53 BUNDLED WITH 2.3.7 diff --git a/runner.dockerfile b/runner.dockerfile index b2b45cb..7d834b4 100644 --- a/runner.dockerfile +++ b/runner.dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.2 +FROM ruby:3.2.2 RUN mkdir /app diff --git a/server.dockerfile b/server.dockerfile index c4d178c..bc3da3c 100644 --- a/server.dockerfile +++ b/server.dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.2 +FROM ruby:3.2.2 RUN mkdir /app