From 40ae95f7cbc78f716ebd748b9e491aef138739f8 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 30 Sep 2024 21:27:08 +0700 Subject: [PATCH] Add support for Rails 8.0 and update dependencies Introduced a new gemfile for Rails 8.0 and updated the minimum required versions of several dependencies, including ActiveSupport and servactory. Adjusted version numbers across multiple files and included the new Rails 8.0 configuration in the GitHub Actions workflow. --- .github/workflows/test.yml | 4 ++ .rubocop.yml | 2 +- .ruby-version | 2 +- .tool-versions | 2 +- Gemfile.lock | 59 +++++++++---------- datory.gemspec | 4 +- gemfiles/rails_8.0.gemfile | 9 +++ spec/examples/usual/example3/language_spec.rb | 20 +++---- 8 files changed, 56 insertions(+), 46 deletions(-) create mode 100644 gemfiles/rails_8.0.gemfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e326178..e0655bf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,10 +38,14 @@ jobs: - rails_7.0 - rails_7.1 - rails_7.2 + - rails_8.0 ruby-version: - "3.1" - "3.2" - "3.3" + exclude: + - gemfile: rails_8.0 + ruby-version: "3.1" steps: - uses: actions/checkout@v4 diff --git a/.rubocop.yml b/.rubocop.yml index 96aba18..5791cd7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,7 +5,7 @@ require: AllCops: NewCops: enable - TargetRubyVersion: 3.3.1 + TargetRubyVersion: 3.3.5 Gemspec/DevelopmentDependencies: Enabled: pending diff --git a/.ruby-version b/.ruby-version index bea438e..fa7adc7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.1 +3.3.5 diff --git a/.tool-versions b/.tool-versions index 51f617d..1dd1998 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.3.1 +ruby 3.3.5 diff --git a/Gemfile.lock b/Gemfile.lock index 7df1045..66e394a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,16 +2,15 @@ PATH remote: . specs: datory (2.2.0.rc1) - activesupport (>= 5.1, < 8.0) + activesupport (>= 5.1, < 8.1) i18n (~> 1.14) - servactory (= 2.9.0.rc3) + servactory (>= 2.9.0.rc4) terminal-table (>= 3.0) zeitwerk (~> 2.6) GEM remote: https://rubygems.org/ specs: - abbrev (0.1.2) activesupport (7.2.1) base64 bigdecimal @@ -40,71 +39,69 @@ GEM language_server-protocol (3.17.0.3) logger (1.6.1) minitest (5.25.1) - parallel (1.24.0) - parser (3.3.0.5) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc - racc (1.7.3) + racc (1.8.1) rainbow (3.1.1) rake (13.2.1) - rbs (3.4.4) - abbrev - regexp_parser (2.9.0) - rexml (3.2.6) + rbs (3.6.0) + logger + regexp_parser (2.9.2) 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-core (3.13.1) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) - rubocop (1.63.1) + rubocop (1.66.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) - rubocop-capybara (2.20.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-performance (1.21.0) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.1) + rubocop-rspec (2.31.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.3) - rubocop (~> 1.40) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) - servactory (2.9.0.rc3) - activesupport (>= 5.1, < 8.0) + servactory (2.9.0.rc4) + activesupport (>= 5.1, < 8.1) i18n (~> 1.14) zeitwerk (~> 2.6) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) zeitwerk (2.6.18) PLATFORMS @@ -123,4 +120,4 @@ DEPENDENCIES rubocop-rspec (~> 2.24) BUNDLED WITH - 2.5.9 + 2.5.20 diff --git a/datory.gemspec b/datory.gemspec index 8c28c58..1f9946d 100644 --- a/datory.gemspec +++ b/datory.gemspec @@ -29,9 +29,9 @@ Gem::Specification.new do |spec| spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0") # rubocop:disable Gemspec/RequiredRubyVersion - spec.add_runtime_dependency "activesupport", ">= 5.1", "< 8.0" + spec.add_runtime_dependency "activesupport", ">= 5.1", "< 8.1" spec.add_runtime_dependency "i18n", "~> 1.14" - spec.add_runtime_dependency "servactory", "2.9.0.rc3" + spec.add_runtime_dependency "servactory", ">= 2.9.0.rc4" spec.add_runtime_dependency "terminal-table", ">= 3.0" spec.add_runtime_dependency "zeitwerk", "~> 2.6" diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile new file mode 100644 index 0000000..7c2a78e --- /dev/null +++ b/gemfiles/rails_8.0.gemfile @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activesupport", "~> 7.2.0" + +gemspec path: "../" diff --git a/spec/examples/usual/example3/language_spec.rb b/spec/examples/usual/example3/language_spec.rb index fb5da41..d4425cb 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.3.1" + name: "3.3.5" ) end @@ -104,7 +104,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", current: { - name: "3.3.1" + name: "3.3.5" } } end @@ -138,7 +138,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.3.1", + name: "3.3.5", releasedAt: nil, endedAt: nil }, @@ -162,7 +162,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.3.1", + name: "3.3.5", releasedAt: nil, endedAt: nil }, @@ -192,7 +192,7 @@ let(:current_version) do Usual::Example3::Version.new( - name: "3.3.1" + name: "3.3.5" ) end @@ -222,7 +222,7 @@ let(:current_version) do { - name: "3.3.1" + name: "3.3.5" } end @@ -289,7 +289,7 @@ let(:current_version) do Usual::Example3::Version.deserialization.new( - name: "3.3.1" + name: "3.3.5" ) end @@ -315,7 +315,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.3.1" + name: "3.3.5" } } end @@ -342,7 +342,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.3.1" + name: "3.3.5" } }.to_json end @@ -356,7 +356,7 @@ id: "73031620-be3b-4088-9a78-5589ff7e1f61", name: "Ruby", currentVersion: { - name: "3.3.1" + name: "3.3.5" } }.to_json end