From c2bc733c02579fb8d0697cf72601f003c1bbcef6 Mon Sep 17 00:00:00 2001 From: Emily Stolfo Date: Wed, 3 Jul 2024 15:47:29 +0200 Subject: [PATCH 1/5] Require rack/chunked for versions < 3.1.0 --- spec/support/mock_intake.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/support/mock_intake.rb b/spec/support/mock_intake.rb index 486a85a84..a0af9a4b3 100644 --- a/spec/support/mock_intake.rb +++ b/spec/support/mock_intake.rb @@ -19,7 +19,7 @@ require 'json' require 'timeout' -require 'rack/chunked' +require 'rack/chunked' if ::Rack.release < '3.1.0' class MockIntake def initialize From 8b8e4b00904d0edf8e47607b214450ae5c5527a1 Mon Sep 17 00:00:00 2001 From: Emily Stolfo Date: Tue, 24 Sep 2024 12:17:32 +0200 Subject: [PATCH 2/5] Use sqlite3 2 for rails >= 6 and Ruby > 2.7 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 19f70996a..21a1aca73 100644 --- a/Gemfile +++ b/Gemfile @@ -128,7 +128,7 @@ elsif frameworks_versions['rails'] =~ /^(4|5)/ elsif RUBY_VERSION < '2.7' gem 'sqlite3', '~> 1.4.4' else - gem 'sqlite3' + gem 'sqlite3', '~> 2.0' end # sneakers main only supports >=2.5.0 From e6eed1b827fb5b3e026b11dc959a8d2273ec2711 Mon Sep 17 00:00:00 2001 From: Emily Stolfo Date: Tue, 24 Sep 2024 12:21:08 +0200 Subject: [PATCH 3/5] Use sqlite3 < 2 for ruby 2.7 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 21a1aca73..ce5c5ab6b 100644 --- a/Gemfile +++ b/Gemfile @@ -125,7 +125,7 @@ if RUBY_PLATFORM == 'java' end elsif frameworks_versions['rails'] =~ /^(4|5)/ gem 'sqlite3', '~> 1.3.6' -elsif RUBY_VERSION < '2.7' +elsif RUBY_VERSION <= '2.7' gem 'sqlite3', '~> 1.4.4' else gem 'sqlite3', '~> 2.0' From 705371bb2e0b53c0b36ae08aef4db80e03edd07c Mon Sep 17 00:00:00 2001 From: Emily Stolfo Date: Tue, 24 Sep 2024 12:24:52 +0200 Subject: [PATCH 4/5] Switch logic --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index ce5c5ab6b..17393025a 100644 --- a/Gemfile +++ b/Gemfile @@ -123,10 +123,10 @@ if RUBY_PLATFORM == 'java' else gem 'activerecord-jdbcsqlite3-adapter', "~> #{rails.tr('.', '')}.0" end -elsif frameworks_versions['rails'] =~ /^(4|5)/ - gem 'sqlite3', '~> 1.3.6' elsif RUBY_VERSION <= '2.7' gem 'sqlite3', '~> 1.4.4' +elsif frameworks_versions['rails'] =~ /^(4|5)/ + gem 'sqlite3', '~> 1.3.6' else gem 'sqlite3', '~> 2.0' end From 913188c73b9da3746228eaa4ac72b150750c467f Mon Sep 17 00:00:00 2001 From: Emily Stolfo Date: Tue, 24 Sep 2024 15:06:56 +0200 Subject: [PATCH 5/5] Check if Ruby < 3.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 17393025a..68ec2043b 100644 --- a/Gemfile +++ b/Gemfile @@ -123,7 +123,7 @@ if RUBY_PLATFORM == 'java' else gem 'activerecord-jdbcsqlite3-adapter', "~> #{rails.tr('.', '')}.0" end -elsif RUBY_VERSION <= '2.7' +elsif RUBY_VERSION < '3.0' gem 'sqlite3', '~> 1.4.4' elsif frameworks_versions['rails'] =~ /^(4|5)/ gem 'sqlite3', '~> 1.3.6'