From 4f711481d3f1570be280edd40be79401ee584820 Mon Sep 17 00:00:00 2001
From: Ryan McGeary <ryan@mcgeary.org>
Date: Sun, 10 Nov 2024 09:58:50 -0700
Subject: [PATCH 1/2] Update build matrix

---
 .github/workflows/ci.yml   | 10 ++++++----
 Gemfile                    |  2 +-
 gemfiles/rails-7.1.gemfile |  4 ++++
 gemfiles/rails-7.2.gemfile |  4 ++++
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 gemfiles/rails-7.1.gemfile
 create mode 100644 gemfiles/rails-7.2.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa81d6a..e3115de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,15 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.7", "3.0"]
+        ruby: ["3.1", "3.2", "3.3"]
         bundler: [default]
         gemfile:
-          - rails-6.0
-          - rails-6.1
-          - rails-7.0
+          - rails-7.1
+          - rails-7.2
         include:
           - { ruby: "2.5", gemfile: "rails-5.2", bundler: "default" }
           - { ruby: "2.6", gemfile: "rails-5.2", bundler: "default" }
+          - { ruby: "2.7", gemfile: "rails-6.0", bundler: "default" }
+          - { ruby: "3.0", gemfile: "rails-6.1", bundler: "default" }
+          - { ruby: "3.1", gemfile: "rails-7.0", bundler: "default" }
 
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
diff --git a/Gemfile b/Gemfile
index 3e450aa..a58ba47 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "guard", ">= 2.9"
+  gem "guard", "~> 2.9"
   gem "guard-minitest"
 end
diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile
new file mode 100644
index 0000000..4871aa0
--- /dev/null
+++ b/gemfiles/rails-7.1.gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+gem "railties", "~> 7.1.0"
diff --git a/gemfiles/rails-7.2.gemfile b/gemfiles/rails-7.2.gemfile
new file mode 100644
index 0000000..2c7c652
--- /dev/null
+++ b/gemfiles/rails-7.2.gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+gem "railties", "~> 7.2.0"

From 50f961d634519493cf14c2d95850d5be2e8aa8e2 Mon Sep 17 00:00:00 2001
From: Ryan McGeary <ryan@mcgeary.org>
Date: Sun, 10 Nov 2024 10:00:13 -0700
Subject: [PATCH 2/2] Add rails 8 support

---
 .github/workflows/ci.yml   | 3 ++-
 font-awesome-rails.gemspec | 2 +-
 gemfiles/rails-8.0.gemfile | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 gemfiles/rails-8.0.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e3115de..8196617 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,11 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["3.1", "3.2", "3.3"]
+        ruby: ["3.2", "3.3"]
         bundler: [default]
         gemfile:
           - rails-7.1
           - rails-7.2
+          - rails-8.0
         include:
           - { ruby: "2.5", gemfile: "rails-5.2", bundler: "default" }
           - { ruby: "2.6", gemfile: "rails-5.2", bundler: "default" }
diff --git a/font-awesome-rails.gemspec b/font-awesome-rails.gemspec
index 32c2153..99bb2a5 100644
--- a/font-awesome-rails.gemspec
+++ b/font-awesome-rails.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = FontAwesome::Rails::VERSION
 
-  gem.add_dependency "railties", ">= 3.2", "< 8.0"
+  gem.add_dependency "railties", ">= 3.2", "< 9.0"
 
   gem.add_development_dependency "activesupport"
   gem.add_development_dependency "sassc-rails"
diff --git a/gemfiles/rails-8.0.gemfile b/gemfiles/rails-8.0.gemfile
new file mode 100644
index 0000000..b3b3596
--- /dev/null
+++ b/gemfiles/rails-8.0.gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+gem "railties", "~> 8.0.0"