From e9b8af6b59b16f9a9595bae87fac13c4e0969f23 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 18 Sep 2023 14:36:54 -0400 Subject: [PATCH] 20300: Update gemfiles to rails 6. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/api/Gemfile | 8 +- services/api/Gemfile.lock | 219 ++++++++++++++++++++++---------------- 2 files changed, 128 insertions(+), 99 deletions(-) diff --git a/services/api/Gemfile b/services/api/Gemfile index adfaa2ecb5..b2b6d1fbc4 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -4,11 +4,9 @@ source 'https://rubygems.org' -gem 'rails', '~> 5.2.0' -gem 'responders', '~> 2.0' - -# i18n 1.14.1 seems to be incompatible with rails 5 -gem 'i18n', '~> 0.9.5' +gem 'rails', '~> 6.0.0' +gem 'responders' +gem 'i18n' # Pin sprockets to < 4.0 to avoid issues when upgrading rails to 5.2 # See: https://github.com/rails/sprockets-rails/issues/443 diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index a7d46a14a8..d7f1938372 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -8,47 +8,61 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.8.1) - actionpack (= 5.2.8.1) + actioncable (6.0.6.1) + actionpack (= 6.0.6.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) + actionmailbox (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) + mail (>= 2.7.1) + actionmailer (6.0.6.1) + actionpack (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) + actionpack (6.0.6.1) + actionview (= 6.0.6.1) + activesupport (= 6.0.6.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.6.1) + actionpack (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) + nokogiri (>= 1.8.5) + actionview (6.0.6.1) + activesupport (= 6.0.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.8.1) - activesupport (= 5.2.8.1) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.6.1) + activesupport (= 6.0.6.1) globalid (>= 0.3.6) - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) - activestorage (5.2.8.1) - actionpack (= 5.2.8.1) - activerecord (= 5.2.8.1) - marcel (~> 1.0.0) - activesupport (5.2.8.1) + activemodel (6.0.6.1) + activesupport (= 6.0.6.1) + activerecord (6.0.6.1) + activemodel (= 6.0.6.1) + activesupport (= 6.0.6.1) + activestorage (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + marcel (~> 1.0) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) acts_as_api (1.0.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -56,7 +70,6 @@ GEM addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) andand (1.3.3) - arel (9.0.0) arvados (2.7.0.rc2) activesupport (>= 3) andand (~> 1.3, >= 1.3.3) @@ -82,16 +95,17 @@ GEM extlib (>= 0.9.15) multi_json (>= 1.0.0) builder (3.2.4) - byebug (11.0.1) + byebug (11.1.3) concurrent-ruby (1.2.2) crass (1.0.6) + date (3.3.3) erubi (1.12.0) extlib (0.9.16) - factory_bot (5.0.2) - activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) - railties (>= 4.2.0) + factory_bot (6.2.1) + activesupport (>= 5.0.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) + railties (>= 5.0.0) faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) @@ -101,7 +115,7 @@ GEM faraday-multipart (1.0.4) multipart-post (~> 2) faraday-net_http (3.0.2) - ffi (1.9.25) + ffi (1.15.5) globalid (1.1.0) activesupport (>= 5.0) googleauth (1.7.0) @@ -112,9 +126,9 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jquery-rails (4.5.1) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -122,88 +136,103 @@ GEM jwt (1.5.6) launchy (2.5.2) addressable (~> 2.8) - listen (3.2.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lograge (0.10.0) + lograge (0.13.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) logstash-event (1.2.02) - loofah (2.20.0) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) memoist (0.16.2) - metaclass (0.0.4) method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.2) + mini_mime (1.1.5) + mini_portile2 (2.8.4) minitest (5.10.3) - mocha (1.8.0) - metaclass (~> 0.0.1) + mocha (2.1.0) + ruby2_keywords (>= 0.0.5) multi_json (1.15.0) multipart-post (2.3.0) - nio4r (2.5.8) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + net-imap (0.3.7) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nio4r (2.5.9) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.9.2) - optimist (3.0.0) + oj (3.16.0) + optimist (3.1.0) os (1.1.4) - passenger (6.0.15) + passenger (6.0.18) rack rake (>= 0.8.1) - pg (1.1.4) - power_assert (1.1.4) + pg (1.5.3) + power_assert (2.0.3) public_suffix (5.0.3) - racc (1.6.2) - rack (2.2.7) + racc (1.7.1) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails (5.2.8.1) - actioncable (= 5.2.8.1) - actionmailer (= 5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - activemodel (= 5.2.8.1) - activerecord (= 5.2.8.1) - activestorage (= 5.2.8.1) - activesupport (= 5.2.8.1) + rails (6.0.6.1) + actioncable (= 6.0.6.1) + actionmailbox (= 6.0.6.1) + actionmailer (= 6.0.6.1) + actionpack (= 6.0.6.1) + actiontext (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) + activemodel (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) bundler (>= 1.3.0) - railties (= 5.2.8.1) + railties (= 6.0.6.1) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails-observers (0.1.5) activemodel (>= 4.0) rails-perftest (0.0.7) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) + railties (6.0.6.1) + actionpack (= 6.0.6.1) + activesupport (= 6.0.6.1) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rake (13.0.6) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - request_store (1.4.1) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + request_store (1.5.1) rack (>= 1.4) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) retriable (1.4.1) ruby-prof (0.15.9) ruby2_keywords (0.0.5) @@ -217,7 +246,7 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.7.1) simplecov-html (0.7.1) - simplecov-rcov (0.2.3) + simplecov-rcov (0.3.1) simplecov (>= 0.4.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -226,15 +255,17 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - test-unit (3.3.1) + test-unit (3.6.1) power_assert - thor (1.2.1) + thor (1.2.2) thread_safe (0.3.6) + timeout (0.4.0) tzinfo (1.2.11) thread_safe (~> 0.1) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) + zeitwerk (2.6.11) zlib (3.0.0) PLATFORMS @@ -247,7 +278,7 @@ DEPENDENCIES byebug factory_bot_rails httpclient - i18n (~> 0.9.5) + i18n jquery-rails listen lograge @@ -260,11 +291,11 @@ DEPENDENCIES optimist passenger pg (~> 1.0) - rails (~> 5.2.0) + rails (~> 6.0.0) rails-controller-testing rails-observers rails-perftest - responders (~> 2.0) + responders ruby-prof (~> 0.15.0) safe_yaml simplecov (~> 0.7.1) @@ -274,4 +305,4 @@ DEPENDENCIES themes_for_rails! BUNDLED WITH - 2.2.19 + 2.4.19 -- 2.30.2