From 230478e76b67192b315a58412c80710913520be9 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 14 Jan 2025 10:56:43 +0100
Subject: [PATCH] Temp: Use unrelease solidus_support version

---
 Gemfile                                                   | 1 +
 legacy_promotions/lib/solidus_legacy_promotions/engine.rb | 4 +---
 legacy_promotions/solidus_legacy_promotions.gemspec       | 1 -
 promotions/lib/solidus_promotions/engine.rb               | 2 --
 promotions/solidus_promotions.gemspec                     | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index dd357ea99bf..3b31729a798 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,6 +68,7 @@ end
 group :legacy_promotions, :promotions do
   gem 'solidus_legacy_promotions', path: 'legacy_promotions', require: false
   gem 'solidus_backend', path: 'backend', require: false
+  gem 'solidus_support', github: "mamhoff/solidus_support", branch: "re-enable-flickwerk"
 end
 
 group :promotions do
diff --git a/legacy_promotions/lib/solidus_legacy_promotions/engine.rb b/legacy_promotions/lib/solidus_legacy_promotions/engine.rb
index 2fae52907ec..ba7fe49583e 100644
--- a/legacy_promotions/lib/solidus_legacy_promotions/engine.rb
+++ b/legacy_promotions/lib/solidus_legacy_promotions/engine.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 require 'solidus_legacy_promotions'
-require 'flickwerk'
+
 module SolidusLegacyPromotions
   class Engine < ::Rails::Engine
     include SolidusSupport::EngineExtensions
 
-    include Flickwerk
-
     initializer "solidus_legacy_promotions.add_backend_menu_item" do
       if SolidusSupport.backend_available?
         promotions_menu_item = Spree::BackendConfiguration::MenuItem.new(
diff --git a/legacy_promotions/solidus_legacy_promotions.gemspec b/legacy_promotions/solidus_legacy_promotions.gemspec
index ddd475066af..847a100ff0b 100644
--- a/legacy_promotions/solidus_legacy_promotions.gemspec
+++ b/legacy_promotions/solidus_legacy_promotions.gemspec
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.1.0'
   s.required_rubygems_version = '>= 1.8.23'
 
-  s.add_dependency 'flickwerk', '~> 0.3.1'
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
   s.add_dependency 'solidus_support', '>= 0.12.0'
diff --git a/promotions/lib/solidus_promotions/engine.rb b/promotions/lib/solidus_promotions/engine.rb
index a69aa708f28..7cdba2661c9 100644
--- a/promotions/lib/solidus_promotions/engine.rb
+++ b/promotions/lib/solidus_promotions/engine.rb
@@ -2,12 +2,10 @@
 
 require "solidus_core"
 require "solidus_support"
-require "flickwerk"
 
 module SolidusPromotions
   class Engine < Rails::Engine
     include SolidusSupport::EngineExtensions
-    include Flickwerk
     Flickwerk.aliases["Spree::Config.order_recalculator_class"] = Spree::Config.order_recalculator_class_name
 
     isolate_namespace ::SolidusPromotions
diff --git a/promotions/solidus_promotions.gemspec b/promotions/solidus_promotions.gemspec
index e1f10a57035..1838e94dfaa 100644
--- a/promotions/solidus_promotions.gemspec
+++ b/promotions/solidus_promotions.gemspec
@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
   spec.files = files.grep_v(%r{^(spec|bin)/})
 
-  spec.add_dependency "flickwerk", "~> 0.3.1"
   spec.add_dependency "importmap-rails", "~> 1.2"
   spec.add_dependency "ransack-enum", "~> 1.0"
   spec.add_dependency "solidus_core", [">= 4.0.0", "< 5"]