Skip to content

Commit 4f02747

Browse files
committed
Conditionally set relaxed sqlite3 dependency
1 parent e75b6f5 commit 4f02747

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

Gemfile-rails-dependencies

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ def add_net_gems_dependency
1111
end
1212
end
1313

14-
# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
15-
if RUBY_VERSION.to_f < 3
16-
# sqlite3 1.7.x doesn't work on all platforms for Ruby 2.x
17-
gem 'sqlite3', '~> 1.4', '< 1.7', platforms: [:ruby]
18-
else
19-
gem 'sqlite3', '>= 1.4', platforms: [:ruby]
14+
def add_sqlite3_gem_dependency
15+
# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
16+
if RUBY_VERSION.to_f < 3
17+
# sqlite3 1.7.x doesn't work on all platforms for Ruby 2.x
18+
gem 'sqlite3', '~> 1.4', '< 1.7', platforms: [:ruby]
19+
else
20+
gem 'sqlite3', '~> 1.4', platforms: [:ruby]
21+
end
2022
end
2123

2224
if RUBY_VERSION.to_f < 2.7
@@ -30,17 +32,22 @@ when /main/
3032
gem "rails", :git => "https://github.com/rails/rails.git"
3133
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
3234
gem 'selenium-webdriver', require: false
35+
36+
# Rails 8 requires 2.0.0
37+
gem 'sqlite3', '~> 2.0', platforms: [:ruby]
3338
when /stable$/
3439
gem_list = %w[rails railties actionmailer actionpack activerecord activesupport activejob actionview]
3540
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
3641

3742
gem_list.each do |rails_gem|
3843
gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
3944
end
45+
add_sqlite3_gem_dependency
4046
when nil, false, ""
4147
gem "rails", "~> 7.0.0"
4248
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
4349
gem 'selenium-webdriver', require: false
50+
add_sqlite3_gem_dependency
4451
else
4552
version_number = version.split(' ').last
4653
add_net_gems_dependency if version_number < '7.0'
@@ -55,4 +62,5 @@ else
5562
else
5663
gem 'selenium-webdriver', require: false
5764
end
65+
add_sqlite3_gem_dependency
5866
end

0 commit comments

Comments
 (0)