Skip to content

Commit 160f606

Browse files
committed
Fix sqlite3 on Ruby 2.7 on Mac
1 parent ddf8e4d commit 160f606

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Gemfile-rails-dependencies

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ def add_net_gems_dependency
1212
end
1313

1414
# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
15-
gem 'sqlite3', '~> 1.4', platforms: [:ruby]
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]
20+
end
1621

1722
if RUBY_VERSION.to_f < 2.7
1823
gem 'puma', '< 6.0.0'

example_app_generator/generate_app.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828

2929
gsub_file "Gemfile", /.*rails-controller-testing.*/, "gem 'rails-controller-testing', git: 'https://github.com/rails/rails-controller-testing'"
3030

31-
# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
32-
gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4'"
31+
# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`, and Ruby 2.7 only supports < 1.7
32+
if RUBY_VERSION.to_f < 3
33+
gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4', '< 1.7'"
34+
else
35+
gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4'"
36+
end
3337

3438
# remove webdrivers
3539
gsub_file "Gemfile", /gem ['"]webdrivers['"]/, ""

0 commit comments

Comments
 (0)