Temp: Use unreleased solidus_support with Flickwerk support

Gemfile

@@ -25,6 +25,9 @@ end
 # resolve gems based on the required ruby version.
 gem 'async', '< 3' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
 
+# Temporarily use the `solidus_support` gem with Flickwerk support
+gem "solidus_support", github: "mamhoff/solidus_support", branch: "re-enable-flickwerk"
+
 gemspec
 
 # Use a local Gemfile to include development dependencies that might not be

lib/solidus_braintree.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'flickwerk'
 require 'solidus_core'
 require 'solidus_support'
 require 'braintree'

lib/solidus_braintree/engine.rb

@@ -6,20 +6,6 @@
 module SolidusBraintree
   class Engine < Rails::Engine
     include SolidusSupport::EngineExtensions
-    include Flickwerk
-
-    include Flickwerk
-
-    Flickwerk.aliases["Spree.user_class"] = Spree.user_class_name
-
-    if SolidusSupport.backend_available?
-      config.autoload_paths += root.join("lib", "patches", "backend").glob("*")
-    end
-
-    initializer "solidus_braintree_backend_patches", before: "flickwerk.add_patch_paths" do
-      patch_path = root.join("lib", "patches", "backend")
-      Flickwerk.patch_paths += [patch_path]
-    end
 
     isolate_namespace SolidusBraintree
     engine_name 'solidus_braintree'

solidus_braintree.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activemerchant', '~> 1.48'
   spec.add_dependency 'braintree', '~> 4.2'
-  spec.add_dependency 'flickwerk', '~> 0.3.1'
   spec.add_dependency 'solidus_api', ['>= 3.4.0.dev', '< 5']
   spec.add_dependency 'solidus_backend', ['>= 3.4.0.dev', '< 5']
   spec.add_dependency 'solidus_core', ['>= 3.4.0.dev', '< 5']