Merge pull request #68 from AlchemyCMS/allow-6.1

Allow Alchemy 6.1
AlchemyCMS · Jan 20, 2023 · ab16183 · ab16183
2 parents d3d5091 + 93f2141
commit ab16183
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@ jobs:
       matrix:
         alchemy_branch:
           - 6.0-stable
+          - 6.1-stable
           - main
         ruby:
           - "2.7"

diff --git a/Gemfile b/Gemfile
@@ -18,8 +18,8 @@ gem "sqlite3"
 
 alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "main")
 gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: alchemy_branch
+gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: alchemy_branch
 
-gem "alchemy-devise", github: "AlchemyCMS/alchemy-devise", branch: "main"
 gem "rufo"
 gem "rubocop"
 gem "pry-byebug"
diff --git a/alchemy-json_api.gemspec b/alchemy-json_api.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile", "README.md"]
 
-  spec.add_dependency "alchemy_cms", [">= 6.0.a", "< 6.1"]
+  spec.add_dependency "alchemy_cms", [">= 6.0.0", "< 7"]
   spec.add_dependency "jsonapi.rb", "~> 1.6"
 
   spec.add_development_dependency "factory_bot"