From 96bed9b8f40f0b452bf54f16e9ee54557d981cf3 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Wed, 13 Jul 2022 12:59:30 -0300 Subject: [PATCH 01/13] net-smtp is no longer part of Ruby default gems see https://github.com/mikel/mail/pull/1439 --- rails-letsencrypt.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/rails-letsencrypt.gemspec b/rails-letsencrypt.gemspec index dbc244c..87afb03 100644 --- a/rails-letsencrypt.gemspec +++ b/rails-letsencrypt.gemspec @@ -22,6 +22,7 @@ Gem::Specification.new do |s| s.add_dependency "rails", ">= 5.0" s.add_dependency "acme-client", "~> 2.0.0" s.add_dependency "redis" + s.add_dependency "net-smtp" s.add_development_dependency "appraisal" s.add_development_dependency "rspec-rails" From 01ee338d1d8c786472e62c3c6d8cf3facb439c24 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Wed, 13 Jul 2022 13:00:51 -0300 Subject: [PATCH 02/13] do not depend on entire rails, only depend on required gems. no tests for rails v7 yet. removed unused actioncable references in test --- gemfiles/rails_5.gemfile | 9 ++++++++- gemfiles/rails_6.gemfile | 8 +++++++- rails-letsencrypt.gemspec | 8 +++++++- spec/dummy/app/channels/application_cable/channel.rb | 4 ---- .../app/channels/application_cable/connection.rb | 4 ---- spec/dummy/config/cable.yml | 10 ---------- spec/dummy/config/environments/test.rb | 3 --- spec/dummy/config/initializers/assets.rb | 12 ------------ 8 files changed, 22 insertions(+), 36 deletions(-) delete mode 100644 spec/dummy/app/channels/application_cable/channel.rb delete mode 100644 spec/dummy/app/channels/application_cable/connection.rb delete mode 100644 spec/dummy/config/cable.yml delete mode 100644 spec/dummy/config/initializers/assets.rb diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index f002548..4cafcaf 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -3,6 +3,13 @@ source "https://rubygems.org" gem "sqlite3" -gem "rails", "~> 5.1" +gem "railties", "~> 5.1" +gem "actionmailer", "~> 5.1" +gem "actionpack", "~> 5.1" +gem "actionview", "~> 5.1" +gem "activemodel", "~> 5.1" +gem "activerecord", "~> 5.1" +gem "activesupport", "~> 5.1" + gemspec path: "../" diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 4043203..09e4545 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -3,6 +3,12 @@ source "https://rubygems.org" gem "sqlite3" -gem "rails", "~> 6.0" +gem "railties", "~> 6.1" +gem "actionmailer", "~> 6.1" +gem "actionpack", "~> 6.1" +gem "actionview", "~> 6.1" +gem "activemodel", "~> 6.1" +gem "activerecord", "~> 6.1" +gem "activesupport", "~> 6.1" gemspec path: "../" diff --git a/rails-letsencrypt.gemspec b/rails-letsencrypt.gemspec index 87afb03..475475f 100644 --- a/rails-letsencrypt.gemspec +++ b/rails-letsencrypt.gemspec @@ -19,7 +19,13 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] s.require_paths = ["lib"] - s.add_dependency "rails", ">= 5.0" + s.add_dependency "railties", ">= 5.0", "< 7" + s.add_dependency "actionmailer", ">= 5.0", "< 7" + s.add_dependency "actionpack", ">= 5.0", "< 7" + s.add_dependency "actionview", ">= 5.0", "< 7" + s.add_dependency "activemodel", ">= 5.0", "< 7" + s.add_dependency "activerecord", ">= 5.0", "< 7" + s.add_dependency "activesupport", ">= 5.0", "< 7" s.add_dependency "acme-client", "~> 2.0.0" s.add_dependency "redis" s.add_dependency "net-smtp" diff --git a/spec/dummy/app/channels/application_cable/channel.rb b/spec/dummy/app/channels/application_cable/channel.rb deleted file mode 100644 index d672697..0000000 --- a/spec/dummy/app/channels/application_cable/channel.rb +++ /dev/null @@ -1,4 +0,0 @@ -module ApplicationCable - class Channel < ActionCable::Channel::Base - end -end diff --git a/spec/dummy/app/channels/application_cable/connection.rb b/spec/dummy/app/channels/application_cable/connection.rb deleted file mode 100644 index 0ff5442..0000000 --- a/spec/dummy/app/channels/application_cable/connection.rb +++ /dev/null @@ -1,4 +0,0 @@ -module ApplicationCable - class Connection < ActionCable::Connection::Base - end -end diff --git a/spec/dummy/config/cable.yml b/spec/dummy/config/cable.yml deleted file mode 100644 index 98367f8..0000000 --- a/spec/dummy/config/cable.yml +++ /dev/null @@ -1,10 +0,0 @@ -development: - adapter: async - -test: - adapter: test - -production: - adapter: redis - url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> - channel_prefix: dummy_production diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb index 1d62e91..7436c58 100644 --- a/spec/dummy/config/environments/test.rb +++ b/spec/dummy/config/environments/test.rb @@ -30,9 +30,6 @@ # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false - # Store uploaded files on the local file system in a temporary directory. - config.active_storage.service = :test - config.action_mailer.perform_caching = false # Tell Action Mailer not to deliver emails to the real world. diff --git a/spec/dummy/config/initializers/assets.rb b/spec/dummy/config/initializers/assets.rb deleted file mode 100644 index fe48fc3..0000000 --- a/spec/dummy/config/initializers/assets.rb +++ /dev/null @@ -1,12 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' - -# Add additional assets to the asset load path. -# Rails.application.config.assets.paths << Emoji.images_path - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in the app/assets -# folder are already added. -# Rails.application.config.assets.precompile += %w( admin.js admin.css ) From a4bdb2d320b04e00ba305ff3b4852ff477773022 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Wed, 13 Jul 2022 17:30:24 -0300 Subject: [PATCH 03/13] only depend on net-smtp when ruby > 3 --- rails-letsencrypt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rails-letsencrypt.gemspec b/rails-letsencrypt.gemspec index 475475f..f747e36 100644 --- a/rails-letsencrypt.gemspec +++ b/rails-letsencrypt.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_dependency "activesupport", ">= 5.0", "< 7" s.add_dependency "acme-client", "~> 2.0.0" s.add_dependency "redis" - s.add_dependency "net-smtp" + s.add_dependency "net-smtp" if RUBY_VERSION >= '3' s.add_development_dependency "appraisal" s.add_development_dependency "rspec-rails" From 1946c740aaf4995a30f2ae25e248f68122a2bcc2 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 14 Jul 2022 07:50:57 -0300 Subject: [PATCH 04/13] update travis gemfiles --- gemfiles/rails_5.gemfile.lock | 184 +++++++++++++----------------- gemfiles/rails_6.gemfile.lock | 209 ++++++++++++++-------------------- 2 files changed, 163 insertions(+), 230 deletions(-) diff --git a/gemfiles/rails_5.gemfile.lock b/gemfiles/rails_5.gemfile.lock index af69fff..7146717 100644 --- a/gemfiles/rails_5.gemfile.lock +++ b/gemfiles/rails_5.gemfile.lock @@ -3,56 +3,56 @@ PATH specs: rails-letsencrypt (0.10.1) acme-client (~> 2.0.0) - rails (>= 5.0) + actionmailer (>= 5.0, < 7) + actionpack (>= 5.0, < 7) + actionview (>= 5.0, < 7) + activemodel (>= 5.0, < 7) + activerecord (>= 5.0, < 7) + activesupport (>= 5.0, < 7) + net-smtp + railties (>= 5.0, < 7) redis GEM remote: https://rubygems.org/ specs: - acme-client (2.0.8) - faraday (>= 0.17, < 2.0.0) - actioncable (5.2.6) - actionpack (= 5.2.6) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailer (5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) + acme-client (2.0.11) + faraday (>= 1.0, < 3.0.0) + faraday-retry (~> 1.0) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.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.6) - activesupport (= 5.2.6) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.6) - activesupport (= 5.2.6) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.2.6) - activesupport (= 5.2.6) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.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.6) - actionpack (= 5.2.6) - activerecord (= 5.2.6) - marcel (~> 1.0.0) - activesupport (5.2.6) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - appraisal (2.4.0) + appraisal (2.4.1) bundler rake thor (>= 0.14.0) @@ -60,7 +60,7 @@ GEM builder (3.2.4) codeclimate-test-reporter (1.0.7) simplecov - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -68,85 +68,64 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - diff-lcs (1.4.4) + diff-lcs (1.5.0) + digest (3.1.0) docile (1.4.0) erubi (1.10.0) - faraday (1.5.1) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday (2.3.0) + faraday-net_http (~> 2.0) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.8.10) + faraday-net_http (2.0.3) + faraday-retry (1.0.3) + globalid (1.0.0) + activesupport (>= 5.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - json (2.5.1) - loofah (2.10.0) + json (2.6.2) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) method_source (1.0.0) - mini_mime (1.1.0) - mini_portile2 (2.5.3) - minitest (5.14.4) - multipart-post (2.1.1) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + mini_mime (1.1.2) + mini_portile2 (2.8.0) + minitest (5.16.2) + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + nokogiri (1.13.7) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - racc (1.5.2) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.6) - actioncable (= 5.2.6) - actionmailer (= 5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - activemodel (= 5.2.6) - activerecord (= 5.2.6) - activestorage (= 5.2.6) - activesupport (= 5.2.6) - bundler (>= 1.3.0) - railties (= 5.2.6) - sprockets-rails (>= 2.0.0) + racc (1.6.0) + rack (2.2.4) + rack-test (2.0.2) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rake (13.0.6) - redis (4.3.1) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + redis (4.7.1) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.1) + rspec-support (~> 3.11.0) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -154,43 +133,40 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) + rspec-support (3.11.0) ruby2_keywords (0.0.5) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (4.0.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.4.2) + sqlite3 (1.4.4) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (1.1.0) + thor (1.2.1) thread_safe (0.3.6) - tins (1.29.1) + timeout (0.3.0) + tins (1.31.1) sync tzinfo (1.2.9) thread_safe (~> 0.1) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) PLATFORMS ruby DEPENDENCIES + actionmailer (~> 5.1) + actionpack (~> 5.1) + actionview (~> 5.1) + activemodel (~> 5.1) + activerecord (~> 5.1) + activesupport (~> 5.1) appraisal codeclimate-test-reporter coveralls (~> 0.8.23) - rails (~> 5.1) rails-letsencrypt! + railties (~> 5.1) rspec-rails simplecov (~> 0.16.1) sqlite3 diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock index 5b143d7..b0e5e09 100644 --- a/gemfiles/rails_6.gemfile.lock +++ b/gemfiles/rails_6.gemfile.lock @@ -3,81 +3,64 @@ PATH specs: rails-letsencrypt (0.10.1) acme-client (~> 2.0.0) - rails (>= 5.0) + actionmailer (>= 5.0, < 7) + actionpack (>= 5.0, < 7) + actionview (>= 5.0, < 7) + activemodel (>= 5.0, < 7) + activerecord (>= 5.0, < 7) + activesupport (>= 5.0, < 7) + net-smtp + railties (>= 5.0, < 7) redis GEM remote: https://rubygems.org/ specs: - acme-client (2.0.8) - faraday (>= 0.17, < 2.0.0) - actioncable (6.1.4) - actionpack (= 6.1.4) - activesupport (= 6.1.4) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.1.4) - actionpack (= 6.1.4) - activejob (= 6.1.4) - activerecord (= 6.1.4) - activestorage (= 6.1.4) - activesupport (= 6.1.4) - mail (>= 2.7.1) - actionmailer (6.1.4) - actionpack (= 6.1.4) - actionview (= 6.1.4) - activejob (= 6.1.4) - activesupport (= 6.1.4) + acme-client (2.0.11) + faraday (>= 1.0, < 3.0.0) + faraday-retry (~> 1.0) + actionmailer (6.1.6.1) + actionpack (= 6.1.6.1) + actionview (= 6.1.6.1) + activejob (= 6.1.6.1) + activesupport (= 6.1.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4) - actionview (= 6.1.4) - activesupport (= 6.1.4) + actionpack (6.1.6.1) + actionview (= 6.1.6.1) + activesupport (= 6.1.6.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.1.4) - actionpack (= 6.1.4) - activerecord (= 6.1.4) - activestorage (= 6.1.4) - activesupport (= 6.1.4) - nokogiri (>= 1.8.5) - actionview (6.1.4) - activesupport (= 6.1.4) + actionview (6.1.6.1) + activesupport (= 6.1.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4) - activesupport (= 6.1.4) + activejob (6.1.6.1) + activesupport (= 6.1.6.1) globalid (>= 0.3.6) - activemodel (6.1.4) - activesupport (= 6.1.4) - activerecord (6.1.4) - activemodel (= 6.1.4) - activesupport (= 6.1.4) - activestorage (6.1.4) - actionpack (= 6.1.4) - activejob (= 6.1.4) - activerecord (= 6.1.4) - activesupport (= 6.1.4) - marcel (~> 1.0.0) - mini_mime (>= 1.1.0) - activesupport (6.1.4) + activemodel (6.1.6.1) + activesupport (= 6.1.6.1) + activerecord (6.1.6.1) + activemodel (= 6.1.6.1) + activesupport (= 6.1.6.1) + activesupport (6.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - appraisal (2.4.0) + appraisal (2.4.1) bundler rake thor (>= 0.14.0) builder (3.2.4) codeclimate-test-reporter (1.0.7) simplecov - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -85,87 +68,64 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - diff-lcs (1.4.4) + diff-lcs (1.5.0) + digest (3.1.0) docile (1.4.0) erubi (1.10.0) - faraday (1.5.1) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday (2.3.0) + faraday-net_http (~> 2.0) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.8.10) + faraday-net_http (2.0.3) + faraday-retry (1.0.3) + globalid (1.0.0) + activesupport (>= 5.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - json (2.5.1) - loofah (2.10.0) + json (2.6.2) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) method_source (1.0.0) - mini_mime (1.1.0) - mini_portile2 (2.5.3) - minitest (5.14.4) - multipart-post (2.1.1) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + mini_mime (1.1.2) + mini_portile2 (2.8.0) + minitest (5.16.2) + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + nokogiri (1.13.7) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - racc (1.5.2) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.1.4) - actioncable (= 6.1.4) - actionmailbox (= 6.1.4) - actionmailer (= 6.1.4) - actionpack (= 6.1.4) - actiontext (= 6.1.4) - actionview (= 6.1.4) - activejob (= 6.1.4) - activemodel (= 6.1.4) - activerecord (= 6.1.4) - activestorage (= 6.1.4) - activesupport (= 6.1.4) - bundler (>= 1.15.0) - railties (= 6.1.4) - sprockets-rails (>= 2.0.0) + racc (1.6.0) + rack (2.2.4) + rack-test (2.0.2) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (6.1.4) - actionpack (= 6.1.4) - activesupport (= 6.1.4) + railties (6.1.6.1) + actionpack (= 6.1.6.1) + activesupport (= 6.1.6.1) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) rake (13.0.6) - redis (4.3.1) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + redis (4.7.1) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.1) + rspec-support (~> 3.11.0) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -173,43 +133,40 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) + rspec-support (3.11.0) ruby2_keywords (0.0.5) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (4.0.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.4.2) + sqlite3 (1.4.4) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (1.1.0) - tins (1.29.1) + thor (1.2.1) + timeout (0.3.0) + tins (1.31.1) sync tzinfo (2.0.4) concurrent-ruby (~> 1.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - zeitwerk (2.4.2) + zeitwerk (2.6.0) PLATFORMS ruby DEPENDENCIES + actionmailer (~> 6.1) + actionpack (~> 6.1) + actionview (~> 6.1) + activemodel (~> 6.1) + activerecord (~> 6.1) + activesupport (~> 6.1) appraisal codeclimate-test-reporter coveralls (~> 0.8.23) - rails (~> 6.0) rails-letsencrypt! + railties (~> 6.1) rspec-rails simplecov (~> 0.16.1) sqlite3 From d0fc2d1fc100bcdecc4be76e977842c97ed914dc Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 14 Jul 2022 09:32:47 -0300 Subject: [PATCH 05/13] Support Rails 7 and update Appraisals --- Appraisals | 26 ++++- gemfiles/rails_5.gemfile | 15 ++- gemfiles/rails_5.gemfile.lock | 39 +++---- gemfiles/rails_6.gemfile | 14 +-- gemfiles/rails_6.gemfile.lock | 39 +++---- gemfiles/rails_7.gemfile | 14 +++ gemfiles/rails_7.gemfile.lock | 184 ++++++++++++++++++++++++++++++++++ rails-letsencrypt.gemspec | 14 +-- 8 files changed, 273 insertions(+), 72 deletions(-) create mode 100644 gemfiles/rails_7.gemfile create mode 100644 gemfiles/rails_7.gemfile.lock diff --git a/Appraisals b/Appraisals index 9722b79..8beed1a 100644 --- a/Appraisals +++ b/Appraisals @@ -1,9 +1,31 @@ # frozen_string_literal: true appraise 'rails-5' do - gem 'rails', '~> 5.1' + gem "railties", "~> 5" + gem "actionmailer", "~> 5" + gem "actionpack", "~> 5" + gem "actionview", "~> 5" + gem "activemodel", "~> 5" + gem "activerecord", "~> 5" + gem "activesupport", "~> 5" end appraise 'rails-6' do - gem 'rails', '~> 6.0' + gem "railties", "~> 6" + gem "actionmailer", "~> 6" + gem "actionpack", "~> 6" + gem "actionview", "~> 6" + gem "activemodel", "~> 6" + gem "activerecord", "~> 6" + gem "activesupport", "~> 6" end + +appraise 'rails-7' do + gem "railties", "~> 7" + gem "actionmailer", "~> 7" + gem "actionpack", "~> 7" + gem "actionview", "~> 7" + gem "activemodel", "~> 7" + gem "activerecord", "~> 7" + gem "activesupport", "~> 7" +end \ No newline at end of file diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index 4cafcaf..eb254d6 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -3,13 +3,12 @@ source "https://rubygems.org" gem "sqlite3" -gem "railties", "~> 5.1" -gem "actionmailer", "~> 5.1" -gem "actionpack", "~> 5.1" -gem "actionview", "~> 5.1" -gem "activemodel", "~> 5.1" -gem "activerecord", "~> 5.1" -gem "activesupport", "~> 5.1" - +gem "railties", "~> 5" +gem "actionmailer", "~> 5" +gem "actionpack", "~> 5" +gem "actionview", "~> 5" +gem "activemodel", "~> 5" +gem "activerecord", "~> 5" +gem "activesupport", "~> 5" gemspec path: "../" diff --git a/gemfiles/rails_5.gemfile.lock b/gemfiles/rails_5.gemfile.lock index 7146717..35f6091 100644 --- a/gemfiles/rails_5.gemfile.lock +++ b/gemfiles/rails_5.gemfile.lock @@ -3,14 +3,13 @@ PATH specs: rails-letsencrypt (0.10.1) acme-client (~> 2.0.0) - actionmailer (>= 5.0, < 7) - actionpack (>= 5.0, < 7) - actionview (>= 5.0, < 7) - activemodel (>= 5.0, < 7) - activerecord (>= 5.0, < 7) - activesupport (>= 5.0, < 7) - net-smtp - railties (>= 5.0, < 7) + actionmailer (>= 5.0) + actionpack (>= 5.0) + actionview (>= 5.0) + activemodel (>= 5.0) + activerecord (>= 5.0) + activesupport (>= 5.0) + railties (>= 5.0) redis GEM @@ -69,7 +68,6 @@ GEM tins (~> 1.6) crass (1.0.6) diff-lcs (1.5.0) - digest (3.1.0) docile (1.4.0) erubi (1.10.0) faraday (2.3.0) @@ -91,12 +89,6 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.16.2) - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest - net-protocol - timeout nokogiri (1.13.7) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -146,7 +138,6 @@ GEM tins (~> 1.0) thor (1.2.1) thread_safe (0.3.6) - timeout (0.3.0) tins (1.31.1) sync tzinfo (1.2.9) @@ -156,20 +147,20 @@ PLATFORMS ruby DEPENDENCIES - actionmailer (~> 5.1) - actionpack (~> 5.1) - actionview (~> 5.1) - activemodel (~> 5.1) - activerecord (~> 5.1) - activesupport (~> 5.1) + actionmailer (~> 5) + actionpack (~> 5) + actionview (~> 5) + activemodel (~> 5) + activerecord (~> 5) + activesupport (~> 5) appraisal codeclimate-test-reporter coveralls (~> 0.8.23) rails-letsencrypt! - railties (~> 5.1) + railties (~> 5) rspec-rails simplecov (~> 0.16.1) sqlite3 BUNDLED WITH - 1.17.3 + 2.3.4 diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 09e4545..bdaf80d 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -3,12 +3,12 @@ source "https://rubygems.org" gem "sqlite3" -gem "railties", "~> 6.1" -gem "actionmailer", "~> 6.1" -gem "actionpack", "~> 6.1" -gem "actionview", "~> 6.1" -gem "activemodel", "~> 6.1" -gem "activerecord", "~> 6.1" -gem "activesupport", "~> 6.1" +gem "railties", "~> 6" +gem "actionmailer", "~> 6" +gem "actionpack", "~> 6" +gem "actionview", "~> 6" +gem "activemodel", "~> 6" +gem "activerecord", "~> 6" +gem "activesupport", "~> 6" gemspec path: "../" diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock index b0e5e09..373d6a8 100644 --- a/gemfiles/rails_6.gemfile.lock +++ b/gemfiles/rails_6.gemfile.lock @@ -3,14 +3,13 @@ PATH specs: rails-letsencrypt (0.10.1) acme-client (~> 2.0.0) - actionmailer (>= 5.0, < 7) - actionpack (>= 5.0, < 7) - actionview (>= 5.0, < 7) - activemodel (>= 5.0, < 7) - activerecord (>= 5.0, < 7) - activesupport (>= 5.0, < 7) - net-smtp - railties (>= 5.0, < 7) + actionmailer (>= 5.0) + actionpack (>= 5.0) + actionview (>= 5.0) + activemodel (>= 5.0) + activerecord (>= 5.0) + activesupport (>= 5.0) + railties (>= 5.0) redis GEM @@ -69,7 +68,6 @@ GEM tins (~> 1.6) crass (1.0.6) diff-lcs (1.5.0) - digest (3.1.0) docile (1.4.0) erubi (1.10.0) faraday (2.3.0) @@ -91,12 +89,6 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.16.2) - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest - net-protocol - timeout nokogiri (1.13.7) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -145,7 +137,6 @@ GEM term-ansicolor (1.7.1) tins (~> 1.0) thor (1.2.1) - timeout (0.3.0) tins (1.31.1) sync tzinfo (2.0.4) @@ -156,20 +147,20 @@ PLATFORMS ruby DEPENDENCIES - actionmailer (~> 6.1) - actionpack (~> 6.1) - actionview (~> 6.1) - activemodel (~> 6.1) - activerecord (~> 6.1) - activesupport (~> 6.1) + actionmailer (~> 6) + actionpack (~> 6) + actionview (~> 6) + activemodel (~> 6) + activerecord (~> 6) + activesupport (~> 6) appraisal codeclimate-test-reporter coveralls (~> 0.8.23) rails-letsencrypt! - railties (~> 6.1) + railties (~> 6) rspec-rails simplecov (~> 0.16.1) sqlite3 BUNDLED WITH - 1.17.3 + 2.3.4 diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile new file mode 100644 index 0000000..5cd5d6a --- /dev/null +++ b/gemfiles/rails_7.gemfile @@ -0,0 +1,14 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "sqlite3" +gem "railties", "~> 7" +gem "actionmailer", "~> 7" +gem "actionpack", "~> 7" +gem "actionview", "~> 7" +gem "activemodel", "~> 7" +gem "activerecord", "~> 7" +gem "activesupport", "~> 7" + +gemspec path: "../" diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock new file mode 100644 index 0000000..beff59c --- /dev/null +++ b/gemfiles/rails_7.gemfile.lock @@ -0,0 +1,184 @@ +PATH + remote: .. + specs: + rails-letsencrypt (0.10.1) + acme-client (~> 2.0.0) + actionmailer (>= 5.0) + actionpack (>= 5.0) + actionview (>= 5.0) + activemodel (>= 5.0) + activerecord (>= 5.0) + activesupport (>= 5.0) + railties (>= 5.0) + redis + +GEM + remote: https://rubygems.org/ + specs: + acme-client (2.0.11) + faraday (>= 1.0, < 3.0.0) + faraday-retry (~> 1.0) + actionmailer (7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activesupport (= 7.0.3.1) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.3.1) + actionview (= 7.0.3.1) + activesupport (= 7.0.3.1) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (7.0.3.1) + activesupport (= 7.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.3.1) + activesupport (= 7.0.3.1) + globalid (>= 0.3.6) + activemodel (7.0.3.1) + activesupport (= 7.0.3.1) + activerecord (7.0.3.1) + activemodel (= 7.0.3.1) + activesupport (= 7.0.3.1) + activesupport (7.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + builder (3.2.4) + codeclimate-test-reporter (1.0.7) + simplecov + concurrent-ruby (1.1.10) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) + crass (1.0.6) + diff-lcs (1.5.0) + digest (3.1.0) + docile (1.4.0) + erubi (1.10.0) + faraday (2.3.0) + faraday-net_http (~> 2.0) + ruby2_keywords (>= 0.0.4) + faraday-net_http (2.0.3) + faraday-retry (1.0.3) + globalid (1.0.0) + activesupport (>= 5.0) + i18n (1.12.0) + concurrent-ruby (~> 1.0) + json (2.6.2) + loofah (2.18.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (1.0.0) + mini_mime (1.1.2) + minitest (5.16.2) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout + nokogiri (1.13.7-arm64-darwin) + racc (~> 1.4) + racc (1.6.0) + rack (2.2.4) + rack-test (2.0.2) + rack (>= 1.3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.4.3) + loofah (~> 2.3) + railties (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rake (13.0.6) + redis (4.7.1) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-rails (5.1.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.11.0) + ruby2_keywords (0.0.5) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sqlite3 (1.4.4) + strscan (3.0.3) + sync (0.5.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + thor (1.2.1) + timeout (0.3.0) + tins (1.31.1) + sync + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + zeitwerk (2.6.0) + +PLATFORMS + arm64-darwin-21 + +DEPENDENCIES + actionmailer (~> 7) + actionpack (~> 7) + actionview (~> 7) + activemodel (~> 7) + activerecord (~> 7) + activesupport (~> 7) + appraisal + codeclimate-test-reporter + coveralls (~> 0.8.23) + rails-letsencrypt! + railties (~> 7) + rspec-rails + simplecov (~> 0.16.1) + sqlite3 + +BUNDLED WITH + 2.3.4 diff --git a/rails-letsencrypt.gemspec b/rails-letsencrypt.gemspec index f747e36..abe9a95 100644 --- a/rails-letsencrypt.gemspec +++ b/rails-letsencrypt.gemspec @@ -19,13 +19,13 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] s.require_paths = ["lib"] - s.add_dependency "railties", ">= 5.0", "< 7" - s.add_dependency "actionmailer", ">= 5.0", "< 7" - s.add_dependency "actionpack", ">= 5.0", "< 7" - s.add_dependency "actionview", ">= 5.0", "< 7" - s.add_dependency "activemodel", ">= 5.0", "< 7" - s.add_dependency "activerecord", ">= 5.0", "< 7" - s.add_dependency "activesupport", ">= 5.0", "< 7" + s.add_dependency "railties", ">= 5.0" + s.add_dependency "actionmailer", ">= 5.0" + s.add_dependency "actionpack", ">= 5.0" + s.add_dependency "actionview", ">= 5.0" + s.add_dependency "activemodel", ">= 5.0" + s.add_dependency "activerecord", ">= 5.0" + s.add_dependency "activesupport", ">= 5.0" s.add_dependency "acme-client", "~> 2.0.0" s.add_dependency "redis" s.add_dependency "net-smtp" if RUBY_VERSION >= '3' From ee86ee4f5ae710271c4649a6514578ed6244dc72 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 14 Jul 2022 09:36:58 -0300 Subject: [PATCH 06/13] make travis aware of rails 7 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 823e5bb..86a9cd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ before_install: gemfile: - gemfiles/rails_5.gemfile - gemfiles/rails_6.gemfile + - gemfiles/rails_7.gemfile script: - bundle exec rspec - bundle exec codeclimate-test-reporter From 7b5eeadf1c69e4ccf61a918c2238187874ab3729 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 14 Jul 2022 09:44:07 -0300 Subject: [PATCH 07/13] update bundler --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86a9cd8..6291d1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ rvm: - 2.5.0 - 2.6.0 before_install: - - gem install bundler -v 1.17.3 + - gem install bundler -v 2.3.4 gemfile: - gemfiles/rails_5.gemfile - gemfiles/rails_6.gemfile From f9f91df4612320ec1a1691ad46442cd4e812f258 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 14 Jul 2022 09:54:45 -0300 Subject: [PATCH 08/13] lock to ruby platform --- gemfiles/rails_7.gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index beff59c..08d9272 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -162,7 +162,7 @@ GEM zeitwerk (2.6.0) PLATFORMS - arm64-darwin-21 + ruby DEPENDENCIES actionmailer (~> 7) From 2366f42ab093263074b8bd52c4b0f3e73dc1f050 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 14 Jul 2022 10:27:06 -0300 Subject: [PATCH 09/13] Ruby 2.6 and 2.7 for Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6291d1d..6282687 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: ruby cache: bundler dist: trusty rvm: - - 2.5.0 - 2.6.0 + - 2.7.0 before_install: - gem install bundler -v 2.3.4 gemfile: From 761e12b1c2b5b889d140b5dac74cdc6db52ed3f7 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 14 Jul 2022 10:39:10 -0300 Subject: [PATCH 10/13] add x86_64-linux platform --- .travis.yml | 2 +- gemfiles/rails_5.gemfile.lock | 3 ++- gemfiles/rails_6.gemfile.lock | 3 ++- gemfiles/rails_7.gemfile.lock | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6282687..d2af0d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ rvm: - 2.6.0 - 2.7.0 before_install: - - gem install bundler -v 2.3.4 + - gem install bundler -v 2.3.11 gemfile: - gemfiles/rails_5.gemfile - gemfiles/rails_6.gemfile diff --git a/gemfiles/rails_5.gemfile.lock b/gemfiles/rails_5.gemfile.lock index 35f6091..491f095 100644 --- a/gemfiles/rails_5.gemfile.lock +++ b/gemfiles/rails_5.gemfile.lock @@ -145,6 +145,7 @@ GEM PLATFORMS ruby + x86_64-linux DEPENDENCIES actionmailer (~> 5) @@ -163,4 +164,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 2.3.4 + 2.3.11 diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock index 373d6a8..46350a2 100644 --- a/gemfiles/rails_6.gemfile.lock +++ b/gemfiles/rails_6.gemfile.lock @@ -145,6 +145,7 @@ GEM PLATFORMS ruby + x86_64-linux DEPENDENCIES actionmailer (~> 6) @@ -163,4 +164,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 2.3.4 + 2.3.11 diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index 08d9272..8efc140 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -163,6 +163,7 @@ GEM PLATFORMS ruby + x86_64-linux DEPENDENCIES actionmailer (~> 7) @@ -181,4 +182,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 2.3.4 + 2.3.11 From ac032fd443a91c601d64cf1087521a549498fdc0 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 14 Jul 2022 11:00:29 -0300 Subject: [PATCH 11/13] gemfile update --- gemfiles/rails_5.gemfile.lock | 5 +++++ gemfiles/rails_6.gemfile.lock | 5 +++++ gemfiles/rails_7.gemfile.lock | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/gemfiles/rails_5.gemfile.lock b/gemfiles/rails_5.gemfile.lock index 491f095..897b6ac 100644 --- a/gemfiles/rails_5.gemfile.lock +++ b/gemfiles/rails_5.gemfile.lock @@ -92,6 +92,10 @@ GEM nokogiri (1.13.7) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.13.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.13.7-x86_64-linux) + racc (~> 1.4) racc (1.6.0) rack (2.2.4) rack-test (2.0.2) @@ -144,6 +148,7 @@ GEM thread_safe (~> 0.1) PLATFORMS + arm64-darwin-21 ruby x86_64-linux diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock index 46350a2..04f16d4 100644 --- a/gemfiles/rails_6.gemfile.lock +++ b/gemfiles/rails_6.gemfile.lock @@ -92,6 +92,10 @@ GEM nokogiri (1.13.7) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.13.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.13.7-x86_64-linux) + racc (~> 1.4) racc (1.6.0) rack (2.2.4) rack-test (2.0.2) @@ -144,6 +148,7 @@ GEM zeitwerk (2.6.0) PLATFORMS + arm64-darwin-21 ruby x86_64-linux diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index 8efc140..b04cd6d 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -90,6 +90,7 @@ GEM mini_mime (>= 0.1.1) method_source (1.0.0) mini_mime (1.1.2) + mini_portile2 (2.8.0) minitest (5.16.2) net-imap (0.2.3) digest @@ -105,8 +106,13 @@ GEM digest net-protocol timeout + nokogiri (1.13.7) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) nokogiri (1.13.7-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.7-x86_64-linux) + racc (~> 1.4) racc (1.6.0) rack (2.2.4) rack-test (2.0.2) @@ -162,6 +168,7 @@ GEM zeitwerk (2.6.0) PLATFORMS + arm64-darwin-21 ruby x86_64-linux From 7dd60332ba18b7234f85d629c8124cb786f953bd Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Mon, 6 Nov 2023 13:22:05 +0100 Subject: [PATCH 12/13] Ruby 3 testing --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d2af0d6..0f9c101 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ cache: bundler dist: trusty rvm: - 2.6.0 - - 2.7.0 + - 2.7.7 + - 3.2.2 before_install: - gem install bundler -v 2.3.11 gemfile: From 8bc66e7f9564517a1ac363bb66d6fbd660797568 Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Mon, 6 Nov 2023 13:22:14 +0100 Subject: [PATCH 13/13] do not use outdated bundler --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f9c101..9d763ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ rvm: - 2.7.7 - 3.2.2 before_install: - - gem install bundler -v 2.3.11 + - gem install bundler gemfile: - gemfiles/rails_5.gemfile - gemfiles/rails_6.gemfile