Skip to content

Commit

Permalink
Use correct version of sqlite for different versions of Rails
Browse files Browse the repository at this point in the history
  • Loading branch information
excid3 committed May 16, 2024
1 parent 80268c7 commit 1481e15
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 18 deletions.
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
appraise "rails-6-1" do
gem "rails", "~> 6.1.0"
gem "sqlite3", "~> 1.4"
end

appraise "rails-7" do
gem "rails", "~> 7.0.0"
gem "sqlite3", "~> 1.4"
end

appraise "rails-7-1" do
gem "rails", "~> 7.1.0"
gem "sqlite3", "~> 1.4"
end

appraise "rails-main" do
gem "rails", github: "rails/rails", branch: "main"
gem "sqlite3", "~> 2.0"
end
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ gem "prawn"
# Test against different databases
gem "pg"
gem "mysql2"
gem "sqlite3", "~> 2.0.1"

# Used for the dummy Rails app integration
gem "puma"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ gem "receipts"
gem "prawn"
gem "pg"
gem "mysql2"
gem "sqlite3", "~> 2.0.1"
gem "puma"
gem "web-console", group: :development
gem "sprockets-rails"
Expand All @@ -27,5 +26,6 @@ gem "net-imap", require: false
gem "net-pop", require: false
gem "net-smtp", require: false
gem "rails", "~> 6.1.0"
gem "sqlite3", "~> 1.4"

gemspec path: "../"
9 changes: 5 additions & 4 deletions gemfiles/rails_6_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ GEM
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
mocha (2.2.0)
ruby2_keywords (>= 0.0.5)
Expand Down Expand Up @@ -230,9 +231,9 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (2.0.1-arm64-darwin)
sqlite3 (2.0.1-x86_64-darwin)
sqlite3 (2.0.1-x86_64-linux-gnu)
sqlite3 (1.7.0)
mini_portile2 (~> 2.8.0)
sqlite3 (1.7.0-arm64-darwin)
standard (1.36.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
Expand Down Expand Up @@ -304,7 +305,7 @@ DEPENDENCIES
rails (~> 6.1.0)
receipts
sprockets-rails
sqlite3 (~> 2.0.1)
sqlite3 (~> 1.4)
standard
stimulus-rails
stripe (~> 11.0)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ gem "receipts"
gem "prawn"
gem "pg"
gem "mysql2"
gem "sqlite3", "~> 2.0.1"
gem "puma"
gem "web-console", group: :development
gem "sprockets-rails"
Expand All @@ -27,5 +26,6 @@ gem "net-imap", require: false
gem "net-pop", require: false
gem "net-smtp", require: false
gem "rails", "~> 7.0.0"
gem "sqlite3", "~> 1.4"

gemspec path: "../"
9 changes: 5 additions & 4 deletions gemfiles/rails_7.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ GEM
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
mocha (2.2.0)
ruby2_keywords (>= 0.0.5)
Expand Down Expand Up @@ -236,9 +237,9 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (2.0.1-arm64-darwin)
sqlite3 (2.0.1-x86_64-darwin)
sqlite3 (2.0.1-x86_64-linux-gnu)
sqlite3 (1.7.0)
mini_portile2 (~> 2.8.0)
sqlite3 (1.7.0-arm64-darwin)
standard (1.36.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
Expand Down Expand Up @@ -310,7 +311,7 @@ DEPENDENCIES
rails (~> 7.0.0)
receipts
sprockets-rails
sqlite3 (~> 2.0.1)
sqlite3 (~> 1.4)
standard
stimulus-rails
stripe (~> 11.0)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ gem "receipts"
gem "prawn"
gem "pg"
gem "mysql2"
gem "sqlite3", "~> 2.0.1"
gem "puma"
gem "web-console", group: :development
gem "sprockets-rails"
Expand All @@ -27,5 +26,6 @@ gem "net-imap", require: false
gem "net-pop", require: false
gem "net-smtp", require: false
gem "rails", "~> 7.1.0"
gem "sqlite3", "~> 1.4"

gemspec path: "../"
9 changes: 5 additions & 4 deletions gemfiles/rails_7_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
mini_mime (1.1.5)
mini_portile2 (2.8.6)
minitest (5.23.0)
mocha (2.2.0)
ruby2_keywords (>= 0.0.5)
Expand Down Expand Up @@ -264,9 +265,9 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (2.0.1-arm64-darwin)
sqlite3 (2.0.1-x86_64-darwin)
sqlite3 (2.0.1-x86_64-linux-gnu)
sqlite3 (1.7.0)
mini_portile2 (~> 2.8.0)
sqlite3 (1.7.0-arm64-darwin)
standard (1.36.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
Expand Down Expand Up @@ -337,7 +338,7 @@ DEPENDENCIES
rails (~> 7.1.0)
receipts
sprockets-rails
sqlite3 (~> 2.0.1)
sqlite3 (~> 1.4)
standard
stimulus-rails
stripe (~> 11.0)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_main.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ gem "receipts"
gem "prawn"
gem "pg"
gem "mysql2"
gem "sqlite3", "~> 2.0.1"
gem "puma"
gem "web-console", group: :development
gem "sprockets-rails"
Expand All @@ -27,5 +26,6 @@ gem "net-imap", require: false
gem "net-pop", require: false
gem "net-smtp", require: false
gem "rails", branch: "main", git: "https://github.com/rails/rails.git"
gem "sqlite3", "~> 2.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_main.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ DEPENDENCIES
rails!
receipts
sprockets-rails
sqlite3 (~> 2.0.1)
sqlite3 (~> 2.0)
standard
stimulus-rails
stripe (~> 11.0)
Expand Down

0 comments on commit 1481e15

Please sign in to comment.