Remove support for ruby v2.5

Ruby v2.5 is EOL since 05 Apr 2021 [1]. Our new release policy [2] makes it clear that we don't support Ruby versions that are no longer maintained. [1] - https://www.ruby-lang.org/en/downloads/branches/ [2] - https://solidus.io/release_policy/
solidusio · Jan 10, 2023 · bfd56a4 · bfd56a4
1 parent 16d1e37
commit bfd56a4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -277,17 +277,7 @@ jobs:
  BUILDKITE_ANALYTICS_EXECUTION_NAME_PREFIX: "(<< parameters.ruby >>:<< parameters.rails >>:<< parameters.database >>:<< parameters.paperclip >>)"
  steps:
  - setup
- - when:
- condition:
- not:
- equal: [<<parameters.ruby>>, '2.5']
- steps:
- - libvips
- - when:
- condition:
- equal: [<<parameters.ruby>>, '2.5']
- steps:
- - imagemagick
+ - libvips
  - test
  - notify
 
@@ -356,6 +346,6 @@ workflows:
  - test_solidus:
  context: slack-secrets
  name: *name
- matrix: { parameters: { rails: ['5.2'], ruby: ['2.5'], database: ['sqlite'], paperclip: [true] } }
+ matrix: { parameters: { rails: ['5.2'], ruby: ['2.6'], database: ['sqlite'], paperclip: [true] } }
  - dev_tools:
  context: slack-secrets
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.5.0'
+ s.required_ruby_version = '>= 2.6.0'
  s.required_rubygems_version = '>= 1.8.23'
 
  s.add_dependency 'jbuilder', '~> 2.8'

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.5.0'
+ s.required_ruby_version = '>= 2.6.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
@@ -86,7 +86,7 @@ class GatewayError < RuntimeError; end
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7")
  Spree::Deprecation.warn <<~HEREDOC
- Ruby 2.5 & Ruby 2.6 (both EOL) are deprecated and will not be supported anymore from the next Solidus version.
+ 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/

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.5.0'
+ s.required_ruby_version = '>= 2.6.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.5.0'
+ s.required_ruby_version = '>= 2.6.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.5.0'
+ s.required_ruby_version = '>= 2.6.0'
  s.required_rubygems_version = '>= 1.8.23'
 
  s.add_dependency 'solidus_api', s.version