Merge pull request #3414 from tomhughes/rails7

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index db231028e72d77b983bd155ce61d093a3b8c5301..0c8b03bda03805271f95f9d35d25e28851f24ef5 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,71 +3,77 @@ GEM
   specs:
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)
   specs:
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)

-    actioncable (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actioncable (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)

       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)

-    actionmailbox (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionmailbox (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)

       mail (>= 2.7.1)
       mail (>= 2.7.1)

-    actionmailer (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      actionview (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activesupport (= 7.0.2.2)

       mail (~> 2.5, >= 2.5.4)
       mail (~> 2.5, >= 2.5.4)

+      net-imap
+      net-pop
+      net-smtp

       rails-dom-testing (~> 2.0)
       rails-dom-testing (~> 2.0)

-    actionpack (6.1.4.6)
-      actionview (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.2.2)
+      actionview (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      rack (~> 2.0, >= 2.2.0)

       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)

-    actiontext (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actiontext (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      globalid (>= 0.6.0)

       nokogiri (>= 1.8.5)
       nokogiri (>= 1.8.5)

-    actionview (6.1.4.6)
-      activesupport (= 6.1.4.6)
+    actionview (7.0.2.2)
+      activesupport (= 7.0.2.2)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)

-    activejob (6.1.4.6)
-      activesupport (= 6.1.4.6)
+    activejob (7.0.2.2)
+      activesupport (= 7.0.2.2)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (6.1.4.6)
-      activesupport (= 6.1.4.6)
-    activerecord (6.1.4.6)
-      activemodel (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    activemodel (7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activerecord (7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activesupport (= 7.0.2.2)

     activerecord-import (1.3.0)
       activerecord (>= 4.2)
     activerecord-import (1.3.0)
       activerecord (>= 4.2)

-    activestorage (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      marcel (~> 1.0.0)
+    activestorage (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      marcel (~> 1.0)

       mini_mime (>= 1.1.0)
       mini_mime (>= 1.1.0)

-    activesupport (6.1.4.6)
+    activesupport (7.0.2.2)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)

-      zeitwerk (~> 2.3)

     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.2.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.2.0)


@@ -135,10 +141,10 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)

-    childprocess (3.0.0)
+    childprocess (4.1.0)

     coderay (1.1.3)
     coderay (1.1.3)

-    composite_primary_keys (13.0.3)
-      activerecord (~> 6.1.0)
+    composite_primary_keys (14.0.4)
+      activerecord (~> 7.0.2)

     concurrent-ruby (1.1.9)
     config (4.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
     concurrent-ruby (1.1.9)
     config (4.0.0)
       deep_merge (~> 1.2, >= 1.2.1)


@@ -155,6 +161,7 @@ GEM
     delayed_job_active_record (4.1.7)
       activerecord (>= 3.0, < 8.0)
       delayed_job (>= 3.0, < 5)
     delayed_job_active_record (4.1.7)
       activerecord (>= 3.0, < 8.0)
       delayed_job (>= 3.0, < 5)

+    digest (3.1.0)

     docile (1.4.0)
     doorkeeper (5.5.4)
       railties (>= 5)
     docile (1.4.0)
     doorkeeper (5.5.4)
       railties (>= 5)


@@ -266,6 +273,7 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     image_size (3.0.1)
     in_threads (1.6.0)
       ruby-vips (>= 2.0.17, < 3)
     image_size (3.0.1)
     in_threads (1.6.0)

+    io-wait (0.2.1)

     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)


@@ -303,6 +311,21 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)

+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout

     nio4r (2.5.8)
     nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)
     nio4r (2.5.8)
     nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)


@@ -375,21 +398,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)

-    rails (6.1.4.6)
-      actioncable (= 6.1.4.6)
-      actionmailbox (= 6.1.4.6)
-      actionmailer (= 6.1.4.6)
-      actionpack (= 6.1.4.6)
-      actiontext (= 6.1.4.6)
-      actionview (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activemodel (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+    rails (7.0.2.2)
+      actioncable (= 7.0.2.2)
+      actionmailbox (= 7.0.2.2)
+      actionmailer (= 7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actiontext (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)

       bundler (>= 1.15.0)
       bundler (>= 1.15.0)

-      railties (= 6.1.4.6)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.2.2)

     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)


@@ -399,15 +421,16 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)

-    rails-i18n (6.0.0)
+    rails-i18n (7.0.2)

       i18n (>= 0.7, < 2)
       i18n (>= 0.7, < 2)

-      railties (>= 6.0.0, < 7)
-    railties (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
+      railties (>= 6.0.0, < 8)
+    railties (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)

       method_source
       method_source

-      rake (>= 0.13)
+      rake (>= 12.2)

       thor (~> 1.0)
       thor (~> 1.0)

+      zeitwerk (~> 2.5)

     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.1)


@@ -459,8 +482,9 @@ GEM
       sprockets-rails
       tilt
     secure_headers (6.3.3)
       sprockets-rails
       tilt
     secure_headers (6.3.3)

-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)

       rubyzip (>= 1.2.2)
     simplecov (0.21.2)
       docile (~> 1.1)
       rubyzip (>= 1.2.2)
     simplecov (0.21.2)
       docile (~> 1.1)


@@ -479,10 +503,12 @@ GEM
       sprockets (>= 3.0.0)
     strong_migrations (0.8.0)
       activerecord (>= 5.2)
       sprockets (>= 3.0.0)
     strong_migrations (0.8.0)
       activerecord (>= 5.2)

+    strscan (3.0.1)

     terser (1.1.8)
       execjs (>= 0.3.0, < 3)
     thor (1.2.1)
     tilt (2.0.10)
     terser (1.1.8)
       execjs (>= 0.3.0, < 3)
     thor (1.2.1)
     tilt (2.0.10)

+    timeout (0.2.0)

     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)


@@ -523,7 +549,7 @@ DEPENDENCIES
   cancancan
   canonical-rails
   capybara (>= 2.15)
   cancancan
   canonical-rails
   capybara (>= 2.15)

-  composite_primary_keys (~> 13.0.0)
+  composite_primary_keys (~> 14.0.0)

   config
   connection_pool
   dalli
   config
   connection_pool
   dalli


@@ -568,9 +594,9 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 6.1.4.6)
+  rails (= 7.0.2.2)

   rails-controller-testing
   rails-controller-testing

-  rails-i18n (~> 6.0.0)
+  rails-i18n (~> 7.0.0)

   rinku (>= 2.0.6)
   rotp
   rubocop
   rinku (>= 2.0.6)
   rotp
   rubocop


@@ -581,7 +607,7 @@ DEPENDENCIES
   sanitize
   sassc-rails
   secure_headers
   sanitize
   sassc-rails
   secure_headers

-  selenium-webdriver (~> 3.142.7)
+  selenium-webdriver

   simplecov
   simplecov-lcov
   strong_migrations
   simplecov
   simplecov-lcov
   strong_migrations