Merge pull request #4848 from nebulab/waiting-for-dev/remove_ruby_v2.…

…6_support Remove Ruby v2.6 support
solidusio · Jan 12, 2023 · 26f1193 · 26f1193
2 parents 2b79f72 + 25f0428
commit 26f1193
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -342,10 +342,10 @@ workflows:
       - test_solidus:
           context: slack-secrets
           name: *name
-          matrix: { parameters: { rails: ['6.0'], ruby: ['2.6'], database: ['sqlite'], paperclip: [true] } }
+          matrix: { parameters: { rails: ['6.0'], ruby: ['2.7'], database: ['sqlite'], paperclip: [true] } }
       - test_solidus:
           context: slack-secrets
           name: *name
-          matrix: { parameters: { rails: ['5.2'], ruby: ['2.6'], database: ['sqlite'], paperclip: [true] } }
+          matrix: { parameters: { rails: ['5.2'], ruby: ['2.7'], database: ['sqlite'], paperclip: [true] } }
       - dev_tools:
           context: slack-secrets
diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,7 @@ group :backend do
   # - https://github.com/ruby/net-protocol/issues/10
   # - https://stackoverflow.com/a/72474475
   v = ->(string) { Gem::Version.new(string) }
-  if Gem::Requirement.new(['>= 2.6', '< 3']) === Gem::Version.new(RUBY_VERSION)
+  if Gem::Requirement.new(['>= 2.7', '< 3']) === Gem::Version.new(RUBY_VERSION)
     gem 'net-http', require: false
   end
 

diff --git a/api/solidus_api.gemspec b/api/solidus_api.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'jbuilder', '~> 2.8'

diff --git a/backend/app/views/spree/admin/taxons/_form.html.erb b/backend/app/views/spree/admin/taxons/_form.html.erb
@@ -12,7 +12,7 @@
         <% if @taxon.parent %>
           <div class="input-group-prepend">
             <span class="input-group-text">
-              <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
+              <%= @taxon.permalink.split('/')[...-1].join('/') + '/' %>
             </span>
           </div>
         <% end %>

diff --git a/backend/solidus_backend.gemspec b/backend/solidus_backend.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version

diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
@@ -84,15 +84,6 @@ class GatewayError < RuntimeError; end
   end
 end
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7")
-  Spree::Deprecation.warn <<~HEREDOC
-    Ruby 2.6, which reached EOL, is deprecated and will not be supported anymore from the next Solidus version.
-    Please, upgrade to a more recent Ruby version.
-    Read more on the release notes for different Ruby versions here:
-    https://www.ruby-lang.org/en/downloads/releases/
-  HEREDOC
-end
-
 if Gem::Version.new(Rails.version) < Gem::Version.new('6.0')
   Spree::Deprecation.warn <<~HEREDOC
     Rails 5.2 (EOL) is deprecated and will not be supported anymore from the next Solidus version.

diff --git a/core/lib/spree/testing_support/order_walkthrough.rb b/core/lib/spree/testing_support/order_walkthrough.rb
@@ -34,7 +34,7 @@ def up_to(state, user: nil)
                               states
                             else
                               end_state_position = states.index(state.to_sym)
-                              states[0..end_state_position]
+                              states[..end_state_position]
                             end
 
         states_to_process.each do |state_to_process|

diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   %w[

diff --git a/sample/solidus_sample.gemspec b/sample/solidus_sample.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_core', s.version

diff --git a/solidus.gemspec b/solidus.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['README.md', 'lib/**/*']
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version