From 6eaf9c59b99f144c40ce98ebdf4a984d27cdb182 Mon Sep 17 00:00:00 2001 From: jasl Date: Sun, 26 Dec 2021 01:08:10 +0800 Subject: [PATCH] Rails 7 compatible --- .rubocop.yml | 2 +- Gemfile | 4 +- Gemfile.lock | 242 +++++++++++++++---------------- options_model.gemspec | 6 +- test/dummy/config/application.rb | 2 +- 5 files changed, 126 insertions(+), 130 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 7408c9d..c4e85ce 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,7 +3,7 @@ require: - rubocop-rails AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop # to ignore them, so only the ones explicitly set in this file are enabled. DisabledByDefault: true diff --git a/Gemfile b/Gemfile index 7fbad96..c229ccb 100644 --- a/Gemfile +++ b/Gemfile @@ -15,12 +15,12 @@ gemspec # To use a debugger # gem 'byebug', group: [:development, :test] -gem "rails", "~> 6.0" +gem "rails", "~> 7.0" # Use Puma as the app server gem "puma" # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. -gem "listen", ">= 3.0.5", "< 3.2" +gem "listen" gem "web-console", group: :development gem "rubocop" diff --git a/Gemfile.lock b/Gemfile.lock index 8d3858e..83b5ec4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,194 +2,190 @@ PATH remote: . specs: options_model (0.0.17) - activemodel (>= 5, < 7) - activesupport (>= 5, < 7) - psych (~> 3.2) + activemodel (>= 5, < 8) + activesupport (>= 5, < 8) + psych (>= 3.2) GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (7.0.0) + actionpack (= 7.0.0) + activesupport (= 7.0.0) 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 (7.0.0) + actionpack (= 7.0.0) + activejob (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) 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 (7.0.0) + actionpack (= 7.0.0) + actionview (= 7.0.0) + activejob (= 7.0.0) + activesupport (= 7.0.0) 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 (7.0.0) + actionview (= 7.0.0) + activesupport (= 7.0.0) + rack (~> 2.0, >= 2.2.0) 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 (7.0.0) + actionpack (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (7.0.0) + activesupport (= 7.0.0) 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 (7.0.0) + activesupport (= 7.0.0) 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) - marcel (~> 0.3.1) - activesupport (6.0.3.4) + activemodel (7.0.0) + activesupport (= 7.0.0) + activerecord (7.0.0) + activemodel (= 7.0.0) + activesupport (= 7.0.0) + activestorage (7.0.0) + actionpack (= 7.0.0) + activejob (= 7.0.0) + activerecord (= 7.0.0) + activesupport (= 7.0.0) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - ast (2.4.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + ast (2.4.2) bindex (0.8.1) builder (3.2.4) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.9) crass (1.0.6) - erubi (1.9.0) - ffi (1.13.1) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.8.5) + erubi (1.10.0) + ffi (1.15.4) + globalid (1.0.0) + activesupport (>= 5.0) + i18n (1.8.11) concurrent-ruby (~> 1.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.7.0) + listen (3.7.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.2) method_source (1.0.0) - mimemagic (0.3.5) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - parallel (1.19.2) - parser (2.7.2.0) + mini_mime (1.1.2) + mini_portile2 (2.6.1) + minitest (5.15.0) + nio4r (2.5.8) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) + parallel (1.21.0) + parser (3.0.3.2) ast (~> 2.4.1) - psych (3.2.0) - puma (5.0.4) + psych (4.0.3) + stringio + puma (5.5.2) nio4r (~> 2.0) + racc (1.6.0) 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) - sprockets-rails (>= 2.0.0) + rails (7.0.0) + actioncable (= 7.0.0) + actionmailbox (= 7.0.0) + actionmailer (= 7.0.0) + actionpack (= 7.0.0) + actiontext (= 7.0.0) + actionview (= 7.0.0) + activejob (= 7.0.0) + activemodel (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) + bundler (>= 1.15.0) + railties (= 7.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (7.0.0) + actionpack (= 7.0.0) + activesupport (= 7.0.0) method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.0.0) - rake (13.0.1) - rb-fsevent (0.10.4) + rake (13.0.6) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.8.2) - rexml (3.2.4) - rubocop (1.1.0) + regexp_parser (2.2.0) + rexml (3.2.5) + rubocop (1.24.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.15.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.1.0) - parser (>= 2.7.1.5) - rubocop-performance (1.8.1) - rubocop (>= 0.87.0) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.15.0) + parser (>= 3.0.1.1) + rubocop-performance (1.13.0) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.8.1) + rubocop-rails (2.13.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.87.0) - ruby-progressbar (1.10.1) - ruby_dep (1.5.0) - sprockets (4.0.2) + rubocop (>= 1.7.0, < 2.0) + ruby-progressbar (1.11.0) + stringio (3.0.1) + thor (1.1.0) + tzinfo (2.0.4) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - thor (1.0.1) - thread_safe (0.3.6) - tzinfo (1.2.7) - thread_safe (~> 0.1) - unicode-display_width (1.7.0) - web-console (4.0.4) + unicode-display_width (2.1.0) + web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.4.1) + zeitwerk (2.5.1) PLATFORMS ruby DEPENDENCIES - listen (>= 3.0.5, < 3.2) + listen options_model! puma - rails (~> 6.0) + rails (~> 7.0) rubocop rubocop-performance rubocop-rails web-console BUNDLED WITH - 2.1.4 + 2.2.32 diff --git a/options_model.gemspec b/options_model.gemspec index 0810e59..8be093b 100644 --- a/options_model.gemspec +++ b/options_model.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] - s.add_dependency "activemodel", ">= 5", "< 7" - s.add_dependency "activesupport", ">= 5", "< 7" - s.add_dependency "psych", "~> 3.2" + s.add_dependency "activemodel", ">= 5", "< 8" + s.add_dependency "activesupport", ">= 5", "< 8" + s.add_dependency "psych", ">= 3.2" end diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index 065d111..5a549fb 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -18,7 +18,7 @@ module Dummy class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.0 + config.load_defaults 7.0 # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers