Skip to content

Commit ba7123c

Browse files
authored
Merge branch 'main' into remove_duplicated_tests
2 parents 675a49b + a002736 commit ba7123c

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

Diff for: .github/workflows/push.yml

+5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@ jobs:
1616
- activesupport_6.0
1717
- activesupport_6.1
1818
- activesupport_7.0
19+
- activesupport_7.1
1920
exclude:
2021
- ruby-version: '2.5'
2122
activesupport-version: activesupport_7.0
2223
- ruby-version: '2.6'
2324
activesupport-version: activesupport_7.0
25+
- ruby-version: '2.5'
26+
activesupport-version: activesupport_7.1
27+
- ruby-version: '2.6'
28+
activesupport-version: activesupport_7.1
2429
fail-fast: false
2530

2631
env:

Diff for: Appraisals

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# After a new entry: `bundle exec appraisal install`
2+
# Add an entry in `.github/workflows/push.yml`'s file
3+
14
appraise "activesupport_5.2" do
25
gem "activesupport", "~> 5.2.0"
36
end
@@ -13,3 +16,7 @@ end
1316
appraise "activesupport_7.0" do
1417
gem "activesupport", "~> 7.0.0"
1518
end
19+
20+
appraise "activesupport_7.1" do
21+
gem "activesupport", "~> 7.1.0"
22+
end

Diff for: csvlint.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121
spec.add_dependency "csv"
2222
spec.add_dependency "rainbow"
2323
spec.add_dependency "open_uri_redirections"
24-
spec.add_dependency "activesupport", "< 7.1.0"
24+
spec.add_dependency "activesupport"
2525
spec.add_dependency "addressable"
2626
spec.add_dependency "typhoeus"
2727
spec.add_dependency "escape_utils"

Diff for: gemfiles/activesupport_7.1.gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "activesupport", "~> 7.1.0"
6+
7+
gemspec path: "../"

Diff for: lib/csvlint.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
require "tempfile"
55
require "typhoeus"
66

7-
require "active_support/core_ext/date/conversions"
8-
require "active_support/core_ext/time/conversions"
9-
require "active_support/core_ext/object"
7+
require "active_support"
108
require "open_uri_redirections"
119
require "uri_template"
1210

0 commit comments

Comments
 (0)