diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e68f6dae..6b928bd4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' bundler-cache: true - name: Run rubocop run: bundle exec rubocop --parallel --format progress @@ -26,36 +26,31 @@ jobs: strategy: matrix: entry: - - { ruby: '3.0', grape: '1.7.1' } - - { ruby: '3.1', grape: '1.7.1' } - - { ruby: '3.2', grape: '1.7.1' } - - { ruby: '3.3', grape: '1.7.1' } - - { ruby: 'head', grape: '1.7.1' } - - { ruby: '3.0', grape: '1.8.0' } - { ruby: '3.1', grape: '1.8.0' } - { ruby: '3.2', grape: '1.8.0' } - { ruby: '3.3', grape: '1.8.0' } + - { ruby: '3.4', grape: '1.8.0' } - { ruby: 'head', grape: '1.8.0' } - - { ruby: '3.0', grape: '2.0.0' } - { ruby: '3.1', grape: '2.0.0' } - { ruby: '3.2', grape: '2.0.0' } - { ruby: '3.3', grape: '2.0.0' } + - { ruby: '3.4', grape: '2.0.0' } - { ruby: 'head', grape: '2.0.0' } - - { ruby: '3.0', grape: '2.1.3' } - { ruby: '3.1', grape: '2.1.3' } - { ruby: '3.2', grape: '2.1.3' } - { ruby: '3.3', grape: '2.1.3' } + - { ruby: '3.4', grape: '2.1.3' } - { ruby: 'head', grape: '2.1.3' } - - { ruby: '3.0', grape: '2.2.0' } - { ruby: '3.1', grape: '2.2.0' } - { ruby: '3.2', grape: '2.2.0' } - { ruby: '3.3', grape: '2.2.0' } + - { ruby: '3.4', grape: '2.2.0' } - { ruby: 'head', grape: '2.2.0' } - - { ruby: '3.0', grape: 'HEAD' } - - { ruby: '3.1', grape: 'HEAD' } - - { ruby: '3.2', grape: 'HEAD' } - - { ruby: '3.3', grape: 'HEAD' } - - { ruby: 'head', grape: 'HEAD' } + # - { ruby: '3.1', grape: 'HEAD' } + # - { ruby: '3.2', grape: 'HEAD' } + # - { ruby: '3.3', grape: 'HEAD' } + # - { ruby: '3.4', grape: 'HEAD' } + # - { ruby: 'head', grape: 'HEAD' } name: test (ruby=${{ matrix.entry.ruby }}, grape=${{ matrix.entry.grape }}) runs-on: ubuntu-latest needs: ['rubocop'] diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ef85cf2..c54b36a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,15 @@ -### 2.1.2 (Next) +### Next + +#### Features + +* your contribution + +#### Fixes + +* your contribution + + +### 2.1.2 (Jan 7, 2025) #### Features diff --git a/Gemfile b/Gemfile index 63895ff1..c5ddc597 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ source 'http://rubygems.org' gemspec +# gem 'grape', git: 'https://github.com/ruby-grape/grape' gem 'grape', case version = ENV.fetch('GRAPE_VERSION', '< 3.0') when 'HEAD' { git: 'https://github.com/ruby-grape/grape' } diff --git a/README.md b/README.md index 6a618dac..6b4bbbf0 100644 --- a/README.md +++ b/README.md @@ -43,17 +43,18 @@ This screenshot is based on the [Hussars](https://github.com/LeFnord/hussars) sa The following versions of grape, grape-entity and grape-swagger can currently be used together. -| grape-swagger | swagger spec | grape | grape-entity | representable | -| ------------- | ------------ | ----------------------- | ------------ | ------------- | -| 0.10.5 | 1.2 | >= 0.10.0 ... <= 0.14.0 | < 0.5.0 | n/a | -| 0.11.0 | 1.2 | >= 0.16.2 | < 0.5.0 | n/a | -| 0.25.2 | 2.0 | >= 0.14.0 ... <= 0.18.0 | <= 0.6.0 | >= 2.4.1 | -| 0.26.0 | 2.0 | >= 0.16.2 ... <= 1.1.0 | <= 0.6.1 | >= 2.4.1 | -| 0.27.0 | 2.0 | >= 0.16.2 ... <= 1.1.0 | >= 0.5.0 | >= 2.4.1 | -| 0.32.0 | 2.0 | >= 0.16.2 | >= 0.5.0 | >= 2.4.1 | -| 0.34.0 | 2.0 | >= 0.16.2 ... < 1.3.0 | >= 0.5.0 | >= 2.4.1 | -| >= 1.0.0 | 2.0 | >= 1.3.0 | >= 0.5.0 | >= 2.4.1 | -| >= 2.0.0 | 2.0 | >= 1.7.0 | >= 0.5.0 | >= 2.4.1 | +| grape-swagger | swagger spec | grape | grape-entity | representable | +| ------------------ | ------------ | ----------------------- | ------------ | ------------- | +| 0.10.5 | 1.2 | >= 0.10.0 ... <= 0.14.0 | < 0.5.0 | n/a | +| 0.11.0 | 1.2 | >= 0.16.2 | < 0.5.0 | n/a | +| 0.25.2 | 2.0 | >= 0.14.0 ... <= 0.18.0 | <= 0.6.0 | >= 2.4.1 | +| 0.26.0 | 2.0 | >= 0.16.2 ... <= 1.1.0 | <= 0.6.1 | >= 2.4.1 | +| 0.27.0 | 2.0 | >= 0.16.2 ... <= 1.1.0 | >= 0.5.0 | >= 2.4.1 | +| 0.32.0 | 2.0 | >= 0.16.2 | >= 0.5.0 | >= 2.4.1 | +| 0.34.0 | 2.0 | >= 0.16.2 ... < 1.3.0 | >= 0.5.0 | >= 2.4.1 | +| >= 1.0.0 | 2.0 | >= 1.3.0 | >= 0.5.0 | >= 2.4.1 | +| >= 2.0.0 | 2.0 | >= 1.7.0 | >= 0.5.0 | >= 2.4.1 | +| >= 2.0.0 ... < 2.2 | 2.0 | >= 1.8.0 ... < 2.3.0 | >= 0.5.0 | >= 2.4.1 | ## Swagger-Spec diff --git a/grape-swagger.gemspec b/grape-swagger.gemspec index cd6c693f..c8007a0c 100644 --- a/grape-swagger.gemspec +++ b/grape-swagger.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.metadata['rubygems_mfa_required'] = 'true' - s.required_ruby_version = '>= 3.0' + s.required_ruby_version = '>= 3.1' s.add_dependency 'grape', '>= 1.7', '< 3.0' s.add_dependency 'rack-test', '~> 2'