From a53b61bc2bcf389ca11810478ea69c42aa51ea57 Mon Sep 17 00:00:00 2001 From: Michael Scrivo Date: Fri, 2 Feb 2024 13:36:15 -0500 Subject: [PATCH 1/3] Various build updates * Update grape entity dep * Min supported Ruby is 2.7 * Add Ruby 3.3 to build matrix --- .github/workflows/test.yml | 8 ++++---- Gemfile | 2 +- grape-swagger-entity.gemspec | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6decc1b..8d5b280 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: name: RuboCop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 @@ -24,16 +24,16 @@ jobs: test: env: - GRAPE_ENTITY: 0.8.0 + GRAPE_ENTITY: 1.0.0 runs-on: ubuntu-latest strategy: fail-fast: false matrix: - ruby-version: ['3.0', '3.1', '3.2'] + ruby-version: ['2.7','3.0', '3.1', '3.2', '3.3'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/Gemfile b/Gemfile index 3ddb9bc..f0986e9 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ end gem 'grape-swagger', git: 'https://github.com/ruby-grape/grape-swagger.git' group :test do - gem 'grape-entity', ENV.fetch('GRAPE_ENTITY', '0.6.1') + gem 'grape-entity', ENV.fetch('GRAPE_ENTITY', '1.0.0') gem 'ruby-grape-danger', '~> 0.2.1', require: false gem 'simplecov', require: false end diff --git a/grape-swagger-entity.gemspec b/grape-swagger-entity.gemspec index 0c88a08..14f2f3c 100644 --- a/grape-swagger-entity.gemspec +++ b/grape-swagger-entity.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) } s.require_paths = ['lib'] - s.required_ruby_version = '>= 2.4' + s.required_ruby_version = '>= 2.7' s.add_runtime_dependency 'grape-entity', '>= 0.6.0' s.add_runtime_dependency 'grape-swagger', '>= 1.2.0' s.metadata['rubygems_mfa_required'] = 'true' From e8a9632c21b5887b8f7973d6593b3c00ae21b914 Mon Sep 17 00:00:00 2001 From: Michael Scrivo Date: Fri, 2 Feb 2024 13:40:37 -0500 Subject: [PATCH 2/3] Make Ruby 3 min since that's what grape-swagger now specifies. --- .github/workflows/test.yml | 2 +- grape-swagger-entity.gemspec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d5b280..1a3ad7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['2.7','3.0', '3.1', '3.2', '3.3'] + ruby-version: ['3.0', '3.1', '3.2', '3.3'] steps: - uses: actions/checkout@v4 diff --git a/grape-swagger-entity.gemspec b/grape-swagger-entity.gemspec index 14f2f3c..83f615e 100644 --- a/grape-swagger-entity.gemspec +++ b/grape-swagger-entity.gemspec @@ -19,8 +19,8 @@ Gem::Specification.new do |s| s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) } s.require_paths = ['lib'] - s.required_ruby_version = '>= 2.7' - s.add_runtime_dependency 'grape-entity', '>= 0.6.0' - s.add_runtime_dependency 'grape-swagger', '>= 1.2.0' + s.required_ruby_version = '>= 3.0' + s.add_runtime_dependency 'grape-entity', '~> 1' + s.add_runtime_dependency 'grape-swagger', '~> 2' s.metadata['rubygems_mfa_required'] = 'true' end From 03a8a983de661359d3f8d989e1cf537c3f766334 Mon Sep 17 00:00:00 2001 From: Michael Scrivo Date: Fri, 2 Feb 2024 13:41:47 -0500 Subject: [PATCH 3/3] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 176704e..5be744a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ #### Fixes +* [#67](https://github.com/ruby-grape/grape-swagger-entity/pull/67): Various build updates - [@mscrivo](https://github.com/mscrivo). * Your contribution here. ### 0.5.3 (2024/02/02)