Skip to content

Commit 26f1193

Browse files
Merge pull request solidusio#4848 from nebulab/waiting-for-dev/remove_ruby_v2.6_support
Remove Ruby v2.6 support
2 parents 2b79f72 + 25f0428 commit 26f1193

File tree

10 files changed

+10
-19
lines changed

10 files changed

+10
-19
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,10 @@ workflows:
342342
- test_solidus:
343343
context: slack-secrets
344344
name: *name
345-
matrix: { parameters: { rails: ['6.0'], ruby: ['2.6'], database: ['sqlite'], paperclip: [true] } }
345+
matrix: { parameters: { rails: ['6.0'], ruby: ['2.7'], database: ['sqlite'], paperclip: [true] } }
346346
- test_solidus:
347347
context: slack-secrets
348348
name: *name
349-
matrix: { parameters: { rails: ['5.2'], ruby: ['2.6'], database: ['sqlite'], paperclip: [true] } }
349+
matrix: { parameters: { rails: ['5.2'], ruby: ['2.7'], database: ['sqlite'], paperclip: [true] } }
350350
- dev_tools:
351351
context: slack-secrets

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ group :backend do
4141
# - https://github.com/ruby/net-protocol/issues/10
4242
# - https://stackoverflow.com/a/72474475
4343
v = ->(string) { Gem::Version.new(string) }
44-
if Gem::Requirement.new(['>= 2.6', '< 3']) === Gem::Version.new(RUBY_VERSION)
44+
if Gem::Requirement.new(['>= 2.7', '< 3']) === Gem::Version.new(RUBY_VERSION)
4545
gem 'net-http', require: false
4646
end
4747

api/solidus_api.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
f.match(%r{^(spec|script)/})
2121
end
2222

23-
s.required_ruby_version = '>= 2.6.0'
23+
s.required_ruby_version = '>= 2.7.0'
2424
s.required_rubygems_version = '>= 1.8.23'
2525

2626
s.add_dependency 'jbuilder', '~> 2.8'

backend/app/views/spree/admin/taxons/_form.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<% if @taxon.parent %>
1313
<div class="input-group-prepend">
1414
<span class="input-group-text">
15-
<%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
15+
<%= @taxon.permalink.split('/')[...-1].join('/') + '/' %>
1616
</span>
1717
</div>
1818
<% end %>

backend/solidus_backend.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
f.match(%r{^(spec|script)/})
2121
end
2222

23-
s.required_ruby_version = '>= 2.6.0'
23+
s.required_ruby_version = '>= 2.7.0'
2424
s.required_rubygems_version = '>= 1.8.23'
2525

2626
s.add_dependency 'solidus_api', s.version

core/lib/spree/core.rb

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@ class GatewayError < RuntimeError; end
8484
end
8585
end
8686

87-
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7")
88-
Spree::Deprecation.warn <<~HEREDOC
89-
Ruby 2.6, which reached EOL, is deprecated and will not be supported anymore from the next Solidus version.
90-
Please, upgrade to a more recent Ruby version.
91-
Read more on the release notes for different Ruby versions here:
92-
https://www.ruby-lang.org/en/downloads/releases/
93-
HEREDOC
94-
end
95-
9687
if Gem::Version.new(Rails.version) < Gem::Version.new('6.0')
9788
Spree::Deprecation.warn <<~HEREDOC
9889
Rails 5.2 (EOL) is deprecated and will not be supported anymore from the next Solidus version.

core/lib/spree/testing_support/order_walkthrough.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def up_to(state, user: nil)
3434
states
3535
else
3636
end_state_position = states.index(state.to_sym)
37-
states[0..end_state_position]
37+
states[..end_state_position]
3838
end
3939

4040
states_to_process.each do |state_to_process|

core/solidus_core.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
f.match(%r{^(spec|script)/})
2121
end
2222

23-
s.required_ruby_version = '>= 2.6.0'
23+
s.required_ruby_version = '>= 2.7.0'
2424
s.required_rubygems_version = '>= 1.8.23'
2525

2626
%w[

sample/solidus_sample.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
f.match(%r{^(spec|script)/})
2121
end
2222

23-
s.required_ruby_version = '>= 2.6.0'
23+
s.required_ruby_version = '>= 2.7.0'
2424
s.required_rubygems_version = '>= 1.8.23'
2525

2626
s.add_dependency 'solidus_core', s.version

solidus.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
1818

1919
s.files = Dir['README.md', 'lib/**/*']
2020

21-
s.required_ruby_version = '>= 2.6.0'
21+
s.required_ruby_version = '>= 2.7.0'
2222
s.required_rubygems_version = '>= 1.8.23'
2323

2424
s.add_dependency 'solidus_api', s.version

0 commit comments

Comments
 (0)