From 8dd4c1bfbccf51b5a84ebb6545fee054e989cd29 Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Tue, 26 Mar 2019 05:48:33 +0100 Subject: [PATCH 1/8] Run tests against rails 6.0.0.beta3 --- Appraisals | 2 +- gemfiles/rails_6.0.x.gemfile | 2 +- gemfiles/rails_6.0.x.gemfile.lock | 100 +++++++++++++++--------------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Appraisals b/Appraisals index 6be5bf1..e6e6fef 100644 --- a/Appraisals +++ b/Appraisals @@ -11,5 +11,5 @@ appraise "rails-5.2.x" do end appraise "rails-6.0.x" do - gem "rails", "~> 6.0.0.beta1" + gem "rails", "~> 6.0.0.beta3" end diff --git a/gemfiles/rails_6.0.x.gemfile b/gemfiles/rails_6.0.x.gemfile index ab76d31..9a51d88 100644 --- a/gemfiles/rails_6.0.x.gemfile +++ b/gemfiles/rails_6.0.x.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 6.0.0.beta1" +gem "rails", "~> 6.0.0.beta3" gem "rake", ">= 11.1" gem "rubocop", require: false gem "webpacker" diff --git a/gemfiles/rails_6.0.x.gemfile.lock b/gemfiles/rails_6.0.x.gemfile.lock index 8925855..a1ebd49 100644 --- a/gemfiles/rails_6.0.x.gemfile.lock +++ b/gemfiles/rails_6.0.x.gemfile.lock @@ -10,55 +10,55 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.0.beta1) - actionpack (= 6.0.0.beta1) + actioncable (6.0.0.beta3) + actionpack (= 6.0.0.beta3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.0.beta1) - actionpack (= 6.0.0.beta1) - activejob (= 6.0.0.beta1) - activerecord (= 6.0.0.beta1) - activestorage (= 6.0.0.beta1) - activesupport (= 6.0.0.beta1) + actionmailbox (6.0.0.beta3) + actionpack (= 6.0.0.beta3) + activejob (= 6.0.0.beta3) + activerecord (= 6.0.0.beta3) + activestorage (= 6.0.0.beta3) + activesupport (= 6.0.0.beta3) mail (>= 2.7.1) - actionmailer (6.0.0.beta1) - actionpack (= 6.0.0.beta1) - actionview (= 6.0.0.beta1) - activejob (= 6.0.0.beta1) + actionmailer (6.0.0.beta3) + actionpack (= 6.0.0.beta3) + actionview (= 6.0.0.beta3) + activejob (= 6.0.0.beta3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.0.beta1) - actionview (= 6.0.0.beta1) - activesupport (= 6.0.0.beta1) + actionpack (6.0.0.beta3) + actionview (= 6.0.0.beta3) + activesupport (= 6.0.0.beta3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actiontext (6.0.0.beta1) - actionpack (= 6.0.0.beta1) - activerecord (= 6.0.0.beta1) - activestorage (= 6.0.0.beta1) - activesupport (= 6.0.0.beta1) + actiontext (6.0.0.beta3) + actionpack (= 6.0.0.beta3) + activerecord (= 6.0.0.beta3) + activestorage (= 6.0.0.beta3) + activesupport (= 6.0.0.beta3) nokogiri (>= 1.8.5) - actionview (6.0.0.beta1) - activesupport (= 6.0.0.beta1) + actionview (6.0.0.beta3) + activesupport (= 6.0.0.beta3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (6.0.0.beta1) - activesupport (= 6.0.0.beta1) + activejob (6.0.0.beta3) + activesupport (= 6.0.0.beta3) globalid (>= 0.3.6) - activemodel (6.0.0.beta1) - activesupport (= 6.0.0.beta1) - activerecord (6.0.0.beta1) - activemodel (= 6.0.0.beta1) - activesupport (= 6.0.0.beta1) - activestorage (6.0.0.beta1) - actionpack (= 6.0.0.beta1) - activerecord (= 6.0.0.beta1) + activemodel (6.0.0.beta3) + activesupport (= 6.0.0.beta3) + activerecord (6.0.0.beta3) + activemodel (= 6.0.0.beta3) + activesupport (= 6.0.0.beta3) + activestorage (6.0.0.beta3) + actionpack (= 6.0.0.beta3) + activerecord (= 6.0.0.beta3) marcel (~> 0.3.1) - activesupport (6.0.0.beta1) + activesupport (6.0.0.beta3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -148,29 +148,29 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.0.beta1) - actioncable (= 6.0.0.beta1) - actionmailbox (= 6.0.0.beta1) - actionmailer (= 6.0.0.beta1) - actionpack (= 6.0.0.beta1) - actiontext (= 6.0.0.beta1) - actionview (= 6.0.0.beta1) - activejob (= 6.0.0.beta1) - activemodel (= 6.0.0.beta1) - activerecord (= 6.0.0.beta1) - activestorage (= 6.0.0.beta1) - activesupport (= 6.0.0.beta1) + rails (6.0.0.beta3) + actioncable (= 6.0.0.beta3) + actionmailbox (= 6.0.0.beta3) + actionmailer (= 6.0.0.beta3) + actionpack (= 6.0.0.beta3) + actiontext (= 6.0.0.beta3) + actionview (= 6.0.0.beta3) + activejob (= 6.0.0.beta3) + activemodel (= 6.0.0.beta3) + activerecord (= 6.0.0.beta3) + activestorage (= 6.0.0.beta3) + activesupport (= 6.0.0.beta3) bundler (>= 1.3.0) - railties (= 6.0.0.beta1) + railties (= 6.0.0.beta3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (6.0.0.beta1) - actionpack (= 6.0.0.beta1) - activesupport (= 6.0.0.beta1) + railties (6.0.0.beta3) + actionpack (= 6.0.0.beta3) + activesupport (= 6.0.0.beta3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -234,7 +234,7 @@ DEPENDENCIES coveralls cucumber komponent! - rails (~> 6.0.0.beta1) + rails (~> 6.0.0.beta3) rake (>= 11.1) rubocop simplecov From 76be64730541970dd7d74e60c949af9b0c1f5496 Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Tue, 26 Mar 2019 05:52:55 +0100 Subject: [PATCH 2/8] Travis config: add rails 6 gemfile --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 32a67d4..93864ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ gemfile: - gemfiles/rails_5.0.x.gemfile - gemfiles/rails_5.1.x.gemfile - gemfiles/rails_5.2.x.gemfile + - gemfiles/rails_6.0.x.gemfile cache: bundler: true From 0e64567db00a17197c2f24de9ba93912e92c2989 Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Tue, 26 Mar 2019 06:09:09 +0100 Subject: [PATCH 3/8] Use bundle 2.0 for Rails 6 gemfile --- gemfiles/rails_6.0.x.gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/rails_6.0.x.gemfile.lock b/gemfiles/rails_6.0.x.gemfile.lock index a1ebd49..aafb0ff 100644 --- a/gemfiles/rails_6.0.x.gemfile.lock +++ b/gemfiles/rails_6.0.x.gemfile.lock @@ -230,7 +230,7 @@ PLATFORMS DEPENDENCIES appraisal aruba - bundler (~> 1.15) + bundler (~> 2.0) coveralls cucumber komponent! From 9b7cbcb77f169490a0d774cc0b7ddce6384c34e4 Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Tue, 26 Mar 2019 06:37:36 +0100 Subject: [PATCH 4/8] Travis: force installing bundler 2.0.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93864ff..0f70c15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ cache: yarn: true install: - - gem install bundler + - gem install bundler -v 2.0.1 - bundle install - nvm install node - node -v From fc2276e04caffdd53c96e5d15ccbaf1c67f2eab6 Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Tue, 26 Mar 2019 06:56:33 +0100 Subject: [PATCH 5/8] Travis: move bundler install to before_install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f70c15..97b3721 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ sudo: false before_install: - gem update --system + - gem install bundler rvm: - 2.3 @@ -21,7 +22,6 @@ cache: yarn: true install: - - gem install bundler -v 2.0.1 - bundle install - nvm install node - node -v From b211f48825c8d16ab16a335b510cc05d8c395a10 Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Tue, 26 Mar 2019 07:04:50 +0100 Subject: [PATCH 6/8] Update rails 6 gemfile.lock --- gemfiles/rails_6.0.x.gemfile.lock | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gemfiles/rails_6.0.x.gemfile.lock b/gemfiles/rails_6.0.x.gemfile.lock index aafb0ff..3d76f31 100644 --- a/gemfiles/rails_6.0.x.gemfile.lock +++ b/gemfiles/rails_6.0.x.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - komponent (2.2.0) + komponent (3.0.0.beta1) actionview (>= 5.0) activesupport (>= 5.0) railties (>= 5.0) @@ -63,6 +63,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 1.3, >= 1.3.1) appraisal (2.2.0) bundler rake @@ -78,7 +79,7 @@ GEM backports (3.11.4) builder (3.2.3) childprocess (1.0.0) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) contracts (0.16.0) coveralls (0.7.1) multi_json (~> 1.3) @@ -114,7 +115,7 @@ GEM activesupport (>= 4.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.5.3) + i18n (1.6.0) concurrent-ruby (~> 1.0) jaro_winkler (1.5.2) json (2.1.0) @@ -223,6 +224,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + zeitwerk (1.4.2) PLATFORMS ruby @@ -230,7 +232,7 @@ PLATFORMS DEPENDENCIES appraisal aruba - bundler (~> 2.0) + bundler (~> 2.0.1) coveralls cucumber komponent! @@ -241,4 +243,4 @@ DEPENDENCIES webpacker BUNDLED WITH - 1.16.4 + 2.0.1 From f625296eb3080b946c39a2fed4a5dd1b352bffb2 Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Tue, 26 Mar 2019 07:24:11 +0100 Subject: [PATCH 7/8] Drop support for Ruby 2.3 --- .travis.yml | 1 - CHANGELOG.md | 3 +++ README.md | 2 +- komponent.gemspec | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97b3721..fabd211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ before_install: - gem install bundler rvm: - - 2.3 - 2.4 - 2.5 - ruby-head diff --git a/CHANGELOG.md b/CHANGELOG.md index f6bd15b..4ed3574 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Upcoming release +**Breaking changes:** +- Dropped support for Rails 4.3 + ## v3.0.0.beta1 (2019-02-28) **Breaking changes:** diff --git a/README.md b/README.md index 0271f6e..1402bee 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ This gem has been inspired by our Rails development practices at [Ouvrages](http ## Compatibility -- Ruby 2.3+ +- Ruby 2.4+ - Rails 5.0+ - Webpacker 3.0.0+ diff --git a/komponent.gemspec b/komponent.gemspec index 42f60c2..8af086e 100644 --- a/komponent.gemspec +++ b/komponent.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| end spec.require_paths = ["lib"] - spec.required_ruby_version = '>= 2.3.0' + spec.required_ruby_version = '>= 2.4.0' spec.add_dependency "actionview", ">= 5.0" spec.add_dependency "activesupport", ">= 5.0" From d602880659f4f72b022185603f4c4184807bacfc Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Tue, 26 Mar 2019 07:40:13 +0100 Subject: [PATCH 8/8] Drop support for Ruby 2.4 --- .rubocop.yml | 2 +- .travis.yml | 2 +- CHANGELOG.md | 2 +- README.md | 2 +- komponent.gemspec | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 256f2ca..1db1119 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.2 + TargetRubyVersion: 2.5 DisabledByDefault: true Exclude: - node_modules/**/* diff --git a/.travis.yml b/.travis.yml index fabd211..5dc0bbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ before_install: - gem install bundler rvm: - - 2.4 - 2.5 + - 2.6 - ruby-head gemfile: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ed3574..f041f09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Upcoming release **Breaking changes:** -- Dropped support for Rails 4.3 +- Dropped support for Ruby 2.3 and 2.4 ## v3.0.0.beta1 (2019-02-28) diff --git a/README.md b/README.md index 1402bee..4f140f5 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ This gem has been inspired by our Rails development practices at [Ouvrages](http ## Compatibility -- Ruby 2.4+ +- Ruby 2.5+ - Rails 5.0+ - Webpacker 3.0.0+ diff --git a/komponent.gemspec b/komponent.gemspec index 8af086e..b517fa8 100644 --- a/komponent.gemspec +++ b/komponent.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| end spec.require_paths = ["lib"] - spec.required_ruby_version = '>= 2.4.0' + spec.required_ruby_version = '>= 2.5.0' spec.add_dependency "actionview", ">= 5.0" spec.add_dependency "activesupport", ">= 5.0"