From 5c8a2098115ff075c10b9b837bd42551e8496b6d Mon Sep 17 00:00:00 2001 From: Aaron Averbuch <10715707+ahaverbuch@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:09:34 -0400 Subject: [PATCH] bump ruby and bundler support to 3.X.* (#36) * bump ruby and bundler support to 3.X.* * bump to stator 0.6.0 --- .github/workflows/build.yml | 4 +- .ruby-version | 2 +- Appraisals | 11 ---- gemfiles/activerecord_5.1.gemfile | 11 ---- gemfiles/activerecord_5.1.gemfile.lock | 70 -------------------------- gemfiles/activerecord_5.2.gemfile | 11 ---- gemfiles/activerecord_5.2.gemfile.lock | 70 -------------------------- gemfiles/activerecord_6.0.gemfile.lock | 56 ++++++++++----------- gemfiles/activerecord_6.1.gemfile.lock | 56 ++++++++++----------- gemfiles/activerecord_7.0.gemfile.lock | 54 ++++++++++---------- lib/stator/version.rb | 2 +- 11 files changed, 86 insertions(+), 261 deletions(-) delete mode 100644 gemfiles/activerecord_5.1.gemfile delete mode 100644 gemfiles/activerecord_5.1.gemfile.lock delete mode 100644 gemfiles/activerecord_5.2.gemfile delete mode 100644 gemfiles/activerecord_5.2.gemfile.lock diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52f8ea8..8ec98d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,11 +10,9 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: [2.7.8] + ruby-version: [3.0] experimental: [false] include: - - ruby-version: 3.0 - experimental: true - ruby-version: 3.1 experimental: true - ruby-version: 3.2 diff --git a/.ruby-version b/.ruby-version index 6a81b4c..5ae69bd 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.2.5 diff --git a/Appraisals b/Appraisals index 87531a1..6e4a1bf 100644 --- a/Appraisals +++ b/Appraisals @@ -1,14 +1,3 @@ -# Rails <= 5.2 is not compatible with Ruby > 2.7 -if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.7") - appraise "activerecord-5.1" do - gem "activerecord", "~> 5.1.0" - end - - appraise "activerecord-5.2" do - gem "activerecord", "~> 5.2.0" - end -end - appraise "activerecord-6.0" do gem "activerecord", "~> 6.0.0" end diff --git a/gemfiles/activerecord_5.1.gemfile b/gemfiles/activerecord_5.1.gemfile deleted file mode 100644 index b428ab4..0000000 --- a/gemfiles/activerecord_5.1.gemfile +++ /dev/null @@ -1,11 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903" -gem "activerecord-nulldb-adapter" -gem "rake" -gem "rspec" -gem "activerecord", "~> 5.1.0" - -gemspec path: "../" diff --git a/gemfiles/activerecord_5.1.gemfile.lock b/gemfiles/activerecord_5.1.gemfile.lock deleted file mode 100644 index 8e3a8cc..0000000 --- a/gemfiles/activerecord_5.1.gemfile.lock +++ /dev/null @@ -1,70 +0,0 @@ -GIT - remote: https://github.com/thoughtbot/appraisal.git - revision: b200e636903700098bef25f4f51dbc4c46e4c04c - ref: b200e636903 - specs: - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - -PATH - remote: .. - specs: - stator (0.5.0) - activerecord (>= 5.1) - -GEM - remote: https://rubygems.org/ - specs: - activemodel (5.1.7) - activesupport (= 5.1.7) - activerecord (5.1.7) - activemodel (= 5.1.7) - activesupport (= 5.1.7) - arel (~> 8.0) - activerecord-nulldb-adapter (0.4.0) - activerecord (>= 2.0.0) - activesupport (5.1.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (8.0.0) - concurrent-ruby (1.1.10) - diff-lcs (1.5.0) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - minitest (5.16.2) - rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - thor (1.2.2) - thread_safe (0.3.6) - tzinfo (1.2.10) - thread_safe (~> 0.1) - -PLATFORMS - ruby - -DEPENDENCIES - activerecord (~> 5.1.0) - activerecord-nulldb-adapter - appraisal! - rake - rspec - stator! - -BUNDLED WITH - 2.4.14 diff --git a/gemfiles/activerecord_5.2.gemfile b/gemfiles/activerecord_5.2.gemfile deleted file mode 100644 index 9898dcf..0000000 --- a/gemfiles/activerecord_5.2.gemfile +++ /dev/null @@ -1,11 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903" -gem "activerecord-nulldb-adapter" -gem "rake" -gem "rspec" -gem "activerecord", "~> 5.2.0" - -gemspec path: "../" diff --git a/gemfiles/activerecord_5.2.gemfile.lock b/gemfiles/activerecord_5.2.gemfile.lock deleted file mode 100644 index 68fc98a..0000000 --- a/gemfiles/activerecord_5.2.gemfile.lock +++ /dev/null @@ -1,70 +0,0 @@ -GIT - remote: https://github.com/thoughtbot/appraisal.git - revision: b200e636903700098bef25f4f51dbc4c46e4c04c - ref: b200e636903 - specs: - appraisal (2.4.1) - bundler - rake - thor (>= 0.14.0) - -PATH - remote: .. - specs: - stator (0.5.0) - activerecord (>= 5.1) - -GEM - remote: https://rubygems.org/ - specs: - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) - activerecord-nulldb-adapter (0.8.0) - activerecord (>= 5.2.0, < 7.1) - activesupport (5.2.8.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (9.0.0) - concurrent-ruby (1.1.10) - diff-lcs (1.5.0) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - minitest (5.16.2) - rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - thor (1.2.2) - thread_safe (0.3.6) - tzinfo (1.2.10) - thread_safe (~> 0.1) - -PLATFORMS - ruby - -DEPENDENCIES - activerecord (~> 5.2.0) - activerecord-nulldb-adapter - appraisal! - rake - rspec - stator! - -BUNDLED WITH - 2.4.14 diff --git a/gemfiles/activerecord_6.0.gemfile.lock b/gemfiles/activerecord_6.0.gemfile.lock index e6d3ee1..2f8d471 100644 --- a/gemfiles/activerecord_6.0.gemfile.lock +++ b/gemfiles/activerecord_6.0.gemfile.lock @@ -17,43 +17,43 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (6.0.5.1) - activesupport (= 6.0.5.1) - activerecord (6.0.5.1) - activemodel (= 6.0.5.1) - activesupport (= 6.0.5.1) - activerecord-nulldb-adapter (0.8.0) - activerecord (>= 5.2.0, < 7.1) - activesupport (6.0.5.1) + activemodel (6.0.6.1) + activesupport (= 6.0.6.1) + activerecord (6.0.6.1) + activemodel (= 6.0.6.1) + activesupport (= 6.0.6.1) + activerecord-nulldb-adapter (1.0.1) + activerecord (>= 5.2.0, < 7.2) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - concurrent-ruby (1.1.10) - diff-lcs (1.5.0) - i18n (1.12.0) + concurrent-ruby (1.3.3) + diff-lcs (1.5.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.16.2) - rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + minitest (5.24.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - thor (1.2.2) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + thor (1.3.1) thread_safe (0.3.6) - tzinfo (1.2.10) + tzinfo (1.2.11) thread_safe (~> 0.1) - zeitwerk (2.6.0) + zeitwerk (2.6.17) PLATFORMS ruby @@ -67,4 +67,4 @@ DEPENDENCIES stator! BUNDLED WITH - 2.4.14 + 2.5.17 diff --git a/gemfiles/activerecord_6.1.gemfile.lock b/gemfiles/activerecord_6.1.gemfile.lock index cf89d21..8013636 100644 --- a/gemfiles/activerecord_6.1.gemfile.lock +++ b/gemfiles/activerecord_6.1.gemfile.lock @@ -17,42 +17,42 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (6.1.6.1) - activesupport (= 6.1.6.1) - activerecord (6.1.6.1) - activemodel (= 6.1.6.1) - activesupport (= 6.1.6.1) - activerecord-nulldb-adapter (0.8.0) - activerecord (>= 5.2.0, < 7.1) - activesupport (6.1.6.1) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activerecord (6.1.7.8) + activemodel (= 6.1.7.8) + activesupport (= 6.1.7.8) + activerecord-nulldb-adapter (1.0.1) + activerecord (>= 5.2.0, < 7.2) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - concurrent-ruby (1.1.10) - diff-lcs (1.5.0) - i18n (1.12.0) + concurrent-ruby (1.3.3) + diff-lcs (1.5.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.16.2) - rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + minitest (5.24.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - thor (1.2.2) - tzinfo (2.0.5) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + thor (1.3.1) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.0) + zeitwerk (2.6.17) PLATFORMS ruby @@ -66,4 +66,4 @@ DEPENDENCIES stator! BUNDLED WITH - 2.4.14 + 2.5.17 diff --git a/gemfiles/activerecord_7.0.gemfile.lock b/gemfiles/activerecord_7.0.gemfile.lock index e6d0207..e77213b 100644 --- a/gemfiles/activerecord_7.0.gemfile.lock +++ b/gemfiles/activerecord_7.0.gemfile.lock @@ -17,39 +17,39 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (7.0.3.1) - activesupport (= 7.0.3.1) - activerecord (7.0.3.1) - activemodel (= 7.0.3.1) - activesupport (= 7.0.3.1) - activerecord-nulldb-adapter (0.8.0) - activerecord (>= 5.2.0, < 7.1) - activesupport (7.0.3.1) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) + activerecord-nulldb-adapter (1.0.1) + activerecord (>= 5.2.0, < 7.2) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - concurrent-ruby (1.1.10) - diff-lcs (1.5.0) - i18n (1.12.0) + concurrent-ruby (1.3.3) + diff-lcs (1.5.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.16.2) - rake (13.0.6) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + minitest (5.24.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - thor (1.2.2) - tzinfo (2.0.5) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + thor (1.3.1) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) PLATFORMS @@ -64,4 +64,4 @@ DEPENDENCIES stator! BUNDLED WITH - 2.4.14 + 2.5.17 diff --git a/lib/stator/version.rb b/lib/stator/version.rb index 530720e..f3ac269 100644 --- a/lib/stator/version.rb +++ b/lib/stator/version.rb @@ -3,7 +3,7 @@ module Stator MAJOR = 0 - MINOR = 5 + MINOR = 6 PATCH = 0 PRERELEASE = nil