From 42069435ebc9562a8cc9d1be4fd3f899ecd2ba1e Mon Sep 17 00:00:00 2001 From: Anton Sokolov Date: Thu, 23 Oct 2025 00:20:32 +0800 Subject: [PATCH 1/3] Update Ruby version and dependencies to latest patch levels Upgraded Ruby from 3.4.5 to 3.4.7 and updated related dependencies in lockfiles and configuration. Includes improvements to gem versions such as `activesupport` (8.0.3), `rubocop` (1.81.6), `json` (2.15.1), and others for better compatibility, security, and performance enhancements. --- .ruby-version | 2 +- .tool-versions | 2 +- Gemfile.lock | 52 +++++++++---------- spec/examples/usual/example3/language_spec.rb | 20 +++---- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4f5e697..2aa5131 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.5 +3.4.7 diff --git a/.tool-versions b/.tool-versions index 27a8619..3f03c7a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.4.5 +ruby 3.4.7 diff --git a/Gemfile.lock b/Gemfile.lock index 35bf9f8..0ef8328 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,7 +11,7 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (8.0.2.1) + activesupport (8.0.3) base64 benchmark (>= 0.3) bigdecimal @@ -30,46 +30,46 @@ GEM thor (>= 0.14.0) ast (2.4.3) base64 (0.3.0) - benchmark (0.4.1) - bigdecimal (3.2.2) + benchmark (0.5.0) + bigdecimal (3.3.1) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.4) diff-lcs (1.6.2) drb (2.2.3) i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.13.2) + json (2.15.1) language_server-protocol (3.17.0.5) lint_roller (1.1.0) logger (1.7.0) - minitest (5.25.5) + minitest (5.26.0) mutex_m (0.3.0) parallel (1.27.0) parser (3.3.9.0) ast (~> 2.4.1) racc - prism (1.4.0) + prism (1.6.0) racc (1.8.1) - rack (3.2.0) + rack (3.2.3) rainbow (3.1.1) rake (13.3.0) - rbs (3.9.4) + rbs (3.9.5) logger - regexp_parser (2.11.2) - rspec (3.13.1) + regexp_parser (2.11.3) + rspec (3.13.2) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.5) + rspec-core (3.13.6) rspec-support (~> 3.13.0) rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.5) + rspec-mocks (3.13.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.5) - rubocop (1.80.0) + rspec-support (3.13.6) + rubocop (1.81.6) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -77,20 +77,20 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.46.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.46.0) + rubocop-ast (1.47.1) parser (>= 3.3.7.2) prism (~> 1.4) rubocop-factory_bot (2.27.1) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) - rubocop-performance (1.25.0) + rubocop-performance (1.26.1) lint_roller (~> 1.1) rubocop (>= 1.75.0, < 2.0) - rubocop-ast (>= 1.38.0, < 2.0) - rubocop-rails (2.33.3) + rubocop-ast (>= 1.47.1, < 2.0) + rubocop-rails (2.33.4) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) @@ -99,7 +99,7 @@ GEM rubocop-rake (0.7.1) lint_roller (~> 1.1) rubocop (>= 1.72.1) - rubocop-rspec (3.6.0) + rubocop-rspec (3.7.0) lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec_rails (2.31.0) @@ -128,10 +128,10 @@ GEM thor (1.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (3.1.5) - unicode-emoji (~> 4.0, >= 4.0.4) - unicode-emoji (4.0.4) - uri (1.0.3) + unicode-display_width (3.2.0) + unicode-emoji (~> 4.1) + unicode-emoji (4.1.0) + uri (1.0.4) zeitwerk (2.7.3) PLATFORMS @@ -156,4 +156,4 @@ DEPENDENCIES servactory-rubocop (>= 0.9) BUNDLED WITH - 2.7.1 + 2.7.2 diff --git a/spec/examples/usual/example3/language_spec.rb b/spec/examples/usual/example3/language_spec.rb index 0236576..1200995 100644 --- a/spec/examples/usual/example3/language_spec.rb +++ b/spec/examples/usual/example3/language_spec.rb @@ -78,7 +78,7 @@ let(:current_version) do Usual::Example3::Version.new( - name: "3.4.5" + name: "3.4.7" ) end @@ -104,7 +104,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", current: { - name: "3.4.5" + name: "3.4.7" } } end @@ -138,7 +138,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.4.5", + name: "3.4.7", releasedAt: nil, endedAt: nil }, @@ -162,7 +162,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.4.5", + name: "3.4.7", releasedAt: nil, endedAt: nil }, @@ -192,7 +192,7 @@ let(:current_version) do Usual::Example3::Version.new( - name: "3.4.5" + name: "3.4.7" ) end @@ -222,7 +222,7 @@ let(:current_version) do { - name: "3.4.5" + name: "3.4.7" } end @@ -289,7 +289,7 @@ let(:current_version) do Usual::Example3::Version.deserialization.new( - name: "3.4.5" + name: "3.4.7" ) end @@ -315,7 +315,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.4.5" + name: "3.4.7" } } end @@ -342,7 +342,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.4.5" + name: "3.4.7" } }.to_json end @@ -356,7 +356,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.4.5" + name: "3.4.7" } }.to_json end From 14beca744785475fbf6d81d784b33306d0e7691d Mon Sep 17 00:00:00 2001 From: Anton Sokolov Date: Thu, 23 Oct 2025 00:23:29 +0800 Subject: [PATCH 2/3] Add support for Rails 8.1 and update dependency constraints - Introduced `rails_8.1.gemfile` for compatibility with Rails 8.1. - Updated `activesupport` dependency in the gemspec to allow versions `>= 5.1`. - Modified appraisals to include testing for Rails 8.1. - Adjusted `Gemfile.lock` to reflect new `activesupport` constraint changes. --- Appraisals | 4 ++++ Gemfile.lock | 2 +- datory.gemspec | 2 +- gemfiles/rails_8.1.gemfile | 9 +++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gemfiles/rails_8.1.gemfile diff --git a/Appraisals b/Appraisals index 75cacb6..eab73af 100644 --- a/Appraisals +++ b/Appraisals @@ -34,3 +34,7 @@ end appraise "rails-8.0" do gem "activesupport", "~> 8.0.0" end + +appraise "rails-8.1" do + gem "activesupport", "~> 8.1.0" +end diff --git a/Gemfile.lock b/Gemfile.lock index 0ef8328..f26b243 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: datory (2.2.4) - activesupport (>= 5.1, < 8.1) + activesupport (>= 5.1) i18n (>= 1.14) servactory (>= 2.16) terminal-table (>= 3.0) diff --git a/datory.gemspec b/datory.gemspec index 16dca2e..01ea674 100644 --- a/datory.gemspec +++ b/datory.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = Gem::Requirement.new(">= 3.2") - spec.add_dependency "activesupport", ">= 5.1", "< 8.1" + spec.add_dependency "activesupport", ">= 5.1" spec.add_dependency "i18n", ">= 1.14" spec.add_dependency "servactory", ">= 2.16" spec.add_dependency "terminal-table", ">= 3.0" diff --git a/gemfiles/rails_8.1.gemfile b/gemfiles/rails_8.1.gemfile new file mode 100644 index 0000000..890e279 --- /dev/null +++ b/gemfiles/rails_8.1.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activesupport", "~> 8.1.0" + +gemspec path: "../" From 0788f71c2e7c62c59ddb1ed16bbc3495c8403c51 Mon Sep 17 00:00:00 2001 From: Anton Sokolov Date: Thu, 23 Oct 2025 00:44:26 +0800 Subject: [PATCH 3/3] Add Rails 8.1 to GitHub Actions test matrix - Included `rails_8.1` in the test matrix of the GitHub Actions workflow. - Ensures compatibility testing for the latest Rails version alongside existing configurations. --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 19b38eb..029c35d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,6 +28,7 @@ jobs: - rails_7.1 - rails_7.2 - rails_8.0 + - rails_8.1 ruby-version: - "3.2" - "3.3"