From 2f43e7e8a10b58fe168c63232694c0a193bc334b Mon Sep 17 00:00:00 2001 From: Andrei Subbota Date: Thu, 22 May 2025 23:08:24 +0200 Subject: [PATCH 1/3] Remove ruby-head version from test matrix --- .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 0bc694b..e220e67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: needs: ['rubocop'] strategy: matrix: - ruby-version: ['3.0', '3.1', '3.2', '3.3', 'head'] + ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4'] steps: - name: Check out branch uses: actions/checkout@v4 From ac8c20d2afb32df049cc86ef8b33c2e6a4e0f4fe Mon Sep 17 00:00:00 2001 From: Andrei Subbota Date: Thu, 22 May 2025 23:18:45 +0200 Subject: [PATCH 2/3] Fix rubocop offenses --- bench/serializing.rb | 4 ++-- grape-entity.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bench/serializing.rb b/bench/serializing.rb index 6078654..6ffa256 100644 --- a/bench/serializing.rb +++ b/bench/serializing.rb @@ -35,7 +35,7 @@ class Teacher < Models::Person attr_accessor :tenure def initialize(opts = {}) - super(opts) + super @tenure = opts[:tenure] end end @@ -44,7 +44,7 @@ class Student < Models::Person attr_reader :grade def initialize(opts = {}) - super(opts) + super @grade = opts[:grade] end end diff --git a/grape-entity.gemspec b/grape-entity.gemspec index 66e0f00..3dc3d8e 100644 --- a/grape-entity.gemspec +++ b/grape-entity.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 3.0' - s.add_runtime_dependency 'activesupport', '>= 3.0.0' + s.add_dependency 'activesupport', '>= 3.0.0' s.files = `git ls-files`.split("\n") s.test_files = `git ls-files -- {test,spec}/*`.split("\n") From bac60d84a65d55dd0ec1fbde5b014ec201cb981c Mon Sep 17 00:00:00 2001 From: Andrei Subbota Date: Thu, 22 May 2025 23:20:12 +0200 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8d01b1..5600f30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ #### Fixes * Your contribution here. - +* [#388](https://github.com/ruby-grape/grape-entity/pull/388): Drop ruby-head from test matrix to keep builds stable - [@numbata](https://github.com/numbata). ### ### 1.0.1 (2024-04-10)