From 49a75a811ed712fc707329d8ef048b8a4424c4b4 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 26 Aug 2023 12:30:59 -0700 Subject: [PATCH 1/2] Updates for version 3.3.0 with minimum Ruby version 3.0. Updates (soft) Nokogiri dependency to 1.15 to address vulnerability. Updates Haml to 6.1. --- .github/workflows/ci.yml | 4 ++-- Gemfile | 4 ++-- README.md | 8 ++++---- VERSION | 2 +- rdf-rdfa.gemspec | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32255be..bc96894 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 }} diff --git a/Gemfile b/Gemfile index 0b0874b..73cfcc1 100644 --- a/Gemfile +++ b/Gemfile @@ -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 @@ -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 diff --git a/README.md b/README.md index 172f43d..50f317b 100755 --- a/README.md +++ b/README.md @@ -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] diff --git a/VERSION b/VERSION index b347b11..15a2799 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.3 +3.3.0 diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec index 7d42129..68e365c 100755 --- a/rdf-rdfa.gemspec +++ b/rdf-rdfa.gemspec @@ -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' From 9896548df06eed26519f93c1e0bb0f64d6d73a68 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 27 Aug 2023 13:44:45 -0700 Subject: [PATCH 2/2] Update dependencies. --- rdf-rdfa.gemspec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rdf-rdfa.gemspec b/rdf-rdfa.gemspec index 68e365c..6b8bfa8 100755 --- a/rdf-rdfa.gemspec +++ b/rdf-rdfa.gemspec @@ -29,21 +29,21 @@ Gem::Specification.new do |gem| gem.requirements = [] gem.add_runtime_dependency 'rdf', '~> 3.3' - gem.add_runtime_dependency 'rdf-vocab', '~> 3.2' + gem.add_runtime_dependency 'rdf-vocab', '~> 3.3' gem.add_runtime_dependency 'haml', '~> 6.1' - gem.add_runtime_dependency 'rdf-xsd', '~> 3.2' + gem.add_runtime_dependency 'rdf-xsd', '~> 3.3' gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.3' gem.add_runtime_dependency 'htmlentities', '~> 4.3' 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' - gem.add_development_dependency 'rdf-isomorphic', '~> 3.2' - gem.add_development_dependency 'rdf-tabular', '~> 3.2' - gem.add_development_dependency 'rdf-rdfxml', '~> 3.2' - gem.add_development_dependency 'sparql', '~> 3.2' + gem.add_development_dependency 'rdf-spec', '~> 3.3' + gem.add_development_dependency 'rdf-turtle', '~> 3.3' + gem.add_development_dependency 'rdf-isomorphic', '~> 3.3' + gem.add_development_dependency 'rdf-tabular', '~> 3.3' + gem.add_development_dependency 'rdf-rdfxml', '~> 3.3' + gem.add_development_dependency 'sparql', '~> 3.3' gem.add_development_dependency 'yard' , '~> 0.9' gem.post_install_message = nil