Skip to content

Commit 3f2d93b

Browse files
authored
Remove reliance on jekyll-assets, update Gems, add .ruby-version (#94)
* Remove legacy jekyll-assets, bump deps, pin ruby version * Fix assets now that jekyll is compiling natively * This isn't explicitly needed anymore
1 parent c4779d0 commit 3f2d93b

File tree

16 files changed

+72
-93
lines changed

16 files changed

+72
-93
lines changed

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.2.0

Gemfile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1+
ruby "3.2.0"
12
source "https://rubygems.org"
23

3-
gem "jekyll", "~> 3.9.0"
4-
5-
# Needed for macOS ARM
6-
gem "nokogiri", "~> 1.15.6"
7-
8-
# Needed to unbreak jekyll-assets
9-
gem "sprockets", "~> 3.7"
10-
11-
gem "kramdown-parser-gfm", "~> 1.1.0"
4+
gem "jekyll", "~> 4.3"
125

136
group :jekyll_plugins do
14-
gem "jekyll-assets"
157
gem "jekyll-feed"
168
gem "jekyll-paginate"
179
gem "jekyll-seo-tag"

Gemfile.lock

Lines changed: 57 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,104 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.2.6)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
addressable (2.8.0)
10-
public_suffix (>= 2.0.2, < 5.0)
4+
addressable (2.9.0)
5+
public_suffix (>= 2.0.2, < 8.0)
6+
base64 (0.3.0)
7+
bigdecimal (4.1.1)
118
colorator (1.1.0)
12-
concurrent-ruby (1.1.9)
9+
concurrent-ruby (1.3.6)
10+
csv (3.3.5)
1311
em-websocket (0.5.3)
1412
eventmachine (>= 0.12.9)
1513
http_parser.rb (~> 0)
1614
eventmachine (1.2.7)
17-
execjs (2.8.1)
18-
extras (0.3.0)
19-
forwardable-extended (~> 2.5)
20-
fastimage (2.2.5)
21-
ffi (1.15.4)
15+
ffi (1.17.4-x86_64-darwin)
16+
ffi (1.17.4-x86_64-linux-gnu)
2217
forwardable-extended (2.6.0)
23-
http_parser.rb (0.8.0)
24-
i18n (0.9.5)
18+
google-protobuf (4.34.1-x86_64-darwin)
19+
bigdecimal
20+
rake (~> 13.3)
21+
google-protobuf (4.34.1-x86_64-linux-gnu)
22+
bigdecimal
23+
rake (~> 13.3)
24+
http_parser.rb (0.8.1)
25+
i18n (1.14.8)
2526
concurrent-ruby (~> 1.0)
26-
jekyll (3.9.1)
27+
jekyll (4.4.1)
2728
addressable (~> 2.4)
29+
base64 (~> 0.2)
2830
colorator (~> 1.0)
31+
csv (~> 3.0)
2932
em-websocket (~> 0.5)
30-
i18n (~> 0.7)
31-
jekyll-sass-converter (~> 1.0)
33+
i18n (~> 1.0)
34+
jekyll-sass-converter (>= 2.0, < 4.0)
3235
jekyll-watch (~> 2.0)
33-
kramdown (>= 1.17, < 3)
36+
json (~> 2.6)
37+
kramdown (~> 2.3, >= 2.3.1)
38+
kramdown-parser-gfm (~> 1.0)
3439
liquid (~> 4.0)
35-
mercenary (~> 0.3.3)
40+
mercenary (~> 0.3, >= 0.3.6)
3641
pathutil (~> 0.9)
37-
rouge (>= 1.7, < 4)
42+
rouge (>= 3.0, < 5.0)
3843
safe_yaml (~> 1.0)
39-
jekyll-assets (3.0.12)
40-
activesupport (~> 5.0)
41-
execjs (~> 2.7)
42-
extras (~> 0.2)
43-
fastimage (~> 2.0, >= 1.8)
44-
jekyll (>= 3.5, < 4.0)
45-
jekyll-sanity (~> 1.2)
46-
liquid-tag-parser (~> 1.0)
47-
nokogiri (~> 1.8)
48-
pathutil (~> 0.16)
49-
sprockets (>= 3.3, < 4.1.beta)
44+
terminal-table (>= 1.8, < 4.0)
45+
webrick (~> 1.7)
5046
jekyll-feed (0.15.1)
5147
jekyll (>= 3.7, < 5.0)
5248
jekyll-paginate (1.1.0)
53-
jekyll-sanity (1.6.0)
54-
jekyll (>= 3.1, < 5.0)
55-
pathutil (~> 0.16)
56-
jekyll-sass-converter (1.5.2)
57-
sass (~> 3.4)
49+
jekyll-sass-converter (3.1.0)
50+
sass-embedded (~> 1.75)
5851
jekyll-seo-tag (2.7.1)
5952
jekyll (>= 3.8, < 5.0)
6053
jekyll-sitemap (1.4.0)
6154
jekyll (>= 3.7, < 5.0)
6255
jekyll-watch (2.2.1)
6356
listen (~> 3.0)
64-
kramdown (2.3.1)
65-
rexml
57+
json (2.19.3)
58+
kramdown (2.5.2)
59+
rexml (>= 3.4.4)
6660
kramdown-parser-gfm (1.1.0)
6761
kramdown (~> 2.0)
68-
liquid (4.0.3)
69-
liquid-tag-parser (1.9.0)
70-
extras (~> 0.3)
71-
liquid (>= 3.0, < 5.0)
72-
listen (3.7.0)
62+
liquid (4.0.4)
63+
listen (3.10.0)
64+
logger
7365
rb-fsevent (~> 0.10, >= 0.10.3)
7466
rb-inotify (~> 0.9, >= 0.9.10)
75-
mercenary (0.3.6)
76-
minitest (5.14.4)
77-
nokogiri (1.15.6-x86_64-darwin)
78-
racc (~> 1.4)
79-
nokogiri (1.15.6-x86_64-linux)
80-
racc (~> 1.4)
67+
logger (1.7.0)
68+
mercenary (0.4.0)
8169
pathutil (0.16.2)
8270
forwardable-extended (~> 2.6)
83-
public_suffix (4.0.6)
84-
racc (1.7.3)
85-
rack (2.2.22)
86-
rb-fsevent (0.11.0)
87-
rb-inotify (0.10.1)
71+
public_suffix (7.0.5)
72+
rake (13.3.1)
73+
rb-fsevent (0.11.2)
74+
rb-inotify (0.11.1)
8875
ffi (~> 1.0)
89-
rexml (3.4.2)
90-
rouge (3.26.1)
76+
rexml (3.4.4)
77+
rouge (4.7.0)
9178
safe_yaml (1.0.5)
92-
sass (3.7.4)
93-
sass-listen (~> 4.0.0)
94-
sass-listen (4.0.0)
95-
rb-fsevent (~> 0.9, >= 0.9.4)
96-
rb-inotify (~> 0.9, >= 0.9.7)
97-
sprockets (3.7.2)
98-
concurrent-ruby (~> 1.0)
99-
rack (> 1, < 3)
100-
thread_safe (0.3.6)
101-
tzinfo (1.2.10)
102-
thread_safe (~> 0.1)
79+
sass-embedded (1.99.0-x86_64-darwin)
80+
google-protobuf (~> 4.31)
81+
sass-embedded (1.99.0-x86_64-linux-gnu)
82+
google-protobuf (~> 4.31)
83+
terminal-table (3.0.2)
84+
unicode-display_width (>= 1.1.1, < 3)
85+
unicode-display_width (2.6.0)
86+
webrick (1.9.2)
10387

10488
PLATFORMS
10589
x86_64-darwin-20
10690
x86_64-darwin-21
10791
x86_64-linux
10892

10993
DEPENDENCIES
110-
jekyll (~> 3.9.0)
111-
jekyll-assets
94+
jekyll (~> 4.3)
11295
jekyll-feed
11396
jekyll-paginate
11497
jekyll-seo-tag
11598
jekyll-sitemap
116-
kramdown-parser-gfm (~> 1.1.0)
117-
nokogiri (~> 1.15.6)
118-
sprockets (~> 3.7)
99+
100+
RUBY VERSION
101+
ruby 3.2.0p0
119102

120103
BUNDLED WITH
121-
2.2.22
104+
2.4.1

_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ assets:
3333

3434

3535
plugins:
36-
- jekyll-assets
3736
- jekyll-feed
3837
- jekyll-paginate
3938
- jekyll-seo-tag

_includes/head.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<title>{{ page.title }} &middot; {{ site.title }}</title>
44
<meta name="viewport" content="initial-scale=1">
55
<meta name="theme-color" content="#382b42">
6-
{% asset style.css %}
7-
<link rel="icon" href="{% asset favicon.svg @path %}" sizes="any" type="image/svg+xml">
6+
<link rel="stylesheet" href="/assets/css/style.css">
7+
<link rel="icon" href="/assets/img/favicon.svg" type="image/svg+xml">
88
{% seo title=false %}
99
{% feed_meta %}
1010
</head>
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)