Skip to content

Commit 557df89

Browse files
authored
Uses Ruby 3.2 (#889)
* Updates GH action matrix. * Improves Actions. * Updates matrix to use runy 3.2
1 parent 1eb9fe6 commit 557df89

File tree

6 files changed

+7
-24
lines changed

6 files changed

+7
-24
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v3
1919
- uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: '3.1'
21+
ruby-version: '3.2'
2222
bundler-cache: true
2323
- name: Run rubocop
2424
run: bundle exec rubocop --parallel --format progress
@@ -28,8 +28,8 @@ jobs:
2828
needs: ['rubocop']
2929
strategy:
3030
matrix:
31-
ruby-version: ['2.7', '3.0', '3.1', 'head']
32-
grape-version: [1.6.2, 1.5.3]
31+
ruby-version: ['3.0', '3.1', '3.2', 'head']
32+
grape-version: [1.6.2, 1.7.0]
3333
model-parser: [grape-swagger-entity, grape-swagger-representable, '']
3434
steps:
3535
- name: Check out branch

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ AllCops:
55
- vendor/**/*
66
- example/**/*
77
NewCops: enable
8-
TargetRubyVersion: 3.1
8+
TargetRubyVersion: 3.2
99
SuggestExtensions: false
1010

1111
# Layout stuff

.ruby-gemset

Lines changed: 0 additions & 1 deletion
This file was deleted.

Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
source 'http://rubygems.org'
44

5-
ruby RUBY_VERSION
6-
75
gemspec
86

9-
gem 'grape', case version = ENV.fetch('GRAPE_VERSION', '~> 1.6')
7+
gem 'grape', case version = ENV.fetch('GRAPE_VERSION', '~> 1.7')
108
when 'HEAD'
119
{ git: 'https://github.com/ruby-grape/grape' }
1210
else

spec/lib/oapi_tasks_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Base < Grape::API
3030

3131
describe '.new' do
3232
it 'accepts class name as a constant' do
33-
expect(described_class.new(::Api::Base).send(:api_class)).to eq(Api::Base)
33+
expect(described_class.new(Api::Base).send(:api_class)).to eq(Api::Base)
3434
end
3535

3636
it 'accepts class name as a string' do

spec/swagger_v2/api_documentation_spec.rb

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,7 @@
2121
expect(subject).to eq(
2222
[
2323
{ description: 'Swagger compatible API description' },
24-
{
25-
description: 'Swagger compatible API description for specific API',
26-
params: {
27-
'locale' => {
28-
desc: 'Locale of API documentation',
29-
required: false,
30-
type: 'Symbol'
31-
},
32-
'name' => {
33-
desc: 'Resource name of mounted API',
34-
required: true,
35-
type: 'String'
36-
}
37-
}
38-
}
24+
{ description: 'Swagger compatible API description for specific API', params: {} }
3925
]
4026
)
4127
end

0 commit comments

Comments
 (0)