Skip to content
Closed
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
6 changes: 1 addition & 5 deletions .github/workflows/test_solidus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ jobs:
fail-fast: false
matrix:
include:
- rails: "7.0"
ruby: "3.1"
database: postgres
storage: paperclip
- rails: "7.1"
- rails: "7.2"
ruby: "3.2"
database: mysql
storage: activestorage
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gemspec require: false
if /(stable|main)/.match? ENV['RAILS_VERSION']
gem 'rails', github: 'rails', require: false, branch: ENV['RAILS_VERSION']
else
gem 'rails', ENV['RAILS_VERSION'] || ['> 7.0', '< 8.2'], require: false
gem 'rails', ENV['RAILS_VERSION'] || ['> 7.2', '< 8.2'], require: false
end
# rubocop:enable Bundler/DuplicatedGem

Expand Down
2 changes: 1 addition & 1 deletion admin/solidus_admin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Gem::Specification.new do |s|
f.match(%r{^(spec|bin)/})
end + ["app/assets/builds/solidus_admin/tailwind.css"]

s.required_ruby_version = '>= 3.1.0'
s.required_ruby_version = '>= 3.2.0'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From your PR title you just removed it from CI, but you also prevent running solidus on older Rubies with this change. Although I like the progressive nature of this, I think we should stop testing in one PR and then on another PR raise the minimum version. That way it will appear in the Changelog. A single commit in a PR does not end up on the Changleog.

@AlistairNorman AlistairNorman Jan 30, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good callout on the title. I think this belongs as one PR because we only want to remove versions from CI when we stop supporting them. That being said, you're right that the important thing to go in the changelog is that we changed the required version.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this belongs as one PR because we only want to remove versions from CI when we stop supporting them

Stop supporting the Ruby version is the same as not testing it anymore. But also raising the minimum version means it cannot be used at all anymore, what is not the same as stop supporting (aka fixing issues) it.

But I am fine with doing the Ruby version bump in the same PR as the CI change, but I still want us to split out the Rails change from this PR for visibility in the changelog.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know the distinctions. Can you explain why two pull requests are more visible than one?

s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'blueprinter'
Expand Down
2 changes: 1 addition & 1 deletion api/solidus_api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
f.match(%r{^(spec|bin)/})
end

s.required_ruby_version = '>= 3.1.0'
s.required_ruby_version = '>= 3.2.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'jbuilder', '~> 2.8'
Expand Down
6 changes: 3 additions & 3 deletions backend/solidus_backend.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
f.match(%r{^(spec|bin)/})
end

s.required_ruby_version = '>= 3.1.0'
s.required_ruby_version = '>= 3.2.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'solidus_api', s.version
Expand All @@ -32,7 +32,7 @@ Gem::Specification.new do |s|
s.add_dependency 'kaminari', '~> 1.1'
s.add_dependency 'responders'

s.add_dependency 'sprockets-rails', '!= 3.5.0'
s.add_dependency 'sassc-rails'
s.add_dependency 'handlebars_assets', '~> 0.23'
s.add_dependency 'sassc-rails'
s.add_dependency 'sprockets-rails', '!= 3.5.0'
end
2 changes: 1 addition & 1 deletion core/lib/spree/core/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module Spree

def self.solidus_version = VERSION

def self.minimum_required_rails_version = "7.0"
def self.minimum_required_rails_version = "7.2"

def self.previous_solidus_minor_version = "4.6"

Expand Down
2 changes: 1 addition & 1 deletion core/solidus_core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
f.match(%r{^(spec|bin)/})
end

s.required_ruby_version = '>= 3.1.0'
s.required_ruby_version = '>= 3.2.0'
s.required_rubygems_version = '>= 1.8.23'

%w[
Expand Down
2 changes: 1 addition & 1 deletion legacy_promotions/solidus_legacy_promotions.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
f.match(%r{^(spec|bin)/})
end

s.required_ruby_version = '>= 3.1.0'
s.required_ruby_version = '>= 3.2.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'csv', '~> 3.0'
Expand Down
2 changes: 1 addition & 1 deletion promotions/solidus_promotions.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|

spec.metadata["homepage_uri"] = spec.homepage

spec.required_ruby_version = ">= 3.1.0"
spec.required_ruby_version = ">= 3.2.0"

# Specify which files should be added to the gem when it is released.
# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
Expand Down
2 changes: 1 addition & 1 deletion sample/solidus_sample.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
f.match(%r{^(spec|script)/})
end

s.required_ruby_version = '>= 3.1.0'
s.required_ruby_version = '>= 3.2.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'solidus_core', s.version
Expand Down
2 changes: 1 addition & 1 deletion solidus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |s|

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

s.required_ruby_version = '>= 3.1.0'
s.required_ruby_version = '>= 3.2.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'solidus_api', s.version
Expand Down
2 changes: 1 addition & 1 deletion tasks/linting/wrong_migration_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

expect_offense(<<~RUBY)
class TestMigration < ActiveRecord::Migration[#{greater_than_minimum_version}]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Solidus/WrongMigrationVersion: Subclasses of ActiveRecord::Migration must use a migration version of <= 7.0
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Solidus/WrongMigrationVersion: Subclasses of ActiveRecord::Migration must use a migration version of <= 7.2
end
RUBY
end
Expand Down
Loading