Skip to content

Commit 396668f

Browse files
committed
Use correct sqlite version for Rails < 7.2
Rails 7.2 onwards has support for sqlite 2 and this also allows sqlite >= 2.0 for Rails 8.0 tests.
1 parent 83098b0 commit 396668f

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ group :test do
2121
gem 'mysql2'
2222
gem 'pg'
2323
gem 'solidus_auth_devise'
24-
gem 'sqlite3', '~> 1.4'
24+
gem 'sqlite3', rails_version < '~> 7.2' ? '~> 1.4' : '~> 2.0'
2525
end
2626

2727
# Use a local Gemfile to include development dependencies that might not be

lib/solidus_dev_support/templates/extension/Gemfile.tt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@ else
1515
gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
1616
end
1717

18-
# Needed to help Bundler figure out how to resolve dependencies,
19-
# otherwise it takes forever to resolve them.
20-
# See https://github.com/bundler/bundler/issues/6677
21-
gem 'rails', '>0.a'
18+
rails_version = ENV.fetch('RAILS_VERSION', '~> 7.0')
19+
gem 'rails', rails_version
2220

2321
case ENV.fetch('DB', nil)
2422
when 'mysql'
2523
gem 'mysql2'
2624
when 'postgresql'
2725
gem 'pg'
2826
else
29-
gem 'sqlite3', '~> 1.4'
27+
gem 'sqlite3', rails_version < '~> 7.2' ? '~> 1.4' : '~> 2.0'
3028
end
3129

3230
if rails_version == '~> 7.0'

0 commit comments

Comments
 (0)