Skip to content

Commit

Permalink
Updates for version 3.3.0 with minimum Ruby version 3.0.
Browse files Browse the repository at this point in the history
Updates (soft) Nokogiri dependency to 1.15 to address vulnerability.
Updates Haml to 6.1.
  • Loading branch information
gkellogg committed Aug 26, 2023
1 parent a05b0af commit 49a75a8
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.6, 2.7, '3.0', 3.1, 3.2, ruby-head, jruby]
ruby: ['3.0', 3.1, 3.2, ruby-head, jruby]
gemfile:
- Gemfile
- Gemfile-pure
Expand All @@ -37,6 +37,6 @@ jobs:
run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES
- name: Coveralls GitHub Action
uses: coverallsapp/github-action@v2
if: ${{ matrix.ruby == '3.0' && matrix.gemfile == 'Gemfile' }}
if: ${{ matrix.ruby == '3.2' && matrix.gemfile == 'Gemfile' }}
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ gemspec
gem "rdf", github: "ruby-rdf/rdf", branch: "develop"
gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop"
gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop"
gem "nokogiri", '~> 1.13', '>= 1.13.4', platforms: [:mri, :jruby] # Ruby 2.6
gem "nokogiri", '~> 1.15', '>= 1.13.4', platforms: [:mri, :jruby]
gem 'equivalent-xml', '~> 0.6'

group :development, :test do
Expand All @@ -24,7 +24,7 @@ group :development, :test do
end

group :test do
gem 'simplecov', '~> 0.21', platforms: :mri
gem 'simplecov', '~> 0.22', platforms: :mri
gem 'simplecov-lcov', '~> 0.8', platforms: :mri
end

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,11 @@ The template hash defines four Haml templates:
}

## Dependencies
* [Ruby](https://ruby-lang.org/) (>= 2.6)
* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2)
* [Haml](https://rubygems.org/gems/haml) (>- 5.2, < 7)
* [Ruby](https://ruby-lang.org/) (>= 3.0)
* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.3)
* [Haml](https://rubygems.org/gems/haml) (>- 6.1)
* [HTMLEntities](https://rubygems.org/gems/htmlentities) (~> 4.3)
* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (~> 1.12)
* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (~> 1.15)

## Documentation
Full documentation available on [Rubydoc.info][RDFa doc]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.3
3.3.0
12 changes: 6 additions & 6 deletions rdf-rdfa.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ Gem::Specification.new do |gem|
gem.files = %w(AUTHORS README.md UNLICENSE VERSION) + Dir.glob('lib/**/*.rb')
gem.require_paths = %w(lib)

gem.required_ruby_version = '>= 2.6'
gem.required_ruby_version = '>= 3.0'
gem.requirements = []

gem.add_runtime_dependency 'rdf', '~> 3.2'
gem.add_runtime_dependency 'rdf', '~> 3.3'
gem.add_runtime_dependency 'rdf-vocab', '~> 3.2'
gem.add_runtime_dependency 'haml', '>= 5.2', "< 7"
gem.add_runtime_dependency 'haml', '~> 6.1'
gem.add_runtime_dependency 'rdf-xsd', '~> 3.2'
gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.2'
gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.3'
gem.add_runtime_dependency 'htmlentities', '~> 4.3'

gem.add_development_dependency 'json-ld', '~> 3.2'
gem.add_development_dependency 'rspec', '~> 3.10'
gem.add_development_dependency 'json-ld', '~> 3.3'
gem.add_development_dependency 'rspec', '~> 3.12'
gem.add_development_dependency 'rspec-its', '~> 1.3'
gem.add_development_dependency 'rdf-spec', '~> 3.2'
gem.add_development_dependency 'rdf-turtle', '~> 3.2'
Expand Down

0 comments on commit 49a75a8

Please sign in to comment.