From 1481e158dc5c77b0eabc56b41da4b9858639a3ad Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Thu, 16 May 2024 12:08:25 -0500 Subject: [PATCH] Use correct version of sqlite for different versions of Rails --- Appraisals | 4 ++++ Gemfile | 1 - gemfiles/rails_6_1.gemfile | 2 +- gemfiles/rails_6_1.gemfile.lock | 9 +++++---- gemfiles/rails_7.gemfile | 2 +- gemfiles/rails_7.gemfile.lock | 9 +++++---- gemfiles/rails_7_1.gemfile | 2 +- gemfiles/rails_7_1.gemfile.lock | 9 +++++---- gemfiles/rails_main.gemfile | 2 +- gemfiles/rails_main.gemfile.lock | 2 +- 10 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Appraisals b/Appraisals index 56f3b097..792a73f6 100644 --- a/Appraisals +++ b/Appraisals @@ -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 diff --git a/Gemfile b/Gemfile index 63850238..fe15b78a 100644 --- a/Gemfile +++ b/Gemfile @@ -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" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index b28d3b75..f78f64a9 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -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" @@ -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: "../" diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock index 96b1de3f..4c4d0e74 100644 --- a/gemfiles/rails_6_1.gemfile.lock +++ b/gemfiles/rails_6_1.gemfile.lock @@ -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) @@ -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) @@ -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) diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index f670450a..162c88e7 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -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" @@ -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: "../" diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index ac177e7c..f22cb869 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -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) @@ -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) @@ -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) diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index 5ee67821..e69341e1 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -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" @@ -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: "../" diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock index a26b3ec7..317d97c4 100644 --- a/gemfiles/rails_7_1.gemfile.lock +++ b/gemfiles/rails_7_1.gemfile.lock @@ -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) @@ -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) @@ -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) diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile index 625fd204..ff81cf69 100644 --- a/gemfiles/rails_main.gemfile +++ b/gemfiles/rails_main.gemfile @@ -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" @@ -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: "../" diff --git a/gemfiles/rails_main.gemfile.lock b/gemfiles/rails_main.gemfile.lock index 68125565..8c581bc8 100644 --- a/gemfiles/rails_main.gemfile.lock +++ b/gemfiles/rails_main.gemfile.lock @@ -340,7 +340,7 @@ DEPENDENCIES rails! receipts sprockets-rails - sqlite3 (~> 2.0.1) + sqlite3 (~> 2.0) standard stimulus-rails stripe (~> 11.0)