From 7d8837f58468e32f8860545d89815864cb06dc64 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:12:07 -0500 Subject: [PATCH 01/16] add webrick and rexml to gemspec, they have become standard gems, need to be specified as dependencies --- ruby-oai.gemspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruby-oai.gemspec b/ruby-oai.gemspec index 78c3909..fb39ecd 100644 --- a/ruby-oai.gemspec +++ b/ruby-oai.gemspec @@ -15,10 +15,12 @@ Gem::Specification.new do |s| s.add_dependency('builder', '>=3.1.0') s.add_dependency('faraday', "< 3") s.add_dependency("faraday-follow_redirects", ">= 0.3.0", "< 2") + s.add_dependency("rexml") # rexml becomes bundled gem in ruby 3.0 s.add_development_dependency "activerecord", ">= 5.2.0", "< 7.1" s.add_development_dependency "appraisal" + s.add_development_dependency "webrick" s.files = %w(README.md Rakefile) + From 6b0f867b246ab3d758eb7f37a7ef1f691ea840fa Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:12:54 -0500 Subject: [PATCH 02/16] remove ancient Rails 5.2 from CI, too hard to get green --- .github/workflows/ci.yml | 4 ---- Appraisals | 4 ---- gemfiles/rails_52.gemfile | 19 ------------------- 3 files changed, 27 deletions(-) delete mode 100644 gemfiles/rails_52.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a0b292..39930ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,15 +11,11 @@ jobs: matrix: ruby-version: ['2.6.9', '2.7.6', 'jruby-9.3.0.0'] gemfile: - - rails_52 - rails_60 - rails_61 include: - ruby-version: 2.7.6 gemfile: rails_70 - exclude: - - ruby-version: 2.7.6 - gemfile: rails_52 env: RAILS_ENV: test diff --git a/Appraisals b/Appraisals index 76ec6aa..5a9c6d8 100644 --- a/Appraisals +++ b/Appraisals @@ -1,9 +1,5 @@ # https://github.com/thoughtbot/appraisal -appraise "rails-52" do - gem 'activerecord', '~> 5.2.0' -end - appraise "rails-60" do gem 'activerecord', '~> 6.0.0' end diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile deleted file mode 100644 index fb6cab3..0000000 --- a/gemfiles/rails_52.gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# This file was generated by Appraisal - -source "http://rubygems.org" - -gem "jruby-openssl", platform: :jruby -gem "activerecord", "~> 5.2.0" - -group :test do - gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] - gem "libxml-ruby", platform: [:ruby, :mswin] - gem "rake" - gem "yard" - gem "redcarpet", platform: :ruby - gem "kramdown", platform: :jruby - gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin] -end - -gemspec path: "../" From 0c2bfaeb4fd6d6e9dcb8f802d39d837b7b2081c9 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:14:04 -0500 Subject: [PATCH 03/16] in old EOL rails, fix concurrent-ruby to old version required to work https://github.com/rails/rails/issues/54271 --- Appraisals | 13 +++++++++++++ gemfiles/rails_60.gemfile | 1 + gemfiles/rails_61.gemfile | 1 + gemfiles/rails_70.gemfile | 1 + gemfiles/rails_72.gemfile | 19 +++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 gemfiles/rails_72.gemfile diff --git a/Appraisals b/Appraisals index 5a9c6d8..dcefae4 100644 --- a/Appraisals +++ b/Appraisals @@ -2,12 +2,25 @@ appraise "rails-60" do gem 'activerecord', '~> 6.0.0' + + # https://github.com/rails/rails/issues/54271 + gem "concurrent-ruby", "< 1.3.5" end appraise "rails-61" do gem 'activerecord', '~> 6.1.0' + + # https://github.com/rails/rails/issues/54271 + gem "concurrent-ruby", "< 1.3.5" end appraise "rails-70" do gem 'activerecord', '~> 7.0.0' + + # https://github.com/rails/rails/issues/54271 + gem "concurrent-ruby", "< 1.3.5" +end + +appraise "rails-72" do + gem 'activerecord', '~> 7.2.0' end diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile index 964c033..ced1851 100644 --- a/gemfiles/rails_60.gemfile +++ b/gemfiles/rails_60.gemfile @@ -4,6 +4,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 6.0.0" +gem "concurrent-ruby", "< 1.3.5" group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile index c8027e0..22e5b36 100644 --- a/gemfiles/rails_61.gemfile +++ b/gemfiles/rails_61.gemfile @@ -4,6 +4,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 6.1.0" +gem "concurrent-ruby", "< 1.3.5" group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile index bdfa826..d5ad102 100644 --- a/gemfiles/rails_70.gemfile +++ b/gemfiles/rails_70.gemfile @@ -4,6 +4,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 7.0.0" +gem "concurrent-ruby", "< 1.3.5" group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] diff --git a/gemfiles/rails_72.gemfile b/gemfiles/rails_72.gemfile new file mode 100644 index 0000000..df64b9a --- /dev/null +++ b/gemfiles/rails_72.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "jruby-openssl", platform: :jruby +gem "activerecord", "~> 7.2.0" + +group :test do + gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] + gem "libxml-ruby", platform: [:ruby, :mswin] + gem "rake" + gem "yard" + gem "redcarpet", platform: :ruby + gem "kramdown", platform: :jruby + gem "test-unit" + gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin] +end + +gemspec path: "../" From b2f6c41256c6129c6dc81dc05002b5f1ff7702cd Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:23:41 -0500 Subject: [PATCH 04/16] fix to current caltech OAI uri for test that is really rudely using a live OAI server, come on, sigh --- test/client/tc_low_resolution_dates.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/client/tc_low_resolution_dates.rb b/test/client/tc_low_resolution_dates.rb index 29565c0..e835c72 100644 --- a/test/client/tc_low_resolution_dates.rb +++ b/test/client/tc_low_resolution_dates.rb @@ -2,8 +2,11 @@ class LowResolutionDatesTest < Test::Unit::TestCase + # We really should not be testing against a live OAI server, come on! + # It could go away! But I'm not sure how to make this test reasonable, + # what it's really testing. def test_low_res_date_parsing - client = OAI::Client.new 'http://authors.library.caltech.edu/cgi/oai2' + client = OAI::Client.new 'http://authors.library.caltech.edu/oai2d' date = Date.new 2003, 1, 1 From 72896d9df9e7035eafe91525d24d59694c965969 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:27:13 -0500 Subject: [PATCH 05/16] CI with Rails 7.1 --- .github/workflows/ci.yml | 4 +++- Appraisals | 4 ++-- gemfiles/rails_71.gemfile | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 gemfiles/rails_71.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39930ea..0de9c2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,13 +9,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.6.9', '2.7.6', 'jruby-9.3.0.0'] + ruby-version: ['2.7.6', 'jruby-9.3.0.0'] gemfile: - rails_60 - rails_61 include: - ruby-version: 2.7.6 gemfile: rails_70 + - ruby-version: 3.1.5 + gemfile: rails_71 env: RAILS_ENV: test diff --git a/Appraisals b/Appraisals index dcefae4..84a9008 100644 --- a/Appraisals +++ b/Appraisals @@ -21,6 +21,6 @@ appraise "rails-70" do gem "concurrent-ruby", "< 1.3.5" end -appraise "rails-72" do - gem 'activerecord', '~> 7.2.0' +appraise "rails-71" do + gem 'activerecord', '~> 7.1.0' end diff --git a/gemfiles/rails_71.gemfile b/gemfiles/rails_71.gemfile new file mode 100644 index 0000000..a56d85d --- /dev/null +++ b/gemfiles/rails_71.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "jruby-openssl", platform: :jruby +gem "activerecord", "~> 7.1.0" + +group :test do + gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] + gem "libxml-ruby", platform: [:ruby, :mswin] + gem "rake" + gem "yard" + gem "redcarpet", platform: :ruby + gem "kramdown", platform: :jruby + gem "test-unit" + gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin] +end + +gemspec path: "../" From c4c457c7c0a0f4e8ee8623d0f37459256446af4e Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:41:05 -0500 Subject: [PATCH 06/16] fix AR setup for Rails 7.2 --- test/activerecord_provider/config/connection.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/activerecord_provider/config/connection.rb b/test/activerecord_provider/config/connection.rb index d90874a..7bb5c29 100755 --- a/test/activerecord_provider/config/connection.rb +++ b/test/activerecord_provider/config/connection.rb @@ -17,10 +17,14 @@ ActiveRecord::MigrationContext.new( File.join(File.dirname(__FILE__), '..', 'database') ).migrate -else +elsif ActiveRecord.version < Gem::Version.new("7.2.0") ActiveRecord::MigrationContext.new( File.join(File.dirname(__FILE__), '..', 'database'), ActiveRecord::Base.connection.schema_migration ).migrate +else + ActiveRecord::MigrationContext.new( + File.join(File.dirname(__FILE__), '..', 'database') + ).migrate end From 38ebd6d0c8df98bced22effe761dbcd2f7837aaf Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:42:12 -0500 Subject: [PATCH 07/16] CI on Rails 7.2 --- .github/workflows/ci.yml | 3 +++ Appraisals | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0de9c2a..ea40c25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,9 @@ jobs: gemfile: rails_70 - ruby-version: 3.1.5 gemfile: rails_71 + - ruby-version: 3.2.7 + gemfile: rails_72 + env: RAILS_ENV: test diff --git a/Appraisals b/Appraisals index 84a9008..4febdbc 100644 --- a/Appraisals +++ b/Appraisals @@ -24,3 +24,8 @@ end appraise "rails-71" do gem 'activerecord', '~> 7.1.0' end + +appraise "rails-72" do + gem 'activerecord', '~> 7.2.0' +end + From ee308624d2fdd41338e055a0e73e250afe6d5d27 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:45:28 -0500 Subject: [PATCH 08/16] allow more up to date sqlite3 in testing --- Gemfile | 2 +- gemfiles/rails_60.gemfile | 2 +- gemfiles/rails_61.gemfile | 2 +- gemfiles/rails_70.gemfile | 2 +- gemfiles/rails_71.gemfile | 2 +- gemfiles/rails_72.gemfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 902e0f4..4264c6c 100644 --- a/Gemfile +++ b/Gemfile @@ -14,5 +14,5 @@ group :test do gem 'test-unit' # This version of sqlite3 oughta be good for activerecord 5.1+ hopefully - gem 'sqlite3', ">= 1.4.0", "< 2.0", :platform => [:ruby, :mswin] + gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin] end diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile index ced1851..7109d2c 100644 --- a/gemfiles/rails_60.gemfile +++ b/gemfiles/rails_60.gemfile @@ -14,7 +14,7 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin] + gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile index 22e5b36..bd07d0d 100644 --- a/gemfiles/rails_61.gemfile +++ b/gemfiles/rails_61.gemfile @@ -14,7 +14,7 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin] + gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile index d5ad102..9d8cda9 100644 --- a/gemfiles/rails_70.gemfile +++ b/gemfiles/rails_70.gemfile @@ -14,7 +14,7 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin] + gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_71.gemfile b/gemfiles/rails_71.gemfile index a56d85d..72db200 100644 --- a/gemfiles/rails_71.gemfile +++ b/gemfiles/rails_71.gemfile @@ -13,7 +13,7 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin] + gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_72.gemfile b/gemfiles/rails_72.gemfile index df64b9a..f8ec15d 100644 --- a/gemfiles/rails_72.gemfile +++ b/gemfiles/rails_72.gemfile @@ -13,7 +13,7 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 2.0", platform: [:ruby, :mswin] + gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" From 29a8de0eca28ebf7db013f8a26fd828f0a33e586 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:46:14 -0500 Subject: [PATCH 09/16] CI on Rails 8 --- Appraisals | 3 +++ gemfiles/rails_80.gemfile | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 gemfiles/rails_80.gemfile diff --git a/Appraisals b/Appraisals index 4febdbc..6054c6f 100644 --- a/Appraisals +++ b/Appraisals @@ -29,3 +29,6 @@ appraise "rails-72" do gem 'activerecord', '~> 7.2.0' end +appraise "rails-80" do + gem 'activerecord', '~> 8.0.0' +end diff --git a/gemfiles/rails_80.gemfile b/gemfiles/rails_80.gemfile new file mode 100644 index 0000000..102f3b8 --- /dev/null +++ b/gemfiles/rails_80.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "jruby-openssl", platform: :jruby +gem "activerecord", "~> 8.0.0" + +group :test do + gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] + gem "libxml-ruby", platform: [:ruby, :mswin] + gem "rake" + gem "yard" + gem "redcarpet", platform: :ruby + gem "kramdown", platform: :jruby + gem "test-unit" + gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] +end + +gemspec path: "../" From 5b6fa6c7c56b72547b25eb11cd0a1ca43853f0aa Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:46:36 -0500 Subject: [PATCH 10/16] gemspec dev dependency allow up to AR 8 --- ruby-oai.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby-oai.gemspec b/ruby-oai.gemspec index fb39ecd..026e30b 100644 --- a/ruby-oai.gemspec +++ b/ruby-oai.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.add_dependency("rexml") # rexml becomes bundled gem in ruby 3.0 - s.add_development_dependency "activerecord", ">= 5.2.0", "< 7.1" + s.add_development_dependency "activerecord", ">= 5.2.0", "< 8.1" s.add_development_dependency "appraisal" s.add_development_dependency "webrick" From 35c3ca28e5bbaa35794248df2dc51b3551756cb0 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:50:30 -0500 Subject: [PATCH 11/16] CI with jruby 9.4 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea40c25..3174f2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.7.6', 'jruby-9.3.0.0'] + ruby-version: ['2.7.6', 'jruby-9.4.11.0'] gemfile: - rails_60 - rails_61 From 4bd73d4d7f63d5816a86e31ba91bf3fb11d00e37 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:53:52 -0500 Subject: [PATCH 12/16] turn off github actions fail-fast, to make it easier to get all CI green --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3174f2b..93e4512 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,7 @@ jobs: test_matrix: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: ruby-version: ['2.7.6', 'jruby-9.4.11.0'] gemfile: From 3ed30ac378036dab9f39575c4738bac3d65cf6ec Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 19:57:43 -0500 Subject: [PATCH 13/16] test against local OAI server, not rudely against some other unreliable one on internet --- test/client/tc_low_resolution_dates.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/client/tc_low_resolution_dates.rb b/test/client/tc_low_resolution_dates.rb index e835c72..4ba7cf0 100644 --- a/test/client/tc_low_resolution_dates.rb +++ b/test/client/tc_low_resolution_dates.rb @@ -2,11 +2,8 @@ class LowResolutionDatesTest < Test::Unit::TestCase - # We really should not be testing against a live OAI server, come on! - # It could go away! But I'm not sure how to make this test reasonable, - # what it's really testing. def test_low_res_date_parsing - client = OAI::Client.new 'http://authors.library.caltech.edu/oai2d' + client = OAI::Client.new 'http://localhost:3333/oai' date = Date.new 2003, 1, 1 From 9ca2e21f183034cd4224d07957fb0d2cd4e3eb6c Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 20:01:41 -0500 Subject: [PATCH 14/16] add Rails 8.0 to CI --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93e4512..dbdbf44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,6 +21,9 @@ jobs: gemfile: rails_71 - ruby-version: 3.2.7 gemfile: rails_72 + - ruby-version: 3.3.7 + gemfile: rails_80 + env: From 47fb68327ceb582272092e6cf36b931b2129795d Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Mon, 3 Mar 2025 20:03:30 -0500 Subject: [PATCH 15/16] add Ruby 8 to CI --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbdbf44..b1f3fcc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,7 @@ jobs: + env: RAILS_ENV: test BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile From 4751042d861f294b91edc473fc16142fdf908201 Mon Sep 17 00:00:00 2001 From: Jonathan Rochkind Date: Tue, 4 Mar 2025 13:07:19 -0500 Subject: [PATCH 16/16] move sqlite3 dependency from Gemfile to Appraisals so different Rails versions can have different sqlite3 versions as required --- Appraisals | 12 ++++++++++++ Gemfile | 3 --- gemfiles/rails_60.gemfile | 2 +- gemfiles/rails_61.gemfile | 2 +- gemfiles/rails_70.gemfile | 2 +- gemfiles/rails_71.gemfile | 2 +- gemfiles/rails_72.gemfile | 2 +- gemfiles/rails_80.gemfile | 2 +- 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Appraisals b/Appraisals index 6054c6f..bb54ea1 100644 --- a/Appraisals +++ b/Appraisals @@ -5,6 +5,8 @@ appraise "rails-60" do # https://github.com/rails/rails/issues/54271 gem "concurrent-ruby", "< 1.3.5" + + gem 'sqlite3', ">= 1.4.0", "< 2", :platform => [:ruby, :mswin] end appraise "rails-61" do @@ -12,6 +14,8 @@ appraise "rails-61" do # https://github.com/rails/rails/issues/54271 gem "concurrent-ruby", "< 1.3.5" + + gem 'sqlite3', ">= 1.4.0", "< 2", :platform => [:ruby, :mswin] end appraise "rails-70" do @@ -19,16 +23,24 @@ appraise "rails-70" do # https://github.com/rails/rails/issues/54271 gem "concurrent-ruby", "< 1.3.5" + + gem 'sqlite3', ">= 1.4.0", "< 2", :platform => [:ruby, :mswin] end appraise "rails-71" do gem 'activerecord', '~> 7.1.0' + + gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin] end appraise "rails-72" do gem 'activerecord', '~> 7.2.0' + + gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin] end appraise "rails-80" do gem 'activerecord', '~> 8.0.0' + + gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin] end diff --git a/Gemfile b/Gemfile index 4264c6c..bd41bf5 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,4 @@ group :test do gem 'redcarpet', :platform => :ruby # For fast, Github-like Markdown gem 'kramdown', :platform => :jruby # For Markdown without a C compiler gem 'test-unit' - - # This version of sqlite3 oughta be good for activerecord 5.1+ hopefully - gem 'sqlite3', ">= 1.4.0", "< 3.0", :platform => [:ruby, :mswin] end diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile index 7109d2c..be6fe58 100644 --- a/gemfiles/rails_60.gemfile +++ b/gemfiles/rails_60.gemfile @@ -5,6 +5,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 6.0.0" gem "concurrent-ruby", "< 1.3.5" +gem "sqlite3", ">= 1.4.0", "< 2", platform: [:ruby, :mswin] group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] @@ -14,7 +15,6 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile index bd07d0d..690e100 100644 --- a/gemfiles/rails_61.gemfile +++ b/gemfiles/rails_61.gemfile @@ -5,6 +5,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 6.1.0" gem "concurrent-ruby", "< 1.3.5" +gem "sqlite3", ">= 1.4.0", "< 2", platform: [:ruby, :mswin] group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] @@ -14,7 +15,6 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile index 9d8cda9..690d8a2 100644 --- a/gemfiles/rails_70.gemfile +++ b/gemfiles/rails_70.gemfile @@ -5,6 +5,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 7.0.0" gem "concurrent-ruby", "< 1.3.5" +gem "sqlite3", ">= 1.4.0", "< 2", platform: [:ruby, :mswin] group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] @@ -14,7 +15,6 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_71.gemfile b/gemfiles/rails_71.gemfile index 72db200..fea207b 100644 --- a/gemfiles/rails_71.gemfile +++ b/gemfiles/rails_71.gemfile @@ -4,6 +4,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 7.1.0" +gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] @@ -13,7 +14,6 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_72.gemfile b/gemfiles/rails_72.gemfile index f8ec15d..63f6424 100644 --- a/gemfiles/rails_72.gemfile +++ b/gemfiles/rails_72.gemfile @@ -4,6 +4,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 7.2.0" +gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] @@ -13,7 +14,6 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../" diff --git a/gemfiles/rails_80.gemfile b/gemfiles/rails_80.gemfile index 102f3b8..07749a5 100644 --- a/gemfiles/rails_80.gemfile +++ b/gemfiles/rails_80.gemfile @@ -4,6 +4,7 @@ source "http://rubygems.org" gem "jruby-openssl", platform: :jruby gem "activerecord", "~> 8.0.0" +gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] group :test do gem "activerecord-jdbcsqlite3-adapter", platform: [:jruby] @@ -13,7 +14,6 @@ group :test do gem "redcarpet", platform: :ruby gem "kramdown", platform: :jruby gem "test-unit" - gem "sqlite3", ">= 1.4.0", "< 3.0", platform: [:ruby, :mswin] end gemspec path: "../"