From 17eca6ba824e35cf76371e8d5366de83c75444e3 Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Tue, 16 Feb 2021 20:56:17 -0600 Subject: [PATCH] Update appraisals --- Gemfile.lock | 192 +++++++++++++++-------------- gemfiles/rails_master.gemfile | 2 +- gemfiles/rails_master.gemfile.lock | 133 ++++++++++---------- 3 files changed, 168 insertions(+), 159 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a6d8d569..a16db89a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,73 +18,78 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.1.2.1) + actionpack (= 6.1.2.1) + activesupport (= 6.1.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.1.2.1) + actionpack (= 6.1.2.1) + activejob (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.1.2.1) + actionpack (= 6.1.2.1) + actionview (= 6.1.2.1) + activejob (= 6.1.2.1) + activesupport (= 6.1.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.2.1) + actionview (= 6.1.2.1) + activesupport (= 6.1.2.1) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.1.2.1) + actionpack (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.1.2.1) + activesupport (= 6.1.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.1.2.1) + activesupport (= 6.1.2.1) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) + activemodel (6.1.2.1) + activesupport (= 6.1.2.1) + activerecord (6.1.2.1) + activemodel (= 6.1.2.1) + activesupport (= 6.1.2.1) + activestorage (6.1.2.1) + actionpack (= 6.1.2.1) + activejob (= 6.1.2.1) + activerecord (= 6.1.2.1) + activesupport (= 6.1.2.1) marcel (~> 0.3.1) - activesupport (6.0.3.4) + mimemagic (~> 0.3.2) + activesupport (6.1.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - ast (2.4.1) + ast (2.4.2) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.7) - crack (0.4.4) + concurrent-ruby (1.1.8) + crack (0.4.5) + rexml crass (1.0.6) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) erubi (1.10.0) - ffi (1.13.1) + ffi (1.14.2) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -99,11 +104,11 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.2) - ffi-compiler - i18n (1.8.5) + http-parser (1.2.3) + ffi-compiler (>= 1.0, < 2.0) + i18n (1.8.9) concurrent-ruby (~> 1.0) - loofah (2.8.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -113,65 +118,67 @@ GEM method_source (1.0.0) mimemagic (0.3.5) mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) + mini_portile2 (2.5.0) + minitest (5.14.3) mysql2 (0.5.3) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - parallel (1.20.0) - parser (2.7.2.0) + nio4r (2.5.5) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) pg (1.2.3) public_suffix (4.0.6) + racc (1.5.2) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) - bundler (>= 1.3.0) - railties (= 6.0.3.4) + rails (6.1.2.1) + actioncable (= 6.1.2.1) + actionmailbox (= 6.1.2.1) + actionmailer (= 6.1.2.1) + actionpack (= 6.1.2.1) + actiontext (= 6.1.2.1) + actionview (= 6.1.2.1) + activejob (= 6.1.2.1) + activemodel (= 6.1.2.1) + activerecord (= 6.1.2.1) + activestorage (= 6.1.2.1) + activesupport (= 6.1.2.1) + bundler (>= 1.15.0) + railties (= 6.1.2.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.1.2.1) + actionpack (= 6.1.2.1) + activesupport (= 6.1.2.1) method_source rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + thor (~> 1.0) rainbow (3.0.0) - rake (13.0.1) - regexp_parser (1.8.2) + rake (13.0.3) + regexp_parser (2.0.3) rexml (3.2.4) - rubocop (1.2.0) + rubocop (1.10.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.0.1) + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.1.1) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) parser (>= 2.7.1.5) - rubocop-performance (1.8.1) - rubocop (>= 0.87.0) + rubocop-performance (1.9.2) + rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -180,18 +187,17 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - standard (0.9.0) - rubocop (= 1.2.0) - rubocop-performance (= 1.8.1) - thor (1.0.1) - thread_safe (0.3.6) - tzinfo (1.2.8) - thread_safe (~> 0.1) + standard (0.13.0) + rubocop (= 1.10.0) + rubocop-performance (= 1.9.2) + thor (1.1.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - webmock (3.9.5) + unicode-display_width (2.0.0) + webmock (3.11.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -214,4 +220,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 2.2.3 diff --git a/gemfiles/rails_master.gemfile b/gemfiles/rails_master.gemfile index 989df407..04df879f 100644 --- a/gemfiles/rails_master.gemfile +++ b/gemfiles/rails_master.gemfile @@ -4,6 +4,6 @@ source "https://rubygems.org" gem "byebug", group: [:development, :test] gem "appraisal", branch: "fix-bundle-env", git: "https://github.com/excid3/appraisal.git" -gem "rails", git: "https://github.com/rails/rails.git" +gem "rails", branch: "main", git: "https://github.com/rails/rails.git" gemspec path: "../" diff --git a/gemfiles/rails_master.gemfile.lock b/gemfiles/rails_master.gemfile.lock index 45fec7d1..e270b46b 100644 --- a/gemfiles/rails_master.gemfile.lock +++ b/gemfiles/rails_master.gemfile.lock @@ -10,85 +10,86 @@ GIT GIT remote: https://github.com/rails/rails.git - revision: 8c3beff9a2232c27a4418b9dfaf325c5393bcc46 + revision: 4ef77ac8de4caea38e83663e7cd0fdbe5d1ebf1d + branch: main specs: - actioncable (6.1.0.rc1) - actionpack (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) + actioncable (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.0.rc1) - actionpack (= 6.1.0.rc1) - activejob (= 6.1.0.rc1) - activerecord (= 6.1.0.rc1) - activestorage (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) + actionmailbox (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activejob (= 7.0.0.alpha) + activerecord (= 7.0.0.alpha) + activestorage (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) mail (>= 2.7.1) - actionmailer (6.1.0.rc1) - actionpack (= 6.1.0.rc1) - actionview (= 6.1.0.rc1) - activejob (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) + actionmailer (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + actionview (= 7.0.0.alpha) + activejob (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.0.rc1) - actionview (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) + actionpack (7.0.0.alpha) + actionview (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.0.rc1) - actionpack (= 6.1.0.rc1) - activerecord (= 6.1.0.rc1) - activestorage (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) + actiontext (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activerecord (= 7.0.0.alpha) + activestorage (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) nokogiri (>= 1.8.5) - actionview (6.1.0.rc1) - activesupport (= 6.1.0.rc1) + actionview (7.0.0.alpha) + activesupport (= 7.0.0.alpha) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.0.rc1) - activesupport (= 6.1.0.rc1) + activejob (7.0.0.alpha) + activesupport (= 7.0.0.alpha) globalid (>= 0.3.6) - activemodel (6.1.0.rc1) - activesupport (= 6.1.0.rc1) - activerecord (6.1.0.rc1) - activemodel (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) - activestorage (6.1.0.rc1) - actionpack (= 6.1.0.rc1) - activejob (= 6.1.0.rc1) - activerecord (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) + activemodel (7.0.0.alpha) + activesupport (= 7.0.0.alpha) + activerecord (7.0.0.alpha) + activemodel (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) + activestorage (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activejob (= 7.0.0.alpha) + activerecord (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) marcel (~> 0.3.1) mimemagic (~> 0.3.2) - activesupport (6.1.0.rc1) + activesupport (7.0.0.alpha) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - rails (6.1.0.rc1) - actioncable (= 6.1.0.rc1) - actionmailbox (= 6.1.0.rc1) - actionmailer (= 6.1.0.rc1) - actionpack (= 6.1.0.rc1) - actiontext (= 6.1.0.rc1) - actionview (= 6.1.0.rc1) - activejob (= 6.1.0.rc1) - activemodel (= 6.1.0.rc1) - activerecord (= 6.1.0.rc1) - activestorage (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) + rails (7.0.0.alpha) + actioncable (= 7.0.0.alpha) + actionmailbox (= 7.0.0.alpha) + actionmailer (= 7.0.0.alpha) + actionpack (= 7.0.0.alpha) + actiontext (= 7.0.0.alpha) + actionview (= 7.0.0.alpha) + activejob (= 7.0.0.alpha) + activemodel (= 7.0.0.alpha) + activerecord (= 7.0.0.alpha) + activestorage (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) bundler (>= 1.15.0) - railties (= 6.1.0.rc1) + railties (= 7.0.0.alpha) sprockets-rails (>= 2.0.0) - railties (6.1.0.rc1) - actionpack (= 6.1.0.rc1) - activesupport (= 6.1.0.rc1) + railties (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) method_source rake (>= 0.8.7) thor (~> 1.0) @@ -108,7 +109,7 @@ GEM ast (2.4.1) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) crack (0.4.4) crass (1.0.6) domain_name (0.5.20190701) @@ -131,9 +132,9 @@ GEM http-form_data (2.3.0) http-parser (1.2.2) ffi-compiler - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) - loofah (2.7.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -143,17 +144,19 @@ GEM method_source (1.0.0) mimemagic (0.3.5) mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) + mini_portile2 (2.5.0) + minitest (5.14.3) mysql2 (0.5.3) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nio4r (2.5.5) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) parallel (1.20.1) parser (2.7.2.0) ast (~> 2.4.1) pg (1.2.3) public_suffix (4.0.6) + racc (1.5.2) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -193,7 +196,7 @@ GEM rubocop (= 1.2.0) rubocop-performance (= 1.8.1) thor (1.0.1) - tzinfo (2.0.3) + tzinfo (2.0.4) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext @@ -206,7 +209,7 @@ GEM websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.4.1) + zeitwerk (2.4.2) PLATFORMS ruby @@ -223,4 +226,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 2.2.3