From 2f3434685a98463d6172cc8c57677244a37802d3 Mon Sep 17 00:00:00 2001
From: Sascha Karnatz <68833+kulturbande@users.noreply.github.com>
Date: Wed, 8 Apr 2026 22:40:30 +0200
Subject: [PATCH] Allow AlchemyCMS v8.2.0

AlchemyCMS v8.2.0 was released a few hours ago. Make the gem compatible with the latest version.
---
 .github/workflows/test.yml   |  3 +++
 Gemfile                      | 10 +++-------
 alchemy-solid_errors.gemspec |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 10cbc7d..a114306 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,6 +24,9 @@ jobs:
           - alchemy_cms: "8.1"
             rails: "8.1"
             ruby: "3.4"
+          - alchemy_cms: "8.2"
+            rails: "8.1"
+            ruby: "3.4"
     env:
       RAILS_VERSION: ${{ matrix.rails }}
       ALCHEMY_CMS_VERSION: ${{ matrix.alchemy_cms }}
diff --git a/Gemfile b/Gemfile
index 1c20c2a..40dab72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,13 +8,9 @@ if alchemy_cms_version.start_with?("8.")
   gem "propshaft"
 end
 
-if alchemy_cms_version == "8.1"
-  gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: "8.1-stable"
-  gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"
-else
-  gem "alchemy_cms", "~> #{alchemy_cms_version}"
-  gem "alchemy-devise", "~> #{alchemy_cms_version}"
-end
+gem "alchemy_cms", "~> #{alchemy_cms_version}"
+devise_version = (Gem::Version.new(alchemy_cms_version) >= Gem::Version.new("8.0")) ? "8.0" : alchemy_cms_version
+gem "alchemy-devise", "~> #{devise_version}"
 
 # Specify your gem's dependencies in alchemy-solid_errors.gemspec.
 gemspec
diff --git a/alchemy-solid_errors.gemspec b/alchemy-solid_errors.gemspec
index 4b452d8..692c308 100644
--- a/alchemy-solid_errors.gemspec
+++ b/alchemy-solid_errors.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_dependency "rails", ">= 7.2.0", "< 9.0"
-  spec.add_dependency "alchemy_cms", ">= 7.4.0", "< 8.2"
+  spec.add_dependency "alchemy_cms", ">= 7.4.0", "< 9.0"
   spec.add_dependency "solid_errors", ">= 0.7", "< 1.0"
 
   spec.add_development_dependency "capybara", ["~> 3.0"]