Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring Ruby 2.4+ support back #142

Merged
merged 6 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ jobs:

matrix:
ruby-version:
- '2.4'
- '2.5'
- '2.6'
- '2.7'
- '3.0'
- '3.1'
Expand All @@ -22,6 +25,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- run: rm Gemfile.lock

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require:
AllCops:
DisplayCopNames: true
NewCops: enable
TargetRubyVersion: 2.7
TargetRubyVersion: 2.5

Bundler/DuplicatedGem:
Enabled: false
Expand Down
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ source "https://rubygems.org"

gemspec

gem "bundler", "~> 2.4.0"
gem "rake", ">= 11"

# Use local copy of simplecov in development if you want to
# gem "simplecov", :path => File.dirname(__FILE__) + "/../simplecov"
gem "simplecov", git: "https://github.com/simplecov-ruby/simplecov"
if RUBY_VERSION < "2.5"
gem "simplecov", "< 0.19"
else
gem "simplecov", git: "https://github.com/simplecov-ruby/simplecov"
end

group :test do
gem "minitest"
Expand Down
53 changes: 23 additions & 30 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/simplecov-ruby/simplecov
revision: 1d8f692d772c101c56f3f4e94945e898ad7b3769
revision: 0260b1f309e76c8ed87731ebbc348b05d753b8a2
specs:
simplecov (0.22.0)
docile (~> 1.1)
Expand All @@ -16,44 +16,38 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
concurrent-ruby (1.2.2)
docile (1.4.0)
concurrent-ruby (1.3.4)
docile (1.4.1)
execjs (2.9.1)
json (2.7.1)
json (2.7.1-java)
language_server-protocol (3.17.0.3)
minitest (5.20.0)
minitest (5.15.0)
parallel (1.24.0)
parser (3.2.2.4)
parser (3.3.4.2)
ast (~> 2.4.1)
racc
racc (1.7.3)
racc (1.7.3-java)
rack (3.0.9.1)
racc (1.8.1)
racc (1.8.1-java)
rack (3.1.7)
rainbow (3.1.1)
rake (13.1.0)
regexp_parser (2.8.3)
rake (13.2.1)
regexp_parser (2.9.2)
rexml (3.3.6)
strscan
rubocop (1.59.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
rubocop (1.28.2)
parallel (~> 1.10)
parser (>= 3.2.2.4)
parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0)
rexml
rubocop-ast (>= 1.17.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-minitest (0.34.2)
rubocop (>= 1.39, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-performance (1.20.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.17.0)
parser (>= 3.1.1.0)
rubocop-minitest (0.19.1)
rubocop (>= 0.90, < 2.0)
rubocop-performance (1.13.3)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
ruby-progressbar (1.13.0)
Expand All @@ -74,7 +68,6 @@ PLATFORMS
universal-java-1.8

DEPENDENCIES
bundler (~> 2.4.0)
minitest
rake (>= 11)
rubocop
Expand All @@ -88,4 +81,4 @@ DEPENDENCIES
yui-compressor

BUNDLED WITH
2.4.22
2.3.15
4 changes: 2 additions & 2 deletions simplecov-html.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Gem::Specification.new do |gem|
gem.authors = ["Christoph Olszowka"]
gem.email = ["christoph at olszowka de"]
gem.homepage = "https://github.com/simplecov-ruby/simplecov-html"
gem.description = %(Default HTML formatter for SimpleCov code coverage tool for ruby 2.5+)
gem.description = %(Default HTML formatter for SimpleCov code coverage tool for ruby 2.4+)
gem.summary = gem.description
gem.license = "MIT"

gem.required_ruby_version = ">= 2.7"
gem.required_ruby_version = ">= 2.4"

gem.files = Dir.chdir(__dir__) do
`git ls-files -z`.split("\x0").reject do |f|
Expand Down
Loading