diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index d38e02f..e10f49e 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - ruby-version: ['3.1'] + ruby-version: ['3.2'] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 2608f36..0b6f183 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1'] + ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2'] experimental: [false] include: @@ -20,6 +20,8 @@ jobs: experimental: true - ruby-version: 'jruby-9.3' experimental: true + - ruby-version: 'jruby-9.4' + experimental: true continue-on-error: ${{ matrix.experimental }} diff --git a/.rubocop.yml b/.rubocop.yml index 1ec2f5d..984b6d2 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,7 +5,6 @@ require: AllCops: NewCops: enable - TargetRubyVersion: 2.5 Exclude: - 'spec/coveralls/fixtures/**/*' - 'vendor/bundle/**/*' diff --git a/CHANGELOG.md b/CHANGELOG.md index c47a959..1b96345 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.26.0 / 2022-12-25 + +* [FEATURE] Drop Ruby 2.5 support +* [FEATURE] Add SimpleCov 0.22.0 compatibility +* [ENHANCEMENT] Test against Ruby 3.2 and JRuby 3.4 + ## 0.25.0 / 2022-08-05 * [ENHANCEMENT] Bump `jruby-openssl` requirement to `0.14.0` [#39](https://github.com/tagliala/coveralls-ruby-reborn/pull/39) diff --git a/Gemfile b/Gemfile index 5c9389c..cc79798 100644 --- a/Gemfile +++ b/Gemfile @@ -11,10 +11,10 @@ end gem 'rake', '~> 13.0' gem 'rspec', '~> 3.12' -gem 'rubocop', '~> 1.26' -gem 'rubocop-performance', '~> 1.13' +gem 'rubocop', '~> 1.41' +gem 'rubocop-performance', '~> 1.15' gem 'rubocop-rake', '~> 0.6.0' -gem 'rubocop-rspec', '~> 2.9' +gem 'rubocop-rspec', '~> 2.16' gem 'truthy', '~> 1.0' -gem 'vcr', '~> 6.0' -gem 'webmock', '~> 3.14' +gem 'vcr', '~> 6.1' +gem 'webmock', '~> 3.18' diff --git a/README.md b/README.md index ec3b798..7f69d5f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ An up-to-date fork of [lemurheavy/coveralls-ruby](https://github.com/lemurheavy/ Add to your `Gemfile`: ```rb -gem 'coveralls_reborn', '~> 0.25.0', require: false +gem 'coveralls_reborn', '~> 0.26.0', require: false ``` ### GitHub Actions diff --git a/coveralls-ruby.gemspec b/coveralls-ruby.gemspec index 2f42711..0c208b9 100644 --- a/coveralls-ruby.gemspec +++ b/coveralls-ruby.gemspec @@ -24,13 +24,13 @@ Gem::Specification.new do |gem| gem.metadata['changelog_uri'] = 'https://github.com/tagliala/coveralls-ruby-reborn/blob/main/CHANGELOG.md' gem.metadata['source_code_uri'] = 'https://github.com/tagliala/coveralls-ruby-reborn' - gem.required_ruby_version = '>= 2.5' + gem.required_ruby_version = '>= 2.6' - gem.add_dependency 'simplecov', '>= 0.18.1', '< 0.22.0' - gem.add_dependency 'term-ansicolor', '~> 1.6' - gem.add_dependency 'thor', '>= 0.20.3', '< 2.0' - gem.add_dependency 'tins', '~> 1.16' + gem.add_dependency 'simplecov', '~> 0.22.0' + gem.add_dependency 'term-ansicolor', '~> 1.7' + gem.add_dependency 'thor', '~> 1.2' + gem.add_dependency 'tins', '~> 1.32' - gem.add_development_dependency 'bundler', '>= 1.16', '< 3' + gem.add_development_dependency 'bundler', '~> 2.0' gem.add_development_dependency 'simplecov-lcov', '~> 0.8.0' end diff --git a/lib/coveralls/simplecov.rb b/lib/coveralls/simplecov.rb index d215bf1..bace43a 100644 --- a/lib/coveralls/simplecov.rb +++ b/lib/coveralls/simplecov.rb @@ -65,7 +65,7 @@ def branches(simplecov_branches) line_number = branch_data.split(', ')[2].to_i data.each_value do |hits| branch_number += 1 - branches_properties.concat([line_number, 0, branch_number, hits]) + branches_properties.push(line_number, 0, branch_number, hits) end end branches_properties diff --git a/lib/coveralls/version.rb b/lib/coveralls/version.rb index e6ada94..b94e5e3 100644 --- a/lib/coveralls/version.rb +++ b/lib/coveralls/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Coveralls - VERSION = '0.25.0' + VERSION = '0.26.0' end