From 3988f09dfbdc58bfba225e1bf136300f4ccfa4f3 Mon Sep 17 00:00:00 2001 From: Davide Dippolito Date: Wed, 20 Nov 2024 17:09:13 +0000 Subject: [PATCH] Upgrade to Rails 7.2 --- Gemfile | 4 +- Gemfile.lock | 169 +++++++++++++++++++++++++-------------------------- 2 files changed, 84 insertions(+), 89 deletions(-) diff --git a/Gemfile b/Gemfile index 2cb08b05dd7..c3411b030c0 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" ruby "3.3.5" -RAILS_VERSION = "~> 7.1.2".freeze +RAILS_VERSION = "~> 7.2".freeze gem "actionmailer", RAILS_VERSION gem "actionpack", RAILS_VERSION gem "actionpack-action_caching" @@ -18,7 +18,7 @@ gem "propshaft" gem "railties", RAILS_VERSION gem "activerecord-import" -gem "activerecord-postgis-adapter" +gem "activerecord-postgis-adapter", ">= 10.0.1" gem "activerecord-session_store" gem "addressable" gem "array_enum" diff --git a/Gemfile.lock b/Gemfile.lock index 96ac2b7ec8f..ffa2c77a1cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,71 +20,66 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.1) - actioncable (7.1.5) - actionpack (= 7.1.5) - activesupport (= 7.1.5) + actioncable (7.2.2) + actionpack (= 7.2.2) + activesupport (= 7.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - 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.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 + actionmailbox (7.2.2) + actionpack (= 7.2.2) + activejob (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) + mail (>= 2.8.0) + actionmailer (7.2.2) + actionpack (= 7.2.2) + actionview (= 7.2.2) + activejob (= 7.2.2) + activesupport (= 7.2.2) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.5) - actionview (= 7.1.5) - activesupport (= 7.1.5) + actionpack (7.2.2) + actionview (= 7.2.2) + activesupport (= 7.2.2) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) actionpack-action_caching (1.2.2) actionpack (>= 4.0.0) - actiontext (7.1.5) - actionpack (= 7.1.5) - activerecord (= 7.1.5) - activestorage (= 7.1.5) - activesupport (= 7.1.5) + actiontext (7.2.2) + actionpack (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.5) - activesupport (= 7.1.5) + actionview (7.2.2) + activesupport (= 7.2.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.5) - activesupport (= 7.1.5) + activejob (7.2.2) + activesupport (= 7.2.2) globalid (>= 0.3.6) - activemodel (7.1.5) - activesupport (= 7.1.5) - activerecord (7.1.5) - activemodel (= 7.1.5) - activesupport (= 7.1.5) + activemodel (7.2.2) + activesupport (= 7.2.2) + activerecord (7.2.2) + activemodel (= 7.2.2) + activesupport (= 7.2.2) timeout (>= 0.4.0) activerecord-import (1.8.1) activerecord (>= 4.2) - activerecord-postgis-adapter (9.0.2) - activerecord (~> 7.1.0) - rgeo-activerecord (~> 7.0.0) + activerecord-postgis-adapter (10.0.1) + activerecord (~> 7.2.0) + rgeo-activerecord (~> 8.0.0) activerecord-session_store (2.1.0) actionpack (>= 6.1) activerecord (>= 6.1) @@ -92,25 +87,24 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 4) railties (>= 6.1) - activestorage (7.1.5) - actionpack (= 7.1.5) - activejob (= 7.1.5) - activerecord (= 7.1.5) - activesupport (= 7.1.5) + activestorage (7.2.2) + actionpack (= 7.2.2) + activejob (= 7.2.2) + activerecord (= 7.2.2) + activesupport (= 7.2.2) marcel (~> 1.0) - activesupport (7.1.5) + activesupport (7.2.2) base64 benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) 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) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aes_key_wrap (1.1.0) @@ -359,10 +353,10 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.4.1) - mutex_m (0.2.0) + mutex_m (0.3.0) net-http (0.5.0) uri - net-imap (0.5.0) + net-imap (0.5.1) date net-protocol net-protocol (0.2.2) @@ -372,7 +366,7 @@ GEM net-smtp (0.5.0) net-protocol net-ssh (7.2.3) - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) nokogiri (1.16.7-x86_64-linux) @@ -485,23 +479,23 @@ GEM rack_session_access (0.2.0) builder (>= 2.0.0) rack (>= 1.0.0) - rackup (1.0.0) + rackup (1.0.1) rack (< 3) webrick - 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) + rails (7.2.2) + actioncable (= 7.2.2) + actionmailbox (= 7.2.2) + actionmailer (= 7.2.2) + actionpack (= 7.2.2) + actiontext (= 7.2.2) + actionview (= 7.2.2) + activejob (= 7.2.2) + activemodel (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) bundler (>= 1.15.0) - railties (= 7.1.5) + railties (= 7.2.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -517,10 +511,10 @@ GEM rack railties (>= 5.1) semantic_logger (~> 4.16) - railties (7.1.5) - actionpack (= 7.1.5) - activesupport (= 7.1.5) - irb + railties (7.2.2) + actionpack (= 7.2.2) + activesupport (= 7.2.2) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -531,7 +525,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (2.8.4) - rdoc (6.7.0) + rdoc (6.8.1) psych (>= 4.0.0) recaptcha (5.17.0) redis (4.8.1) @@ -554,9 +548,9 @@ GEM nokogiri rexml (3.3.9) rgeo (3.0.1) - rgeo-activerecord (7.0.1) - activerecord (>= 5.0) - rgeo (>= 1.0.0) + rgeo-activerecord (8.0.0) + activerecord (>= 7.0) + rgeo (>= 3.0) rgeo-geojson (2.2.0) multi_json (~> 1.15) rgeo (>= 1.0.0) @@ -716,6 +710,7 @@ GEM unicode-version (~> 1.0) unicode-version (1.4.0) uri (1.0.1) + useragent (0.16.10) valid_email2 (6.0.0) activemodel (>= 6.0) mail (~> 2.5) @@ -770,18 +765,18 @@ PLATFORMS x86_64-linux DEPENDENCIES - actionmailer (~> 7.1.2) - actionpack (~> 7.1.2) + actionmailer (~> 7.2) + actionpack (~> 7.2) actionpack-action_caching - actiontext (~> 7.1.2) - activejob (~> 7.1.2) - activemodel (~> 7.1.2) - activerecord (~> 7.1.2) + actiontext (~> 7.2) + activejob (~> 7.2) + activemodel (~> 7.2) + activerecord (~> 7.2) activerecord-import - activerecord-postgis-adapter + activerecord-postgis-adapter (>= 10.0.1) activerecord-session_store - activestorage (~> 7.1.2) - activesupport (~> 7.1.2) + activestorage (~> 7.2) + activesupport (~> 7.2) addressable amazing_print array_enum @@ -852,7 +847,7 @@ DEPENDENCIES rack_session_access rails-controller-testing rails_semantic_logger - railties (~> 7.1.2) + railties (~> 7.2) recaptcha redis rgeo-geojson