From c3d606a24293a9574e8b3f1edd9d9aab6f312a3f Mon Sep 17 00:00:00 2001
From: "Igor S. Morozov" <igor@morozov.is>
Date: Sun, 2 Feb 2025 00:05:33 +0100
Subject: [PATCH 1/8] Relax activesupport dependency

---
 viewcomponent-rspec.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewcomponent-rspec.gemspec b/viewcomponent-rspec.gemspec
index faaecb1..b4e476e 100644
--- a/viewcomponent-rspec.gemspec
+++ b/viewcomponent-rspec.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", [">= 5.0.0", "< 8.0"]
+  spec.add_runtime_dependency "activesupport", [">= 5.0.0", "< 9.0"]
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "capybara", "~> 3"

From ea546e53bf5596214e2142aa696cf603abf09dc0 Mon Sep 17 00:00:00 2001
From: "Igor S. Morozov" <igor@morozov.is>
Date: Sun, 2 Feb 2025 00:05:44 +0100
Subject: [PATCH 2/8] Add Rails 7.1, 8.0 and Ruby 3.2, 3.3, 3.4 to CI matrix

---
 .github/workflows/main.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 338243b..10a61d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails_version: ['5.2', '6.0', '6.1', '7.0', 'main']
-        ruby_version: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        rails_version: ['5.2', '6.0', '6.1', '7.0', '7.1', '8.0', 'main']
+        ruby_version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
         exclude:
           - rails_version: '5.2'
             ruby_version: '3.0'
@@ -29,6 +29,14 @@ jobs:
             ruby_version: '2.5'
           - rails_version: '7.0'
             ruby_version: '2.6'
+          - rails_version: '7.1'
+            ruby_version: '2.5'
+          - rails_version: '7.1'
+            ruby_version: '2.6'
+          - rails_version: '8.0'
+            ruby_version: '2.5'
+          - rails_version: '8.0'
+            ruby_version: '2.6'
           - rails_version: 'main'
             ruby_version: '2.5'
           - rails_version: 'main'

From 7f0e25005d69779515e11bc18a01ee2c995be3a3 Mon Sep 17 00:00:00 2001
From: "Igor S. Morozov" <igor@morozov.is>
Date: Sun, 2 Feb 2025 00:10:40 +0100
Subject: [PATCH 3/8] Remove unused versions from matrix

---
 .github/workflows/main.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 10a61d8..e8f001f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,13 +14,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails_version: ['5.2', '6.0', '6.1', '7.0', '7.1', '8.0', 'main']
+        rails_version: ['6.0', '6.1', '7.0', '7.1', '8.0', 'main']
         ruby_version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
         exclude:
-          - rails_version: '5.2'
-            ruby_version: '3.0'
-          - rails_version: '5.2'
-            ruby_version: '3.1'
           - rails_version: '6.0'
             ruby_version: '3.0'
           - rails_version: '6.0'

From 8419c721fa51b3554d4a93c02a0981282df93e13 Mon Sep 17 00:00:00 2001
From: "Igor S. Morozov" <igor@morozov.is>
Date: Sun, 2 Feb 2025 00:10:52 +0100
Subject: [PATCH 4/8] Add Gemfiles for 7.1 and 8.0

---
 gemfiles/rails_7.1.gemfile | 7 +++++++
 gemfiles/rails_8.0.gemfile | 7 +++++++
 2 files changed, 14 insertions(+)
 create mode 100644 gemfiles/rails_7.1.gemfile
 create mode 100644 gemfiles/rails_8.0.gemfile

diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
new file mode 100644
index 0000000..35a0ba3
--- /dev/null
+++ b/gemfiles/rails_7.1.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile
new file mode 100644
index 0000000..3b3765b
--- /dev/null
+++ b/gemfiles/rails_8.0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"

From 7e56e786ab4168ae2f504c3d7067e3b32027f236 Mon Sep 17 00:00:00 2001
From: "Igor S. Morozov" <igor@morozov.is>
Date: Sun, 2 Feb 2025 00:17:37 +0100
Subject: [PATCH 5/8] Remove EOL Rails

---
 .github/workflows/main.yml                    | 30 ++++++++-----------
 gemfiles/rails_6.1.gemfile                    | 10 -------
 .../{rails_6.0.gemfile => rails_7.2.gemfile}  |  2 +-
 3 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 gemfiles/rails_6.1.gemfile
 rename gemfiles/{rails_6.0.gemfile => rails_7.2.gemfile} (79%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e8f001f..53214a5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,29 +14,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails_version: ['6.0', '6.1', '7.0', '7.1', '8.0', 'main']
-        ruby_version: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
+        rails_version: ['7.0', '7.1', '7.2', '8.0', 'main']
+        ruby_version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
         exclude:
-          - rails_version: '6.0'
+          - rails_version: '7.2'
+            ruby_version: '2.7'
+          - rails_version: '7.2'
             ruby_version: '3.0'
-          - rails_version: '6.0'
-            ruby_version: '3.1'
-          - rails_version: '7.0'
-            ruby_version: '2.5'
-          - rails_version: '7.0'
-            ruby_version: '2.6'
-          - rails_version: '7.1'
-            ruby_version: '2.5'
-          - rails_version: '7.1'
-            ruby_version: '2.6'
           - rails_version: '8.0'
-            ruby_version: '2.5'
+            ruby_version: '2.7'
+          - rails_version: '8.0'
+            ruby_version: '3.0'
           - rails_version: '8.0'
-            ruby_version: '2.6'
+            ruby_version: '3.1'
           - rails_version: 'main'
-            ruby_version: '2.5'
+            ruby_version: '2.7'
           - rails_version: 'main'
-            ruby_version: '2.6'
+            ruby_version: '3.0'
+          - rails_version: 'main'
+            ruby_version: '3.1'
     env:
       BUNDLE_PATH: ${{ github.workspace }}/vendor/bundle
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}.gemfile
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
deleted file mode 100644
index 2296b7d..0000000
--- a/gemfiles/rails_6.1.gemfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 6.1.0"
-gem "net-smtp", require: false
-gem "net-imap", require: false
-gem "net-pop", require: false
-
-gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_7.2.gemfile
similarity index 79%
rename from gemfiles/rails_6.0.gemfile
rename to gemfiles/rails_7.2.gemfile
index 15b9b27..92cc2b2 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_7.2.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

From 4cc7b1b4619b86f241973c34ea36d9dc57d4857b Mon Sep 17 00:00:00 2001
From: "Igor S. Morozov" <igor@morozov.is>
Date: Sun, 2 Feb 2025 00:20:26 +0100
Subject: [PATCH 6/8] Use concurrent-ruby that contains a fix

---
 gemfiles/rails_7.0.gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
index 9af0ae3..e546dc0 100644
--- a/gemfiles/rails_7.0.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
+gem "concurrent-ruby", ">= 1.3.4" 
 
 gemspec path: "../"

From b67bea6e62a90ebaad29f988f48a7645ceebc665 Mon Sep 17 00:00:00 2001
From: "Igor S. Morozov" <igor@morozov.is>
Date: Sun, 2 Feb 2025 00:24:30 +0100
Subject: [PATCH 7/8] Stick dependency to 2.0 for now

---
 viewcomponent-rspec.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewcomponent-rspec.gemspec b/viewcomponent-rspec.gemspec
index b4e476e..5267f94 100644
--- a/viewcomponent-rspec.gemspec
+++ b/viewcomponent-rspec.gemspec
@@ -39,5 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec-rails", "~> 5"
   spec.add_development_dependency "standard", "~> 1.3"
-  spec.add_development_dependency "view_component", "~> 2"
+  spec.add_development_dependency "view_component", "~> 2.0"
 end

From 560262e0e9ba7e76dbb2e62749a06fa7aca6b4be Mon Sep 17 00:00:00 2001
From: "Igor S. Morozov" <igor@morozov.is>
Date: Sun, 2 Feb 2025 00:26:07 +0100
Subject: [PATCH 8/8] Fix lint

---
 gemfiles/rails_7.0.gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
index e546dc0..86c9d6a 100644
--- a/gemfiles/rails_7.0.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
-gem "concurrent-ruby", ">= 1.3.4" 
+gem "concurrent-ruby", ">= 1.3.4"
 
 gemspec path: "../"