Skip to content

Commit 857cb84

Browse files
committed
updates. removing outdated ruby versions
1 parent 134ae21 commit 857cb84

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

.github/workflows/ruby.yml

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
ruby:
16-
- '2.7'
17-
- '3.0'
1816
- '3.1'
1917
- '3.2'
2018
- '3.3'

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
.buildpath
99
*~
1010
.bundle/
11-
lbin/
11+
lbin/
12+
vendor

.rubocop.yml

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
require: rubocop-performance
2+
13
AllCops:
2-
TargetRubyVersion: 2.4
4+
TargetRubyVersion: 3.1
35
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
46
# to ignore them, so only the ones explicitly set in this file are enabled.
57
DisabledByDefault: true
8+
SuggestExtensions: false
69

710
Performance:
811
Exclude:
@@ -13,12 +16,6 @@ Performance:
1316
Style/AndOr:
1417
Enabled: true
1518

16-
# Do not use braces for hash literals when they are the last argument of a
17-
# method call.
18-
Style/BracesAroundHashParameters:
19-
Enabled: true
20-
EnforcedStyle: context_dependent
21-
2219
# Align `when` with `case`.
2320
Layout/CaseIndentation:
2421
Enabled: true
@@ -127,26 +124,26 @@ Style/StringLiterals:
127124
EnforcedStyle: double_quotes
128125

129126
# Detect hard tabs, no hard tabs.
130-
Layout/Tab:
127+
Layout/IndentationStyle:
131128
Enabled: true
132129

133130
# Blank lines should not have any spaces.
134-
Layout/TrailingBlankLines:
131+
Layout/TrailingEmptyLines:
135132
Enabled: true
136133

137134
# No trailing whitespace.
138135
Layout/TrailingWhitespace:
139136
Enabled: true
140137

141138
# Use quotes for string literals when they are enough.
142-
Style/UnneededPercentQ:
139+
Style/RedundantPercentQ:
143140
Enabled: true
144141

145142
# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
146143
Lint/RequireParentheses:
147144
Enabled: true
148145

149-
Lint/StringConversionInInterpolation:
146+
Lint/RedundantStringCoercion:
150147
Enabled: true
151148

152149
Lint/UriEscapeUnescape:

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
## Unreleased
22

33
### Changed/Added
4-
- Add dependencies for `csv` and `base64` if Ruby version higher or equal 3.4
4+
- Add dependencies for `csv` and `base64` if Ruby version higher or equal 3.4 [616](https://github.com/roo-rb/roo/pull/616)
5+
- Add dependency for `logger` if Ruby version higher or equal 3.4 [618](https://github.com/roo-rb/roo/pull/618)
6+
- Add changelog link to gemspec [605](https://github.com/roo-rb/roo/pull/605)
7+
8+
### Removed
9+
- Support for ruby 2.7, 3.0
510

611
## [2.10.1] 2024-01-17
712

Gemfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ source 'https://rubygems.org'
22

33
gemspec
44

5+
gem 'rubocop'
6+
gem 'rubocop-performance', require: false
7+
58
group :test do
69
# additional testing libs
710
gem 'shoulda'
8-
gem 'activesupport', '< 5.1'
11+
gem 'activesupport'
912
gem 'rspec', '>= 3.0.0'
1013
gem 'simplecov', '>= 0.9.0', require: false
1114
gem 'coveralls', require: false
1215
gem "minitest-reporters"
13-
gem 'webrick' if RUBY_VERSION >= '3.0.0'
16+
gem 'webrick'
1417
end
1518

1619
group :local_development do

roo.gemspec

+4-8
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,21 @@ Gem::Specification.new do |spec|
1717
spec.files.reject! { |fn| fn.include?('test/files') }
1818
spec.require_paths = ['lib']
1919

20-
if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
21-
spec.required_ruby_version = ">= 2.6.0"
22-
else
23-
spec.required_ruby_version = ">= 2.7.0"
24-
end
20+
spec.required_ruby_version = ">= 3.1.0"
2521

2622
if RUBY_VERSION >= '3.4.0'
2723
spec.add_dependency 'base64', '~> 0.2'
2824
spec.add_dependency 'csv', '~> 3'
25+
spec.add_dependency 'logger', '~> 1'
2926
end
27+
3028
spec.add_dependency 'nokogiri', '~> 1'
3129
spec.add_dependency 'rubyzip', '>= 1.3.0', '< 3.0.0'
3230

3331
spec.add_development_dependency 'rake'
3432
spec.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
3533
spec.add_development_dependency 'rack', '~> 1.6', '< 2.0.0'
36-
if RUBY_VERSION >= '3.0.0'
37-
spec.add_development_dependency 'matrix'
38-
end
34+
spec.add_development_dependency 'matrix'
3935

4036
spec.metadata["changelog_uri"] = spec.homepage + '/blob/master/CHANGELOG.md'
4137
end

0 commit comments

Comments
 (0)