Skip to content

Commit b3500d1

Browse files
committed
Temp: Use unreleased solidus_support with Flickwerk support
1 parent cc9958e commit b3500d1

File tree

4 files changed

+3
-16
lines changed

4 files changed

+3
-16
lines changed

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ end
2525
# resolve gems based on the required ruby version.
2626
gem 'async', '< 3' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
2727

28+
# Temporarily use the `solidus_support` gem with Flickwerk support
29+
gem "solidus_support", github: "mamhoff/solidus_support", branch: "re-enable-flickwerk"
30+
2831
gemspec
2932

3033
# Use a local Gemfile to include development dependencies that might not be

lib/solidus_braintree.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require 'flickwerk'
43
require 'solidus_core'
54
require 'solidus_support'
65
require 'braintree'

lib/solidus_braintree/engine.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66
module SolidusBraintree
77
class Engine < Rails::Engine
88
include SolidusSupport::EngineExtensions
9-
include Flickwerk
10-
11-
include Flickwerk
12-
13-
Flickwerk.aliases["Spree.user_class"] = Spree.user_class_name
14-
15-
if SolidusSupport.backend_available?
16-
config.autoload_paths += root.join("lib", "patches", "backend").glob("*")
17-
end
18-
19-
initializer "solidus_braintree_backend_patches", before: "flickwerk.add_patch_paths" do
20-
patch_path = root.join("lib", "patches", "backend")
21-
Flickwerk.patch_paths += [patch_path]
22-
end
239

2410
isolate_namespace SolidusBraintree
2511
engine_name 'solidus_braintree'

solidus_braintree.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
3131

3232
spec.add_dependency 'activemerchant', '~> 1.48'
3333
spec.add_dependency 'braintree', '~> 4.2'
34-
spec.add_dependency 'flickwerk', '~> 0.3.1'
3534
spec.add_dependency 'solidus_api', ['>= 3.4.0.dev', '< 5']
3635
spec.add_dependency 'solidus_backend', ['>= 3.4.0.dev', '< 5']
3736
spec.add_dependency 'solidus_core', ['>= 3.4.0.dev', '< 5']

0 commit comments

Comments
 (0)