Skip to content

Commit b6e45a6

Browse files
authored
Merge pull request #315 from Rotzbua/chore_update_dependencies
chore(dep): pin dependencies to jekyll 4
2 parents 2c2896e + 3142da2 commit b6e45a6

File tree

3 files changed

+53
-52
lines changed

3 files changed

+53
-52
lines changed

Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
source "https://rubygems.org"
22

3-
gem "jekyll"
4-
gem "jekyll-watch"
3+
gem "jekyll", "~> 4"
4+
# jekyll plugins
55
gem "jekyll-mentions"
66
gem "jekyll-multiple-languages-plugin"
7-
gem "kramdown"
8-
gem "webrick"
97

10-
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
11-
# and associated library.
8+
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem and associated library.
129
platforms :mingw, :x64_mingw, :mswin, :jruby do
13-
gem "tzinfo", "~> 1.2"
10+
gem "tzinfo", ">= 1", "< 3"
1411
gem "tzinfo-data"
1512
end
1613

1714
# Performance-booster for watching directories on Windows
1815
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
1916

17+
# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem do not have a Java counterpart.
18+
gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
19+

Gemfile.lock

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,41 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.6)
4+
activesupport (7.1.2)
5+
base64
6+
bigdecimal
57
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
zeitwerk (~> 2.2, >= 2.2.2)
10-
addressable (2.8.1)
8+
connection_pool (>= 2.2.5)
9+
drb
10+
i18n (>= 1.6, < 2)
11+
minitest (>= 5.1)
12+
mutex_m
13+
tzinfo (~> 2.0)
14+
addressable (2.8.6)
1115
public_suffix (>= 2.0.2, < 6.0)
16+
base64 (0.2.0)
17+
bigdecimal (3.1.5)
1218
colorator (1.1.0)
13-
concurrent-ruby (1.1.10)
19+
concurrent-ruby (1.2.2)
20+
connection_pool (2.4.1)
21+
drb (2.2.0)
22+
ruby2_keywords
1423
em-websocket (0.5.3)
1524
eventmachine (>= 0.12.9)
1625
http_parser.rb (~> 0)
1726
eventmachine (1.2.7)
18-
eventmachine (1.2.7-x64-mingw32)
19-
ffi (1.15.5)
20-
ffi (1.15.5-x64-mingw32)
27+
ffi (1.16.3)
28+
ffi (1.16.3-x64-mingw-ucrt)
2129
forwardable-extended (2.6.0)
22-
google-protobuf (3.21.12)
23-
google-protobuf (3.21.12-x64-mingw32)
30+
google-protobuf (3.25.1-x64-mingw-ucrt)
31+
google-protobuf (3.25.1-x86_64-linux)
2432
html-pipeline (2.14.3)
2533
activesupport (>= 2)
2634
nokogiri (>= 1.4)
2735
http_parser.rb (0.8.0)
28-
i18n (1.12.0)
36+
i18n (1.14.1)
2937
concurrent-ruby (~> 1.0)
30-
jekyll (4.3.1)
38+
jekyll (4.3.3)
3139
addressable (~> 2.4)
3240
colorator (~> 1.0)
3341
em-websocket (~> 0.5)
@@ -61,55 +69,49 @@ GEM
6169
rb-fsevent (~> 0.10, >= 0.10.3)
6270
rb-inotify (~> 0.9, >= 0.9.10)
6371
mercenary (0.4.0)
64-
mini_portile2 (2.8.1)
65-
minitest (5.17.0)
66-
nokogiri (1.14.0)
67-
mini_portile2 (~> 2.8.0)
72+
minitest (5.20.0)
73+
mutex_m (0.2.0)
74+
nokogiri (1.16.0-x64-mingw-ucrt)
6875
racc (~> 1.4)
69-
nokogiri (1.14.0-x64-mingw32)
76+
nokogiri (1.16.0-x86_64-linux)
7077
racc (~> 1.4)
7178
pathutil (0.16.2)
7279
forwardable-extended (~> 2.6)
73-
public_suffix (5.0.1)
74-
racc (1.6.2)
75-
rake (13.0.6)
80+
public_suffix (5.0.4)
81+
racc (1.7.3)
7682
rb-fsevent (0.11.2)
7783
rb-inotify (0.10.1)
7884
ffi (~> 1.0)
79-
rexml (3.2.5)
80-
rouge (4.0.1)
85+
rexml (3.2.6)
86+
rouge (4.2.0)
87+
ruby2_keywords (0.0.5)
8188
safe_yaml (1.0.5)
82-
sass-embedded (1.57.1)
83-
google-protobuf (~> 3.21)
84-
rake (>= 10.0.0)
85-
sass-embedded (1.57.1-x64-mingw32)
86-
google-protobuf (~> 3.21)
89+
sass-embedded (1.69.7-x64-mingw-ucrt)
90+
google-protobuf (~> 3.25)
91+
sass-embedded (1.69.7-x86_64-linux-gnu)
92+
google-protobuf (~> 3.25)
8793
terminal-table (3.0.2)
8894
unicode-display_width (>= 1.1.1, < 3)
89-
thread_safe (0.3.6)
90-
tzinfo (1.2.10)
91-
thread_safe (~> 0.1)
92-
tzinfo-data (1.2022.7)
95+
tzinfo (2.0.6)
96+
concurrent-ruby (~> 1.0)
97+
tzinfo-data (1.2023.4)
9398
tzinfo (>= 1.0.0)
94-
unicode-display_width (2.4.2)
99+
unicode-display_width (2.5.0)
95100
wdm (0.1.1)
96-
webrick (1.7.0)
97-
zeitwerk (2.6.6)
101+
webrick (1.8.1)
98102

99103
PLATFORMS
100-
ruby
101-
x64-mingw32
104+
x64-mingw-ucrt
105+
x86_64-linux
102106

103107
DEPENDENCIES
104-
jekyll
108+
http_parser.rb (~> 0.6.0)
109+
jekyll (~> 4)
105110
jekyll-mentions
106111
jekyll-multiple-languages-plugin
107-
jekyll-watch
108-
kramdown
109-
tzinfo (~> 1.2)
112+
tzinfo (>= 1, < 3)
110113
tzinfo-data
111114
wdm (~> 0.1.1)
112-
webrick
113115

114116
BUNDLED WITH
115-
2.2.17
117+
2.4.10

_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ mastodon_server: fosstodon.org
1212
bluesky_username: AntennaPod.org
1313

1414
# Build settings
15-
markdown: kramdown
1615
future: true
1716

1817
plugins:

0 commit comments

Comments
 (0)