Merge branch 'master' into custom_sm

Author: afdev82

.ruby-version

@@ -4,7 +4,7 @@
 
 module SolidusI18n
   class Engine < Rails::Engine
-    include SolidusSupport::EngineExtensions::Decorators
+    include SolidusSupport::EngineExtensions
 
     isolate_namespace ::Spree
 

lib/solidus_i18n/engine.rb

@@ -1,20 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusI18n
-  module_function
-
-  # Returns the version of the currently loaded SolidusI18n as a
-  # <tt>Gem::Version</tt>.
-  def version
-    Gem::Version.new VERSION::STRING
-  end
-
-  module VERSION
-    MAJOR = 2
-    MINOR = 0
-    TINY  = 0
-    PRE   = nil
-
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-  end
+  VERSION = '2.1.0'
 end

lib/solidus_i18n/version.rb

@@ -5,7 +5,7 @@ require 'solidus_i18n/version'
 
 Gem::Specification.new do |s|
   s.name        = 'solidus_i18n'
-  s.version     = SolidusI18n.version
+  s.version     = SolidusI18n::VERSION
   s.summary     = 'Provides locale information for use in Solidus.'
   s.description = 'A collection of translations for Solidus.'
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     s.metadata["source_code_uri"] = s.homepage if s.homepage
   end
 
-  s.add_runtime_dependency 'solidus_core', ['>= 1.1', '< 3']
+  s.add_runtime_dependency 'solidus_core', ['>= 1.1', '< 4']
   s.add_runtime_dependency 'solidus_support', '~> 0.4'
 
   s.add_development_dependency 'solidus_dev_support'