Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions lib/solidus_support.rb
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
# frozen_string_literal: true

require 'solidus_support/version'
require 'solidus_support/deprecator'
require 'solidus_support/migration'
require 'solidus_support/legacy_event_compat'
require 'solidus_support/engine_extensions'
require 'solidus_core'

module SolidusSupport
class << self
def deprecator
@deprecator ||= ActiveSupport::Deprecation.new(Gem::Version.new('1.0'), 'SolidusSupport')
end

def solidus_deprecator
Spree.solidus_gem_version >= Gem::Version.new('4.2') ? Spree.deprecator : Spree::Deprecation
end

def solidus_gem_version
deprecator.warn <<-WARN.squish, caller
SolidusSupport.solidus_gem_version is deprecated and will be removed
Expand Down
13 changes: 13 additions & 0 deletions lib/solidus_support/deprecator.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# frozen_string_literal: true

module SolidusSupport
class << self
def deprecator
@deprecator ||= ActiveSupport::Deprecation.new(Gem::Version.new('1.0'), 'SolidusSupport')
end

def solidus_deprecator
Spree.solidus_gem_version >= Gem::Version.new('4.2') ? Spree.deprecator : Spree::Deprecation
end
end
end
2 changes: 1 addition & 1 deletion lib/solidus_support/engine_extensions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module SolidusSupport
module EngineExtensions
include ActiveSupport::Deprecation::DeprecatedConstantAccessor
deprecate_constant 'Decorators', 'SolidusSupport::EngineExtensions'
deprecate_constant 'Decorators', 'SolidusSupport::EngineExtensions', deprecator: SolidusSupport.deprecator

def self.included(engine)
engine.extend ClassMethods
Expand Down
2 changes: 1 addition & 1 deletion spec/support/dummy_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module DummyApp
class Application < ::Rails::Application
config.eager_load = false
config.paths['config/database'] = File.expand_path('dummy_app/database.yml', __dir__)
if ActiveRecord::VERSION::MAJOR >= 7
if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR < 1
config.active_record.legacy_connection_handling = false
end
end
Expand Down