From 3c74bb9b9a64b296d7529951b1962b6da02295ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 10:48:01 +0200 Subject: [PATCH 01/10] Rails 7.1 support --- view_component-form.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view_component-form.gemspec b/view_component-form.gemspec index 4ff6394..9528256 100644 --- a/view_component-form.gemspec +++ b/view_component-form.gemspec @@ -26,8 +26,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0") - spec.add_dependency "actionview", [">= 6.0.0", "< 7.1"] - spec.add_dependency "activesupport", [">= 6.0.0", "< 7.1"] + spec.add_dependency "actionview", [">= 6.0.0", "<= 7.1"] + spec.add_dependency "activesupport", [">= 6.0.0", "<= 7.1"] spec.add_dependency "view_component", [">= 2.34.0", "< 4.0"] spec.add_dependency "zeitwerk", ["~> 2.5"] end From 984e3f4e59e1b3598def75de376380965b820ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:15:05 +0200 Subject: [PATCH 02/10] Update Appraisals --- Appraisals | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Appraisals b/Appraisals index 41bd330..a6ef1f3 100644 --- a/Appraisals +++ b/Appraisals @@ -27,6 +27,15 @@ appraise "rails-7.0_vc-3.0" do gem "view_component", ">= 3.0.0", "< 4.0" end +appraise "rails-7.1_vc-2.0" do + gem "rails", "~> 7.1.0" +end + +appraise "rails-7.1_vc-3.0" do + gem "rails", "~> 7.1.0" + gem "view_component", ">= 3.0.0", "< 4.0" +end + appraise "rails-head_vc-2.0" do gem "rails", github: "rails/rails", branch: "main" end From bd7480df4b3ba3b2c287fe391820d41e4a7cc37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:15:53 +0200 Subject: [PATCH 03/10] Update main.yml --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e1bd66..02b770e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,6 +18,10 @@ jobs: - { ruby: "3.0", rails: "7.0", rubygems: "default" } - { ruby: "3.1", rails: "7.0", rubygems: "default" } - { ruby: "3.2", rails: "7.0", rubygems: "default" } + - { ruby: "2.7", rails: "7.1", rubygems: "default" } + - { ruby: "3.0", rails: "7.1", rubygems: "default" } + - { ruby: "3.1", rails: "7.1", rubygems: "default" } + - { ruby: "3.2", rails: "7.1", rubygems: "default" } - { ruby: "3.0", rails: "head", rubygems: "latest" } - { ruby: "3.1", rails: "head", rubygems: "latest" } - { ruby: "3.2", rails: "head", rubygems: "latest" } @@ -34,7 +38,7 @@ jobs: - name: Update gemspec to test in head version if: matrix.versions.rails == 'head' run: | - sed -i -e 's/, "< 7.1"//g' view_component-form.gemspec + sed -i -e 's/, "<= 7.1"//g' view_component-form.gemspec - name: Set up Ruby uses: ruby/setup-ruby@v1 From 1fb3b270b04d10f0e0c3ed98b002e8a3029840cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:17:25 +0200 Subject: [PATCH 04/10] Create rails_7.1_vc_2.0.gemfile --- gemfiles/rails_7.1_vc_2.0.gemfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 gemfiles/rails_7.1_vc_2.0.gemfile diff --git a/gemfiles/rails_7.1_vc_2.0.gemfile b/gemfiles/rails_7.1_vc_2.0.gemfile new file mode 100644 index 0000000..ec280ce --- /dev/null +++ b/gemfiles/rails_7.1_vc_2.0.gemfile @@ -0,0 +1,20 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", require: false +gem "capybara", require: false +gem "combustion", "~> 1.3.7" +gem "generator_spec" +gem "rails", "~> 7.0.0" +gem "rake", "~> 13.0" +gem "rspec", "~> 3.0", require: false +gem "rspec-html-matchers" +gem "rspec-rails", require: false +gem "rubocop", require: false +gem "rubocop-performance", require: false +gem "rubocop-rspec", require: false +gem "simplecov", require: false, group: :test +gem "sqlite3", require: false, group: :test + +gemspec path: "../" From 5dce5ec010d6388122b4032579162d682f7a8b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:17:49 +0200 Subject: [PATCH 05/10] Create rails_7.1_vc_3.0.gemfile --- gemfiles/rails_7.1_vc_3.0.gemfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 gemfiles/rails_7.1_vc_3.0.gemfile diff --git a/gemfiles/rails_7.1_vc_3.0.gemfile b/gemfiles/rails_7.1_vc_3.0.gemfile new file mode 100644 index 0000000..9885251 --- /dev/null +++ b/gemfiles/rails_7.1_vc_3.0.gemfile @@ -0,0 +1,21 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", require: false +gem "capybara", require: false +gem "combustion", "~> 1.3.7" +gem "generator_spec" +gem "rails", "~> 7.0.0" +gem "rake", "~> 13.0" +gem "rspec", "~> 3.0", require: false +gem "rspec-html-matchers" +gem "rspec-rails", require: false +gem "rubocop", require: false +gem "rubocop-performance", require: false +gem "rubocop-rspec", require: false +gem "simplecov", require: false, group: :test +gem "sqlite3", require: false, group: :test +gem "view_component", ">= 3.0.0", "< 4.0" + +gemspec path: "../" From ee80c8e1ebc9d52206c0b772c50ab7d6ef37aa02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:45:55 +0200 Subject: [PATCH 06/10] Update view_component-form.gemspec Co-authored-by: Hans Lemuet --- view_component-form.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view_component-form.gemspec b/view_component-form.gemspec index 9528256..9a2c57b 100644 --- a/view_component-form.gemspec +++ b/view_component-form.gemspec @@ -26,8 +26,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0") - spec.add_dependency "actionview", [">= 6.0.0", "<= 7.1"] - spec.add_dependency "activesupport", [">= 6.0.0", "<= 7.1"] + spec.add_dependency "actionview", [">= 6.0.0", "< 7.2"] + spec.add_dependency "activesupport", [">= 6.0.0", "< 7.2"] spec.add_dependency "view_component", [">= 2.34.0", "< 4.0"] spec.add_dependency "zeitwerk", ["~> 2.5"] end From 653c70b1880fe094651d71b4ab315c49ac43f816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:46:00 +0200 Subject: [PATCH 07/10] Update .github/workflows/main.yml Co-authored-by: Hans Lemuet --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02b770e..311fa06 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: - name: Update gemspec to test in head version if: matrix.versions.rails == 'head' run: | - sed -i -e 's/, "<= 7.1"//g' view_component-form.gemspec + sed -i -e 's/, "< 7.2"//g' view_component-form.gemspec - name: Set up Ruby uses: ruby/setup-ruby@v1 From 7d3002e31e0a03c0feec775274290eff4030cf6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:46:25 +0200 Subject: [PATCH 08/10] Update rails_7.1_vc_3.0.gemfile --- gemfiles/rails_7.1_vc_3.0.gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/rails_7.1_vc_3.0.gemfile b/gemfiles/rails_7.1_vc_3.0.gemfile index 9885251..ec32fc9 100644 --- a/gemfiles/rails_7.1_vc_3.0.gemfile +++ b/gemfiles/rails_7.1_vc_3.0.gemfile @@ -6,7 +6,7 @@ gem "appraisal", require: false gem "capybara", require: false gem "combustion", "~> 1.3.7" gem "generator_spec" -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.1.0" gem "rake", "~> 13.0" gem "rspec", "~> 3.0", require: false gem "rspec-html-matchers" From 2a875f5486527461ee780a34391463e6d9fcfe09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Hauge=20Bj=C3=B8rnskov?= <19725+henrikbjorn@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:46:44 +0200 Subject: [PATCH 09/10] Update rails_7.1_vc_2.0.gemfile --- gemfiles/rails_7.1_vc_2.0.gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/rails_7.1_vc_2.0.gemfile b/gemfiles/rails_7.1_vc_2.0.gemfile index ec280ce..3b7cc0d 100644 --- a/gemfiles/rails_7.1_vc_2.0.gemfile +++ b/gemfiles/rails_7.1_vc_2.0.gemfile @@ -6,7 +6,7 @@ gem "appraisal", require: false gem "capybara", require: false gem "combustion", "~> 1.3.7" gem "generator_spec" -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.1.0" gem "rake", "~> 13.0" gem "rspec", "~> 3.0", require: false gem "rspec-html-matchers" From 0695396a628dac643c350ff2a3dd590dca28b757 Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Wed, 11 Oct 2023 23:38:16 +0200 Subject: [PATCH 10/10] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a96a7eb..ac12b76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +- Support for Rails 7.1 (#151) - Add `element_proc` option to `CollectionCheckBoxesComponent` and `CollectionRadioButtonsComponent` to customize the way the elements will be shown (#142) ## [0.2.5] - 2023-05-01