Merge pull request #173 from tvdeyen/alchemy-7-fixes

Update to Alchemy 7.0

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
-          - 6.1-stable
+          - main
         ruby:
           - "3.0"
           - "3.1"

Gemfile

@@ -1,10 +1,11 @@
 source "https://rubygems.org"
 
-alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "6.1-stable")
+alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "main")
 gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: alchemy_branch
 
-gem "rails", "~> 6.1.7"
+gem "rails", "~> 7.0.0"
 gem "listen", "~> 3.8"
+gem "puma", "~> 6.0"
 
 # Specify your gem's dependencies in alchemy-solidus.gemspec
 gemspec

Rakefile

@@ -40,7 +40,6 @@ namespace :alchemy do
           SETUP
         )
         exit($?.exitstatus) unless $?.success?
-        system("bin/rails webpacker:compile") || exit($?.exitstatus)
       end
     end
   end

alchemy-devise.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "CHANGELOG.md", "README.md"]
 
-  s.add_dependency "alchemy_cms", [">= 6.1.0", "< 7"]
+  s.add_dependency "alchemy_cms", [">= 7.0.0-rc1", "< 8"]
   s.add_dependency "devise", [">= 4.7.1", "< 5"]
 
   s.add_development_dependency "capybara"