From bbffbfcdf2215a1aaa1c5791acd370603b988d78 Mon Sep 17 00:00:00 2001 From: Kosuke Tanabe Date: Tue, 10 Dec 2024 02:11:25 +0900 Subject: [PATCH] update Ruby to 3.2.6 --- .ruby-version | 2 +- Dockerfile | 2 +- Gemfile | 4 +- Gemfile.lock | 226 ++++++++++++++++++++++++++------------------------ 4 files changed, 122 insertions(+), 112 deletions(-) diff --git a/.ruby-version b/.ruby-version index 5ae69bd5f..34cde5690 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.5 +3.2.6 diff --git a/Dockerfile b/Dockerfile index 12787b987..61792430f 100644 --- a/Dockerfile +++ b/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.2.5 +ARG RUBY_VERSION=3.2.6 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base # Rails app lives here diff --git a/Gemfile b/Gemfile index 807f0295d..873d2be89 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.2.5" +ruby "3.2.6" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.1.3", ">= 7.1.3.4" @@ -96,7 +96,7 @@ gem 'progress_bar' gem 'rails_autolink' gem 'kramdown' gem 'solid_queue', "~> 1.0" -gem 'mission_control-jobs' +gem 'mission_control-jobs', "< 1.0" gem 'acts-as-taggable-on' gem 'resync' # , github: 'nabeta/resync', branch: 'add-datetime' gem 'pretender' diff --git a/Gemfile.lock b/Gemfile.lock index 34d0af7a3..b7c789daa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,35 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.4.2) - actionpack (= 7.1.4.2) - activesupport (= 7.1.4.2) + actioncable (7.1.5) + actionpack (= 7.1.5) + activesupport (= 7.1.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.4.2) - actionpack (= 7.1.4.2) - activejob (= 7.1.4.2) - activerecord (= 7.1.4.2) - activestorage (= 7.1.4.2) - activesupport (= 7.1.4.2) + actionmailbox (7.1.5) + actionpack (= 7.1.5) + activejob (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.4.2) - actionpack (= 7.1.4.2) - actionview (= 7.1.4.2) - activejob (= 7.1.4.2) - activesupport (= 7.1.4.2) + actionmailer (7.1.5) + actionpack (= 7.1.5) + actionview (= 7.1.5) + activejob (= 7.1.5) + activesupport (= 7.1.5) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.4.2) - actionview (= 7.1.4.2) - activesupport (= 7.1.4.2) + actionpack (7.1.5) + actionview (= 7.1.5) + activesupport (= 7.1.5) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -37,53 +37,57 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.4.2) - actionpack (= 7.1.4.2) - activerecord (= 7.1.4.2) - activestorage (= 7.1.4.2) - activesupport (= 7.1.4.2) + actiontext (7.1.5) + actionpack (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.4.2) - activesupport (= 7.1.4.2) + actionview (7.1.5) + activesupport (= 7.1.5) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - active_storage_validations (1.3.0) + active_storage_validations (1.3.4) activejob (>= 6.1.4) activemodel (>= 6.1.4) activestorage (>= 6.1.4) activesupport (>= 6.1.4) - activejob (7.1.4.2) - activesupport (= 7.1.4.2) + marcel (>= 1.0.3) + activejob (7.1.5) + activesupport (= 7.1.5) globalid (>= 0.3.6) - activemodel (7.1.4.2) - activesupport (= 7.1.4.2) - activerecord (7.1.4.2) - activemodel (= 7.1.4.2) - activesupport (= 7.1.4.2) + activemodel (7.1.5) + activesupport (= 7.1.5) + activerecord (7.1.5) + activemodel (= 7.1.5) + activesupport (= 7.1.5) timeout (>= 0.4.0) - activestorage (7.1.4.2) - actionpack (= 7.1.4.2) - activejob (= 7.1.4.2) - activerecord (= 7.1.4.2) - activesupport (= 7.1.4.2) + activestorage (7.1.5) + actionpack (= 7.1.5) + activejob (= 7.1.5) + activerecord (= 7.1.5) + activesupport (= 7.1.5) marcel (~> 1.0) - activesupport (7.1.4.2) + activesupport (7.1.5) base64 + benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) - acts-as-taggable-on (11.0.0) - activerecord (>= 7.0, < 8.0) + acts-as-taggable-on (12.0.0) + activerecord (>= 7.1, < 8.1) zeitwerk (>= 2.4, < 3.0) - acts_as_list (1.2.3) + acts_as_list (1.2.4) activerecord (>= 6.1) activesupport (>= 6.1) addressable (2.8.7) @@ -91,16 +95,17 @@ GEM annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) - awesome_nested_set (3.7.0) - activerecord (>= 4.0.0, < 8.0) + awesome_nested_set (3.8.0) + activerecord (>= 4.0.0, < 8.1) base64 (0.2.0) bcp47_spec (0.2.1) bcrypt (3.1.20) + benchmark (0.4.0) bigdecimal (3.1.8) bindex (0.8.1) bootsnap (1.18.4) msgpack (~> 1.2) - browser (6.0.0) + browser (6.2.0) builder (3.3.0) capybara (3.40.0) addressable @@ -130,7 +135,7 @@ GEM csv (3.3.0) database_consistency (1.7.26) activerecord (>= 3.2) - date (3.3.4) + date (3.4.1) date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) @@ -150,7 +155,8 @@ GEM dotenv (= 3.1.4) railties (>= 6.1) drb (2.2.1) - ebnf (2.5.0) + ebnf (2.6.0) + base64 (~> 0.2) htmlentities (~> 4.3) rdf (~> 3.3) scanf (~> 1.0) @@ -164,23 +170,23 @@ GEM factory_bot_rails (6.4.4) factory_bot (~> 6.5) railties (>= 5.0.0) - faraday (2.12.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) json logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (3.3.0) - net-http + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0-x86_64-linux-gnu) friendly_id (5.5.1) activerecord (>= 4.0.0) fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) - geocoder (1.8.3) + geocoder (1.8.4) base64 (>= 0.1.0) csv (>= 3.0.0) globalid (1.2.1) @@ -191,7 +197,7 @@ GEM request_store (~> 1.0) globalize-accessors (0.3.0) globalize (>= 5.0.0) - hashdiff (1.1.1) + hashdiff (1.1.2) highline (3.1.1) reline htmlentities (4.3.4) @@ -204,7 +210,7 @@ GEM actionpack (>= 6.0.0) activesupport (>= 6.0.0) railties (>= 6.0.0) - io-console (0.7.2) + io-console (0.8.0) irb (1.14.1) rdoc (>= 4.0.0) reline (>= 0.4.2) @@ -217,7 +223,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (2.7.4) + json (2.9.0) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -230,8 +236,8 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) kt-paperclip (7.2.2) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -243,7 +249,7 @@ GEM lisbn (0.3.2) nokogiri nori (~> 2.0) - logger (1.6.1) + logger (1.6.2) loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -257,22 +263,26 @@ GEM mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1001) + mime-types-data (3.2024.1203) mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.25.1) - mission_control-jobs (0.3.3) - importmap-rails + minitest (5.25.4) + mission_control-jobs (0.6.0) + actioncable (>= 7.1) + actionpack (>= 7.1) + activejob (>= 7.1) + activerecord (>= 7.1) + importmap-rails (>= 1.2.1) irb (~> 1.13) - rails (>= 7.1) + railties (>= 7.1) stimulus-rails turbo-rails - msgpack (1.7.3) + msgpack (1.7.5) multipart-post (2.4.1) - mutex_m (0.2.0) - net-http (0.4.1) + mutex_m (0.3.0) + net-http (0.6.0) uri - net-imap (0.5.0) + net-imap (0.5.1) date net-protocol net-pop (0.1.2) @@ -281,8 +291,8 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.3) - nokogiri (1.16.7-x86_64-linux) + nio4r (2.7.4) + nokogiri (1.17.0-x86_64-linux) racc (~> 1.4) nori (2.7.1) bigdecimal @@ -302,10 +312,11 @@ GEM progress_bar (1.3.4) highline (>= 1.6) options (~> 2.3.0) - psych (5.1.2) + psych (5.2.1) + date stringio public_suffix (6.0.1) - puma (6.4.3) + puma (6.5.0) nio4r (~> 2.0) pundit (2.4.0) activesupport (>= 3.0.0) @@ -318,23 +329,22 @@ GEM rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rackup (2.1.0) + rackup (2.2.1) rack (>= 3) - webrick (~> 1.8) - rails (7.1.4.2) - actioncable (= 7.1.4.2) - actionmailbox (= 7.1.4.2) - actionmailer (= 7.1.4.2) - actionpack (= 7.1.4.2) - actiontext (= 7.1.4.2) - actionview (= 7.1.4.2) - activejob (= 7.1.4.2) - activemodel (= 7.1.4.2) - activerecord (= 7.1.4.2) - activestorage (= 7.1.4.2) - activesupport (= 7.1.4.2) + rails (7.1.5) + actioncable (= 7.1.5) + actionmailbox (= 7.1.5) + actionmailer (= 7.1.5) + actionpack (= 7.1.5) + actiontext (= 7.1.5) + actionview (= 7.1.5) + activejob (= 7.1.5) + activemodel (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) bundler (>= 1.15.0) - railties (= 7.1.4.2) + railties (= 7.1.5) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -343,19 +353,19 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.1) loofah (~> 2.21) - nokogiri (~> 1.14) - rails-i18n (7.0.9) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) rails_autolink (1.1.8) actionview (> 3.1) activesupport (> 3.1) railties (> 3.1) - railties (7.1.4.2) - actionpack (= 7.1.4.2) - activesupport (= 7.1.4.2) + railties (7.1.5) + actionpack (= 7.1.5) + activesupport (= 7.1.5) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -371,16 +381,16 @@ GEM bigdecimal (~> 3.1, >= 3.1.5) ebnf (~> 2.5) rdf (~> 3.3) - rdf-vocab (3.3.1) + rdf-vocab (3.3.2) rdf (~> 3.3) - rdoc (6.7.0) + rdoc (6.8.1) psych (>= 4.0.0) redis (5.3.0) redis-client (>= 0.22.0) redis-client (0.22.2) connection_pool - regexp_parser (2.9.2) - reline (0.5.10) + regexp_parser (2.9.3) + reline (0.5.12) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) @@ -404,7 +414,7 @@ GEM rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.0.1) + rspec-rails (7.1.0) actionpack (>= 7.0) activesupport (>= 7.0) railties (>= 7.0) @@ -412,7 +422,7 @@ GEM rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) rspec-support (~> 3.13) - rspec-support (3.13.1) + rspec-support (3.13.2) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rss (0.3.1) @@ -430,13 +440,14 @@ GEM sprockets-rails tilt scanf (1.0.0) - selenium-webdriver (4.25.0) + securerandom (0.4.0) + selenium-webdriver (4.27.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semantic_range (3.0.0) + semantic_range (3.1.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) @@ -445,7 +456,7 @@ GEM simplecov_json_formatter (0.1.4) sitemap_generator (6.3.0) builder (~> 3.0) - solid_queue (1.0.0) + solid_queue (1.1.0) activejob (>= 7.1) activerecord (>= 7.1) concurrent-ruby (>= 1.3.1) @@ -462,9 +473,9 @@ GEM statesman (12.1.0) stimulus-rails (1.3.4) railties (>= 6.0.0) - stringio (3.1.1) - strip_attributes (1.13.0) - activemodel (>= 3.0, < 8.0) + stringio (3.1.2) + strip_attributes (1.14.0) + activemodel (>= 3.0, < 9.0) sunspot (2.7.1) bigdecimal pr_geohash (~> 1.0) @@ -479,7 +490,7 @@ GEM climate_control thor (1.3.2) tilt (2.4.0) - timeout (0.4.1) + timeout (0.4.2) turbo-rails (2.0.11) actionpack (>= 6.0.0) railties (>= 6.0.0) @@ -487,7 +498,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-types (1.10.0) - uri (0.13.1) + uri (1.0.2) vcr (6.3.1) base64 warden (1.2.9) @@ -506,7 +517,6 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - webrick (1.8.2) websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -556,7 +566,7 @@ DEPENDENCIES kt-paperclip library_stdnums lisbn - mission_control-jobs + mission_control-jobs (< 1.0) oai parallel_tests pg (~> 1.1) @@ -591,7 +601,7 @@ DEPENDENCIES webpacker (~> 5.0) RUBY VERSION - ruby 3.2.5p208 + ruby 3.2.6p234 BUNDLED WITH 2.4.19