From 105537679c128bfb3984357fa2b7d61773f8a8ec Mon Sep 17 00:00:00 2001 From: Stanislav Katkov Date: Wed, 3 Jan 2024 23:41:17 +0100 Subject: [PATCH] appraisal update --- gemfiles/rails_7.gemfile | 10 +++- gemfiles/rails_7.gemfile.lock | 81 ++++++++++++++++--------------- gemfiles/rails_7_1.gemfile | 10 +++- gemfiles/rails_7_1.gemfile.lock | 81 ++++++++++++++++--------------- gemfiles/rails_main.gemfile | 10 +++- gemfiles/rails_main.gemfile.lock | 83 +++++++++++++++++--------------- 6 files changed, 153 insertions(+), 122 deletions(-) diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index 2692e90..b22a722 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -6,8 +6,16 @@ gem "sqlite3" gem "mysql2" gem "pg" gem "sprockets-rails" -gem "rubocop-37signals", require: false, git: "https://github.com/basecamp/house-style.git" gem "appraisal" gem "rails", branch: "7-0-stable", git: "https://github.com/rails/rails.git" +group :rubocop do + gem "rubocop", ">= 1.25.1", require: false + gem "rubocop-minitest", require: false + gem "rubocop-packaging", require: false + gem "rubocop-performance", require: false + gem "rubocop-rails", require: false + gem "rubocop-md", require: false +end + gemspec path: "../" diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index 9e662af..d9f3a45 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -1,16 +1,6 @@ -GIT - remote: https://github.com/basecamp/house-style.git - revision: a9ca7e4ab80b72c1a10053c50efefe8cd275e3b8 - specs: - rubocop-37signals (1.0.0) - rubocop - rubocop-minitest - rubocop-performance - rubocop-rails - GIT remote: https://github.com/rails/rails.git - revision: a1759f292c48d5ebe49edf6c7a937bfab2901023 + revision: 71e29aaa0ffecf13da37428f7cbae110cd104689 branch: 7-0-stable specs: actioncable (7.0.8) @@ -76,6 +66,7 @@ GIT mini_mime (>= 1.1.0) activesupport (7.0.8) base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) drb i18n (>= 1.6, < 2) @@ -119,13 +110,14 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) + bigdecimal (3.1.5) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) date (3.3.4) - debug (1.8.0) - irb (>= 1.5.0) - reline (>= 0.3.1) + debug (1.9.1) + irb (~> 1.10) + reline (>= 0.3.8) drb (2.2.0) ruby2_keywords erubi (1.12.0) @@ -133,11 +125,11 @@ GEM activesupport (>= 6.1) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.9.0) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) loofah (2.22.0) crass (~> 1.0.2) @@ -155,7 +147,7 @@ GEM ruby2_keywords (>= 0.0.5) mutex_m (0.2.0) mysql2 (0.5.5) - net-imap (0.4.5) + net-imap (0.4.9) date net-protocol net-pop (0.1.2) @@ -164,19 +156,19 @@ GEM timeout net-smtp (0.4.0) net-protocol - nio4r (2.5.9) - nokogiri (1.15.4-arm64-darwin) + nio4r (2.7.0) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.0-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc pg (1.5.4) - psych (5.1.1.1) + psych (5.1.2) stringio racc (1.7.3) rack (2.2.8) @@ -191,13 +183,13 @@ GEM nokogiri (~> 1.14) rainbow (3.1.1) rake (13.1.0) - rdoc (6.6.0) + rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.8.2) - reline (0.4.0) + regexp_parser (2.8.3) + reline (0.4.1) io-console (~> 0.5) rexml (3.2.6) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -205,20 +197,26 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-minitest (0.33.0) + rubocop-md (1.2.2) + rubocop (>= 1.0) + rubocop-minitest (0.34.3) rubocop (>= 1.39, < 2.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.1) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) sprockets (4.2.1) @@ -228,10 +226,10 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.8-arm64-darwin) - sqlite3 (1.6.8-x86_64-darwin) - sqlite3 (1.6.8-x86_64-linux) - stringio (3.0.9) + sqlite3 (1.7.0-arm64-darwin) + sqlite3 (1.7.0-x86_64-darwin) + sqlite3 (1.7.0-x86_64-linux) + stringio (3.1.0) thor (1.3.0) timeout (0.4.1) tzinfo (2.0.6) @@ -256,7 +254,12 @@ DEPENDENCIES mysql2 pg rails! - rubocop-37signals! + rubocop (>= 1.25.1) + rubocop-md + rubocop-minitest + rubocop-packaging + rubocop-performance + rubocop-rails solid_cache! sprockets-rails sqlite3 diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index cb238c5..b174888 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -6,8 +6,16 @@ gem "sqlite3" gem "mysql2" gem "pg" gem "sprockets-rails" -gem "rubocop-37signals", require: false, git: "https://github.com/basecamp/house-style.git" gem "appraisal" gem "rails", branch: "7-1-stable", git: "https://github.com/rails/rails.git" +group :rubocop do + gem "rubocop", ">= 1.25.1", require: false + gem "rubocop-minitest", require: false + gem "rubocop-packaging", require: false + gem "rubocop-performance", require: false + gem "rubocop-rails", require: false + gem "rubocop-md", require: false +end + gemspec path: "../" diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock index 1969c3e..14b5739 100644 --- a/gemfiles/rails_7_1.gemfile.lock +++ b/gemfiles/rails_7_1.gemfile.lock @@ -1,16 +1,6 @@ -GIT - remote: https://github.com/basecamp/house-style.git - revision: a9ca7e4ab80b72c1a10053c50efefe8cd275e3b8 - specs: - rubocop-37signals (1.0.0) - rubocop - rubocop-minitest - rubocop-performance - rubocop-rails - GIT remote: https://github.com/rails/rails.git - revision: 71e0c050b81498adb1fec2a18056038ca14990ca + revision: 9a2bfebbc8e4800de58c26a5a119c3acad068664 branch: 7-1-stable specs: actioncable (7.1.2) @@ -125,15 +115,15 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.4) + bigdecimal (3.1.5) builder (3.2.4) concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) date (3.3.4) - debug (1.8.0) - irb (>= 1.5.0) - reline (>= 0.3.1) + debug (1.9.1) + irb (~> 1.10) + reline (>= 0.3.8) drb (2.2.0) ruby2_keywords erubi (1.12.0) @@ -141,11 +131,11 @@ GEM activesupport (>= 6.1) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.9.0) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) loofah (2.22.0) crass (~> 1.0.2) @@ -162,7 +152,7 @@ GEM ruby2_keywords (>= 0.0.5) mutex_m (0.2.0) mysql2 (0.5.5) - net-imap (0.4.5) + net-imap (0.4.9) date net-protocol net-pop (0.1.2) @@ -171,19 +161,19 @@ GEM timeout net-smtp (0.4.0) net-protocol - nio4r (2.5.9) - nokogiri (1.15.4-arm64-darwin) + nio4r (2.7.0) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.0-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc pg (1.5.4) - psych (5.1.1.1) + psych (5.1.2) stringio racc (1.7.3) rack (3.0.8) @@ -203,13 +193,13 @@ GEM nokogiri (~> 1.14) rainbow (3.1.1) rake (13.1.0) - rdoc (6.6.0) + rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.8.2) - reline (0.4.0) + regexp_parser (2.8.3) + reline (0.4.1) io-console (~> 0.5) rexml (3.2.6) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -217,20 +207,26 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-minitest (0.33.0) + rubocop-md (1.2.2) + rubocop (>= 1.0) + rubocop-minitest (0.34.3) rubocop (>= 1.39, < 2.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.1) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) sprockets (4.2.1) @@ -240,10 +236,10 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.8-arm64-darwin) - sqlite3 (1.6.8-x86_64-darwin) - sqlite3 (1.6.8-x86_64-linux) - stringio (3.0.9) + sqlite3 (1.7.0-arm64-darwin) + sqlite3 (1.7.0-x86_64-darwin) + sqlite3 (1.7.0-x86_64-linux) + stringio (3.1.0) thor (1.3.0) timeout (0.4.1) tzinfo (2.0.6) @@ -269,7 +265,12 @@ DEPENDENCIES mysql2 pg rails! - rubocop-37signals! + rubocop (>= 1.25.1) + rubocop-md + rubocop-minitest + rubocop-packaging + rubocop-performance + rubocop-rails solid_cache! sprockets-rails sqlite3 diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile index 240793d..1e2e5f8 100644 --- a/gemfiles/rails_main.gemfile +++ b/gemfiles/rails_main.gemfile @@ -6,8 +6,16 @@ gem "sqlite3" gem "mysql2" gem "pg" gem "sprockets-rails" -gem "rubocop-37signals", require: false, git: "https://github.com/basecamp/house-style.git" gem "appraisal" gem "rails", branch: "main", git: "https://github.com/rails/rails.git" +group :rubocop do + gem "rubocop", ">= 1.25.1", require: false + gem "rubocop-minitest", require: false + gem "rubocop-packaging", require: false + gem "rubocop-performance", require: false + gem "rubocop-rails", require: false + gem "rubocop-md", require: false +end + gemspec path: "../" diff --git a/gemfiles/rails_main.gemfile.lock b/gemfiles/rails_main.gemfile.lock index 4ffee19..7ca92d2 100644 --- a/gemfiles/rails_main.gemfile.lock +++ b/gemfiles/rails_main.gemfile.lock @@ -1,16 +1,6 @@ -GIT - remote: https://github.com/basecamp/house-style.git - revision: a9ca7e4ab80b72c1a10053c50efefe8cd275e3b8 - specs: - rubocop-37signals (1.0.0) - rubocop - rubocop-minitest - rubocop-performance - rubocop-rails - GIT remote: https://github.com/rails/rails.git - revision: f98bb7ed41d513539cd6a1af1f21d96ae4f3cd17 + revision: 1c3ae8719f2a127e1003916291e94305367a7dab branch: main specs: actioncable (7.2.0.alpha) @@ -49,6 +39,7 @@ GIT rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) actiontext (7.2.0.alpha) actionpack (= 7.2.0.alpha) activerecord (= 7.2.0.alpha) @@ -124,15 +115,15 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.4) + bigdecimal (3.1.5) builder (3.2.4) concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) date (3.3.4) - debug (1.8.0) - irb (>= 1.5.0) - reline (>= 0.3.1) + debug (1.9.1) + irb (~> 1.10) + reline (>= 0.3.8) drb (2.2.0) ruby2_keywords erubi (1.12.0) @@ -140,11 +131,11 @@ GEM activesupport (>= 6.1) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.9.0) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) loofah (2.22.0) crass (~> 1.0.2) @@ -160,7 +151,7 @@ GEM mocha (2.1.0) ruby2_keywords (>= 0.0.5) mysql2 (0.5.5) - net-imap (0.4.5) + net-imap (0.4.9) date net-protocol net-pop (0.1.2) @@ -169,19 +160,19 @@ GEM timeout net-smtp (0.4.0) net-protocol - nio4r (2.5.9) - nokogiri (1.15.4-arm64-darwin) + nio4r (2.7.0) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.0-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc pg (1.5.4) - psych (5.1.1.1) + psych (5.1.2) stringio racc (1.7.3) rack (3.0.8) @@ -201,13 +192,13 @@ GEM nokogiri (~> 1.14) rainbow (3.1.1) rake (13.1.0) - rdoc (6.6.0) + rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.8.2) - reline (0.4.0) + regexp_parser (2.8.3) + reline (0.4.1) io-console (~> 0.5) rexml (3.2.6) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -215,20 +206,26 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-minitest (0.33.0) + rubocop-md (1.2.2) + rubocop (>= 1.0) + rubocop-minitest (0.34.3) rubocop (>= 1.39, < 2.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.1) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-packaging (0.5.2) + rubocop (>= 1.33, < 2.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) sprockets (4.2.1) @@ -238,15 +235,16 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.8-arm64-darwin) - sqlite3 (1.6.8-x86_64-darwin) - sqlite3 (1.6.8-x86_64-linux) - stringio (3.0.9) + sqlite3 (1.7.0-arm64-darwin) + sqlite3 (1.7.0-x86_64-darwin) + sqlite3 (1.7.0-x86_64-linux) + stringio (3.1.0) thor (1.3.0) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) + useragent (0.16.10) webrick (1.8.1) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -267,7 +265,12 @@ DEPENDENCIES mysql2 pg rails! - rubocop-37signals! + rubocop (>= 1.25.1) + rubocop-md + rubocop-minitest + rubocop-packaging + rubocop-performance + rubocop-rails solid_cache! sprockets-rails sqlite3