Skip to content

Commit f402421

Browse files
authored
Merge pull request #2129 from ruby/jekyll-4
Use Jekyll 4
2 parents 9730bc7 + 41f765e commit f402421

File tree

2 files changed

+44
-34
lines changed

2 files changed

+44
-34
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ source "https://rubygems.org"
22
ruby ENV['CUSTOM_RUBY_VERSION'] || '~> 2.6.3'
33

44
gem 'rake'
5-
gem 'jekyll', '~> 3.0'
6-
gem 'rouge', '~> 1.10'
5+
gem 'jekyll'
6+
gem 'rouge'
77

88
gem 'unicorn'
9-
gem 'lanyon', '~> 0.4.0'
9+
gem 'lanyon', git: "https://github.com/hsbt/lanyon", ref: "b84d5338b7e4138319311591c41ae41a66dcd3e8"
1010
gem 'rack-rewrite'
1111
gem 'rack-ssl'
1212
gem 'rack-protection'

Gemfile.lock

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
GIT
2+
remote: https://github.com/hsbt/lanyon
3+
revision: b84d5338b7e4138319311591c41ae41a66dcd3e8
4+
ref: b84d5338b7e4138319311591c41ae41a66dcd3e8
5+
specs:
6+
lanyon (0.4.0)
7+
jekyll (>= 2.0, < 5.0)
8+
rack (>= 1.6, < 3.0)
9+
110
GEM
211
remote: https://rubygems.org/
312
specs:
@@ -10,34 +19,35 @@ GEM
1019
eventmachine (>= 0.12.9)
1120
http_parser.rb (~> 0.6.0)
1221
eventmachine (1.2.7)
13-
ffi (1.10.0)
22+
ffi (1.11.1)
1423
forwardable-extended (2.6.0)
1524
http_parser.rb (0.6.0)
16-
i18n (0.9.5)
25+
i18n (1.6.0)
1726
concurrent-ruby (~> 1.0)
18-
jekyll (3.8.5)
27+
jekyll (4.0.0)
1928
addressable (~> 2.4)
2029
colorator (~> 1.0)
2130
em-websocket (~> 0.5)
22-
i18n (~> 0.7)
23-
jekyll-sass-converter (~> 1.0)
31+
i18n (>= 0.9.5, < 2)
32+
jekyll-sass-converter (~> 2.0)
2433
jekyll-watch (~> 2.0)
25-
kramdown (~> 1.14)
34+
kramdown (~> 2.1)
35+
kramdown-parser-gfm (~> 1.0)
2636
liquid (~> 4.0)
2737
mercenary (~> 0.3.3)
2838
pathutil (~> 0.9)
29-
rouge (>= 1.7, < 4)
39+
rouge (~> 3.0)
3040
safe_yaml (~> 1.0)
31-
jekyll-sass-converter (1.5.2)
32-
sass (~> 3.4)
41+
terminal-table (~> 1.8)
42+
jekyll-sass-converter (2.0.0)
43+
sassc (> 2.0.1, < 3.0)
3344
jekyll-watch (2.2.1)
3445
listen (~> 3.0)
3546
json (2.2.0)
3647
kgio (2.11.2)
37-
kramdown (1.17.0)
38-
lanyon (0.4.0)
39-
jekyll (>= 2.0, < 4.0)
40-
rack (>= 1.6, < 3.0)
48+
kramdown (2.1.0)
49+
kramdown-parser-gfm (1.1.0)
50+
kramdown (~> 2.0)
4151
liquid (4.0.3)
4252
listen (3.1.5)
4353
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -46,40 +56,40 @@ GEM
4656
mercenary (0.3.6)
4757
mini_portile2 (2.4.0)
4858
minitest (5.11.3)
49-
nokogiri (1.10.3)
59+
nokogiri (1.10.4)
5060
mini_portile2 (~> 2.4.0)
51-
paint (2.1.0)
61+
paint (2.1.1)
5262
pathutil (0.16.2)
5363
forwardable-extended (~> 2.6)
54-
public_suffix (3.0.3)
64+
public_suffix (3.1.1)
5565
rack (2.0.7)
56-
rack-protection (2.0.5)
66+
rack-protection (2.0.7)
5767
rack
5868
rack-rewrite (1.5.1)
5969
rack-ssl (1.4.1)
6070
rack
6171
raindrops (0.19.0)
62-
rake (12.3.2)
72+
rake (12.3.3)
6373
rb-fsevent (0.10.3)
6474
rb-inotify (0.10.0)
6575
ffi (~> 1.0)
66-
rouge (1.11.1)
76+
rouge (3.9.0)
6777
ruby_dep (1.5.0)
6878
safe_yaml (1.0.5)
69-
sass (3.7.4)
70-
sass-listen (~> 4.0.0)
71-
sass-listen (4.0.0)
72-
rb-fsevent (~> 0.9, >= 0.9.4)
73-
rb-inotify (~> 0.9, >= 0.9.7)
74-
slop (4.6.2)
79+
sassc (2.2.0)
80+
ffi (~> 1.9)
81+
slop (4.7.0)
7582
spidr (0.6.0)
7683
nokogiri (~> 1.3)
77-
sq_mini_racer (0.2.4.sqreen3)
84+
sq_mini_racer (0.2.5.0.1.beta1)
7885
sqreen (1.17.0)
7986
sq_mini_racer (~> 0.2.4.sqreen2)
87+
terminal-table (1.8.0)
88+
unicode-display_width (~> 1.1, >= 1.1.1)
8089
tidy_ffi (1.0.0)
8190
ffi (~> 1.2)
82-
unicorn (5.5.0)
91+
unicode-display_width (1.6.0)
92+
unicorn (5.5.1)
8393
kgio (~> 2.6)
8494
raindrops (~> 0.7)
8595
validate-website (1.9.3)
@@ -97,14 +107,14 @@ PLATFORMS
97107
ruby
98108

99109
DEPENDENCIES
100-
jekyll (~> 3.0)
101-
lanyon (~> 0.4.0)
110+
jekyll
111+
lanyon!
102112
minitest
103113
rack-protection
104114
rack-rewrite
105115
rack-ssl
106116
rake
107-
rouge (~> 1.10)
117+
rouge
108118
spidr (~> 0.6)
109119
sqreen
110120
unicorn
@@ -114,4 +124,4 @@ RUBY VERSION
114124
ruby 2.6.3p62
115125

116126
BUNDLED WITH
117-
2.0.1
127+
2.0.2

0 commit comments

Comments
 (0)