Skip to content

Commit 7981c28

Browse files
authored
Merge pull request #1947 from github/maxbeizer/noko-1.18
Bump nokogiri to 1.18, require at least Ruby 3.1
2 parents 458f0e9 + 92a2ed2 commit 7981c28

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
strategy:
1515
matrix:
1616
ruby:
17-
- "3.0"
1817
- "3.1"
1918
- "3.2"
2019
- "3.3"
20+
- "3.4"
2121
fail-fast: false
2222

2323
steps:

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ gem "twitter-text", "~> 1.14"
1515
gem "asciidoctor", "~> 2.0.5"
1616
gem "rake"
1717
gem "rexml"
18+
gem "nokogiri", "~> 1.18.4"

Gemfile.lock

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,21 @@ GEM
5555
concurrent-ruby (~> 1.0)
5656
logger (1.7.0)
5757
mini_mime (1.1.5)
58+
mini_portile2 (2.8.8)
5859
minitest (5.25.5)
5960
mutex_m (0.3.0)
60-
nokogiri (1.17.2-aarch64-linux)
61+
nokogiri (1.18.7)
62+
mini_portile2 (~> 2.8.2)
6163
racc (~> 1.4)
62-
nokogiri (1.17.2-arm-linux)
64+
nokogiri (1.18.7-aarch64-linux-gnu)
6365
racc (~> 1.4)
64-
nokogiri (1.17.2-arm64-darwin)
66+
nokogiri (1.18.7-arm-linux-gnu)
6567
racc (~> 1.4)
66-
nokogiri (1.17.2-x86-linux)
68+
nokogiri (1.18.7-arm64-darwin)
6769
racc (~> 1.4)
68-
nokogiri (1.17.2-x86_64-darwin)
70+
nokogiri (1.18.7-x86_64-darwin)
6971
racc (~> 1.4)
70-
nokogiri (1.17.2-x86_64-linux)
72+
nokogiri (1.18.7-x86_64-linux-gnu)
7173
racc (~> 1.4)
7274
nokogiri-diff (0.3.0)
7375
nokogiri (~> 1.5)
@@ -126,7 +128,7 @@ DEPENDENCIES
126128
html-pipeline (~> 1.0)
127129
kramdown
128130
minitest (~> 5.4, >= 5.4.3)
129-
nokogiri (~> 1.17.2)
131+
nokogiri (~> 1.18.4)
130132
nokogiri-diff (~> 0.3.0)
131133
org-ruby (= 0.9.12)
132134
rake

github-markup.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
1313
s.homepage = "https://github.com/github/markup"
1414
s.license = "MIT"
1515

16-
s.required_ruby_version = '>= 3.0.0'
16+
s.required_ruby_version = '>= 3.1.0'
1717

1818
s.files = `git ls-files`.split($\)
1919
s.executables = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
2525
s.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
2626
s.add_development_dependency 'html-pipeline', '~> 1.0'
2727
s.add_development_dependency 'sanitize', '>= 4.6.3'
28-
s.add_development_dependency 'nokogiri', '~> 1.17.2'
28+
s.add_development_dependency 'nokogiri', '~> 1.18.4'
2929
s.add_development_dependency 'nokogiri-diff', '~> 0.3.0'
3030
s.add_development_dependency "github-linguist", ">= 7.1.3"
3131
end

0 commit comments

Comments
 (0)