From 80e4d3d0c91e3f31df234fae8807dc183932badc Mon Sep 17 00:00:00 2001 From: Samuel Sieg Date: Tue, 17 Dec 2024 09:42:55 +0100 Subject: [PATCH 1/5] Add support for Rails 7.2 --- .github/workflows/kari.yml | 2 +- Appraisals | 4 ++++ gemfiles/rails_7_2.gemfile | 9 +++++++++ kari.gemspec | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gemfiles/rails_7_2.gemfile diff --git a/.github/workflows/kari.yml b/.github/workflows/kari.yml index 65b8031..b335c11 100644 --- a/.github/workflows/kari.yml +++ b/.github/workflows/kari.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - gemfile: [ rails_6_1, rails_7_0, rails_7_1 ] + gemfile: [ rails_6_1, rails_7_0, rails_7_1, rails_7_2 ] ruby: [ 2.7, 3.1, 3.2 ] env: diff --git a/Appraisals b/Appraisals index 661f21c..6ad3247 100644 --- a/Appraisals +++ b/Appraisals @@ -11,3 +11,7 @@ end appraise "rails-7-1" do gem "rails", "~> 7.1" end + +appraise "rails-7-2" do + gem "rails", "~> 7.2" +end diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile new file mode 100644 index 0000000..f475979 --- /dev/null +++ b/gemfiles/rails_7_2.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 7.2" + +gemspec path: "../" diff --git a/kari.gemspec b/kari.gemspec index 87cbbef..629283b 100644 --- a/kari.gemspec +++ b/kari.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "pg", "~> 1.2" - spec.add_dependency "rails", ">= 6.1", "< 7.2" + spec.add_dependency "rails", ">= 6.1", "< 8.0" spec.add_development_dependency "appraisal", "~> 2.4" spec.add_development_dependency "rake", "~> 13.0" From e93d25a05196ed369f3886ba8b50b7a787f6577e Mon Sep 17 00:00:00 2001 From: Samuel Sieg Date: Tue, 17 Dec 2024 09:47:53 +0100 Subject: [PATCH 2/5] Remove Ruby 2.7, add 3.3 --- .github/workflows/kari.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kari.yml b/.github/workflows/kari.yml index b335c11..e12eb96 100644 --- a/.github/workflows/kari.yml +++ b/.github/workflows/kari.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: gemfile: [ rails_6_1, rails_7_0, rails_7_1, rails_7_2 ] - ruby: [ 2.7, 3.1, 3.2 ] + ruby: [ 3.1, 3.2, 3.3 ] env: DATABASE_URL: postgres://postgres:postgres@localhost:5432 From 1e9c08602f2edcead593f793efa160227db56774 Mon Sep 17 00:00:00 2001 From: Samuel Sieg Date: Tue, 17 Dec 2024 09:53:10 +0100 Subject: [PATCH 3/5] Explicitly require ostruct --- spec/unit/kari/extensions/schema_dumper_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/unit/kari/extensions/schema_dumper_spec.rb b/spec/unit/kari/extensions/schema_dumper_spec.rb index 301716a..7ef18c9 100644 --- a/spec/unit/kari/extensions/schema_dumper_spec.rb +++ b/spec/unit/kari/extensions/schema_dumper_spec.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "spec_helper" +require "ostruct" RSpec.describe Kari::Extensions::SchemaDumper do class MySchemaDumper From de0e9af8050b17e70e5fd88fc2dc7b75367f48b1 Mon Sep 17 00:00:00 2001 From: Samuel Sieg Date: Tue, 17 Dec 2024 10:16:18 +0100 Subject: [PATCH 4/5] Update dependencies --- kari.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kari.gemspec b/kari.gemspec index 629283b..5cb8aa1 100644 --- a/kari.gemspec +++ b/kari.gemspec @@ -32,9 +32,9 @@ Gem::Specification.new do |spec| spec.add_dependency "pg", "~> 1.2" spec.add_dependency "rails", ">= 6.1", "< 8.0" - spec.add_development_dependency "appraisal", "~> 2.4" + spec.add_development_dependency "appraisal", "~> 2.5" spec.add_development_dependency "rake", "~> 13.0" - spec.add_development_dependency "rspec-rails", "~> 4.0" + spec.add_development_dependency "rspec-rails", "~> 7.0" spec.add_development_dependency "rubocop", "~> 1.21" spec.add_development_dependency "rubocop-rails", "~> 2.16" spec.add_development_dependency "rubocop-rspec", "~> 2.13" From 12f1c077a655f492ea7d0448ff3f38eecbd1289a Mon Sep 17 00:00:00 2001 From: Samuel Sieg Date: Tue, 17 Dec 2024 10:22:52 +0100 Subject: [PATCH 5/5] Remove Rails 6.1 support --- .github/workflows/kari.yml | 2 +- Appraisals | 4 ---- gemfiles/rails_6_1.gemfile | 9 --------- kari.gemspec | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 gemfiles/rails_6_1.gemfile diff --git a/.github/workflows/kari.yml b/.github/workflows/kari.yml index e12eb96..d113c13 100644 --- a/.github/workflows/kari.yml +++ b/.github/workflows/kari.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - gemfile: [ rails_6_1, rails_7_0, rails_7_1, rails_7_2 ] + gemfile: [ rails_7_0, rails_7_1, rails_7_2 ] ruby: [ 3.1, 3.2, 3.3 ] env: diff --git a/Appraisals b/Appraisals index 6ad3247..9e69945 100644 --- a/Appraisals +++ b/Appraisals @@ -1,9 +1,5 @@ # frozen_string_literal: true -appraise "rails-6-1" do - gem "rails", "~> 6.1" -end - appraise "rails-7-0" do gem "rails", "~> 7.0" end diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile deleted file mode 100644 index 742bf67..0000000 --- a/gemfiles/rails_6_1.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 6.1" - -gemspec path: "../" diff --git a/kari.gemspec b/kari.gemspec index 5cb8aa1..e7f31e4 100644 --- a/kari.gemspec +++ b/kari.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "pg", "~> 1.2" - spec.add_dependency "rails", ">= 6.1", "< 8.0" + spec.add_dependency "rails", ">= 7.0", "< 8.0" spec.add_development_dependency "appraisal", "~> 2.5" spec.add_development_dependency "rake", "~> 13.0"