Skip to content

Commit 342bd28

Browse files
authored
Merge pull request #266 from gonX/2025-update-deps
Update dependencies
2 parents 84b8c7f + 5f5f229 commit 342bd28

File tree

6 files changed

+108
-86
lines changed

6 files changed

+108
-86
lines changed

.github/workflows/jekyll-build-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: ruby/setup-ruby@v1
2020
with:
2121
working-directory: "site/"
22-
ruby-version: '3.2' # Not needed with a .ruby-version file
22+
ruby-version: '3.4' # Not needed with a .ruby-version file
2323
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
2424

2525
- name: Build site

.github/workflows/jekyll.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Setup Ruby
4747
uses: ruby/setup-ruby@v1
4848
with:
49-
ruby-version: '3.0' # Not needed with a .ruby-version file
49+
ruby-version: '3.4' # Not needed with a .ruby-version file
5050
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
5151

5252
- name: Check final HTML with html-proofer

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The next version of OpenTabletDriver.Web
66

77
### Requirements
88

9-
- [Ruby](https://www.ruby-lang.org/en/downloads/)
9+
- [Ruby](https://www.ruby-lang.org/en/downloads/) (tested with Ruby 3.4)
1010

1111
## Steps
1212

site/Gemfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ source "https://rubygems.org"
1212
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
1313
# uncomment the line below. To upgrade, run `bundle update github-pages`.
1414
gem 'jekyll', '~> 4.3'
15-
# If you have any plugins, put them here!
15+
1616
group :jekyll_plugins do
17-
gem 'jekyll-github-metadata', '~> 2.16'
17+
# If you have any plugins, put them here!
1818
end
1919

2020
gem 'json'
21-
gem "bootswatch", github: "thomaspark/bootswatch", tag: "v5.3.3"
22-
gem "bootstrap", "~> 5.3.3"
21+
gem "bootswatch", github: "thomaspark/bootswatch", tag: "v5.3.6"
22+
gem "bootstrap", "~> 5.3.5"
23+
24+
# pinned version of dependency of jekyll-sass-converter, as it emits deprecation warnings until
25+
# bootstrap v5.5.0 - see https://github.com/OpenTabletDriver/opentabletdriver.github.io/issues/212
26+
gem 'sass-embedded', "~> 1.78.0"
2327

2428
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
2529
# and associated library.

site/Gemfile.lock

Lines changed: 96 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,144 @@
11
GIT
22
remote: https://github.com/thomaspark/bootswatch.git
3-
revision: 646c94da2c262473c6f73664f4547c046f3a28dd
4-
tag: v5.3.3
3+
revision: c72edbf8ae5d3607cb3d07f56917feac654266fd
4+
tag: v5.3.6
55
specs:
6-
bootswatch (5.3.3)
6+
bootswatch (5.3.6)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
addressable (2.8.6)
12-
public_suffix (>= 2.0.2, < 6.0)
13-
autoprefixer-rails (10.4.19.0)
14-
execjs (~> 2)
15-
bootstrap (5.3.3)
16-
autoprefixer-rails (>= 9.1.0)
11+
addressable (2.8.7)
12+
public_suffix (>= 2.0.2, < 7.0)
13+
base64 (0.3.0)
14+
bigdecimal (3.2.2)
15+
bootstrap (5.3.5)
1716
popper_js (>= 2.11.8, < 3)
1817
colorator (1.1.0)
19-
concurrent-ruby (1.2.3)
18+
concurrent-ruby (1.3.5)
19+
csv (3.3.5)
2020
em-websocket (0.5.3)
2121
eventmachine (>= 0.12.9)
2222
http_parser.rb (~> 0)
2323
eventmachine (1.2.7)
24-
execjs (2.10.0)
25-
faraday (2.9.0)
26-
faraday-net_http (>= 2.0, < 3.2)
27-
faraday-net_http (3.1.0)
28-
net-http
29-
ffi (1.16.3)
24+
ffi (1.17.2)
25+
ffi (1.17.2-aarch64-linux-gnu)
26+
ffi (1.17.2-aarch64-linux-musl)
27+
ffi (1.17.2-arm-linux-gnu)
28+
ffi (1.17.2-arm-linux-musl)
29+
ffi (1.17.2-arm64-darwin)
30+
ffi (1.17.2-x86-linux-gnu)
31+
ffi (1.17.2-x86-linux-musl)
32+
ffi (1.17.2-x86_64-darwin)
33+
ffi (1.17.2-x86_64-linux-gnu)
34+
ffi (1.17.2-x86_64-linux-musl)
3035
forwardable-extended (2.6.0)
31-
google-protobuf (3.25.3)
32-
google-protobuf (3.25.3-aarch64-linux)
33-
google-protobuf (3.25.3-arm64-darwin)
34-
google-protobuf (3.25.3-x86-linux)
35-
google-protobuf (3.25.3-x86_64-darwin)
36-
google-protobuf (3.25.3-x86_64-linux)
36+
google-protobuf (4.31.1)
37+
bigdecimal
38+
rake (>= 13)
39+
google-protobuf (4.31.1-aarch64-linux-gnu)
40+
bigdecimal
41+
rake (>= 13)
42+
google-protobuf (4.31.1-aarch64-linux-musl)
43+
bigdecimal
44+
rake (>= 13)
45+
google-protobuf (4.31.1-arm64-darwin)
46+
bigdecimal
47+
rake (>= 13)
48+
google-protobuf (4.31.1-x86-linux-gnu)
49+
bigdecimal
50+
rake (>= 13)
51+
google-protobuf (4.31.1-x86-linux-musl)
52+
bigdecimal
53+
rake (>= 13)
54+
google-protobuf (4.31.1-x86_64-darwin)
55+
bigdecimal
56+
rake (>= 13)
57+
google-protobuf (4.31.1-x86_64-linux-gnu)
58+
bigdecimal
59+
rake (>= 13)
60+
google-protobuf (4.31.1-x86_64-linux-musl)
61+
bigdecimal
62+
rake (>= 13)
3763
http_parser.rb (0.8.0)
38-
i18n (1.14.4)
64+
i18n (1.14.7)
3965
concurrent-ruby (~> 1.0)
40-
jekyll (4.3.3)
66+
jekyll (4.4.1)
4167
addressable (~> 2.4)
68+
base64 (~> 0.2)
4269
colorator (~> 1.0)
70+
csv (~> 3.0)
4371
em-websocket (~> 0.5)
4472
i18n (~> 1.0)
4573
jekyll-sass-converter (>= 2.0, < 4.0)
4674
jekyll-watch (~> 2.0)
75+
json (~> 2.6)
4776
kramdown (~> 2.3, >= 2.3.1)
4877
kramdown-parser-gfm (~> 1.0)
4978
liquid (~> 4.0)
50-
mercenary (>= 0.3.6, < 0.5)
79+
mercenary (~> 0.3, >= 0.3.6)
5180
pathutil (~> 0.9)
5281
rouge (>= 3.0, < 5.0)
5382
safe_yaml (~> 1.0)
5483
terminal-table (>= 1.8, < 4.0)
5584
webrick (~> 1.7)
56-
jekyll-github-metadata (2.16.1)
57-
jekyll (>= 3.4, < 5.0)
58-
octokit (>= 4, < 7, != 4.4.0)
59-
jekyll-sass-converter (3.0.0)
60-
sass-embedded (~> 1.54)
85+
jekyll-sass-converter (3.1.0)
86+
sass-embedded (~> 1.75)
6187
jekyll-watch (2.2.1)
6288
listen (~> 3.0)
63-
json (2.7.6)
64-
kramdown (2.4.0)
65-
rexml
89+
json (2.12.2)
90+
kramdown (2.5.1)
91+
rexml (>= 3.3.9)
6692
kramdown-parser-gfm (1.1.0)
6793
kramdown (~> 2.0)
6894
liquid (4.0.4)
6995
listen (3.9.0)
7096
rb-fsevent (~> 0.10, >= 0.10.3)
7197
rb-inotify (~> 0.9, >= 0.9.10)
7298
mercenary (0.4.0)
73-
net-http (0.4.1)
74-
uri
75-
octokit (6.1.1)
76-
faraday (>= 1, < 3)
77-
sawyer (~> 0.9)
7899
pathutil (0.16.2)
79100
forwardable-extended (~> 2.6)
80101
popper_js (2.11.8)
81-
public_suffix (5.0.4)
102+
public_suffix (6.0.2)
103+
rake (13.3.0)
82104
rb-fsevent (0.11.2)
83-
rb-inotify (0.10.1)
105+
rb-inotify (0.11.1)
84106
ffi (~> 1.0)
85-
rexml (3.2.6)
86-
rouge (4.2.0)
107+
rexml (3.4.1)
108+
rouge (4.5.2)
87109
safe_yaml (1.0.5)
88-
sass-embedded (1.69.5-aarch64-linux-android)
89-
google-protobuf (~> 3.23)
90-
sass-embedded (1.69.5-aarch64-linux-gnu)
91-
google-protobuf (~> 3.23)
92-
sass-embedded (1.69.5-aarch64-linux-musl)
93-
google-protobuf (~> 3.23)
94-
sass-embedded (1.69.5-arm-linux-androideabi)
95-
google-protobuf (~> 3.23)
96-
sass-embedded (1.69.5-arm-linux-gnueabihf)
97-
google-protobuf (~> 3.23)
98-
sass-embedded (1.69.5-arm-linux-musleabihf)
99-
google-protobuf (~> 3.23)
100-
sass-embedded (1.69.5-arm64-darwin)
101-
google-protobuf (~> 3.23)
102-
sass-embedded (1.69.5-x86-linux-android)
103-
google-protobuf (~> 3.23)
104-
sass-embedded (1.69.5-x86-linux-gnu)
105-
google-protobuf (~> 3.23)
106-
sass-embedded (1.69.5-x86-linux-musl)
107-
google-protobuf (~> 3.23)
108-
sass-embedded (1.69.5-x86_64-darwin)
109-
google-protobuf (~> 3.23)
110-
sass-embedded (1.69.5-x86_64-linux-android)
111-
google-protobuf (~> 3.23)
112-
sass-embedded (1.69.5-x86_64-linux-gnu)
113-
google-protobuf (~> 3.23)
114-
sass-embedded (1.69.5-x86_64-linux-musl)
115-
google-protobuf (~> 3.23)
116-
sawyer (0.9.2)
117-
addressable (>= 2.3.5)
118-
faraday (>= 0.17.3, < 3)
110+
sass-embedded (1.78.0-aarch64-linux-android)
111+
google-protobuf (~> 4.27)
112+
sass-embedded (1.78.0-aarch64-linux-gnu)
113+
google-protobuf (~> 4.27)
114+
sass-embedded (1.78.0-aarch64-linux-musl)
115+
google-protobuf (~> 4.27)
116+
sass-embedded (1.78.0-arm-linux-androideabi)
117+
google-protobuf (~> 4.27)
118+
sass-embedded (1.78.0-arm-linux-gnueabihf)
119+
google-protobuf (~> 4.27)
120+
sass-embedded (1.78.0-arm-linux-musleabihf)
121+
google-protobuf (~> 4.27)
122+
sass-embedded (1.78.0-arm64-darwin)
123+
google-protobuf (~> 4.27)
124+
sass-embedded (1.78.0-x86-linux-android)
125+
google-protobuf (~> 4.27)
126+
sass-embedded (1.78.0-x86-linux-gnu)
127+
google-protobuf (~> 4.27)
128+
sass-embedded (1.78.0-x86-linux-musl)
129+
google-protobuf (~> 4.27)
130+
sass-embedded (1.78.0-x86_64-darwin)
131+
google-protobuf (~> 4.27)
132+
sass-embedded (1.78.0-x86_64-linux-android)
133+
google-protobuf (~> 4.27)
134+
sass-embedded (1.78.0-x86_64-linux-gnu)
135+
google-protobuf (~> 4.27)
136+
sass-embedded (1.78.0-x86_64-linux-musl)
137+
google-protobuf (~> 4.27)
119138
terminal-table (3.0.2)
120139
unicode-display_width (>= 1.1.1, < 3)
121-
unicode-display_width (2.5.0)
122-
uri (0.13.0)
123-
webrick (1.8.1)
140+
unicode-display_width (2.6.0)
141+
webrick (1.9.1)
124142

125143
PLATFORMS
126144
aarch64-linux
@@ -141,12 +159,12 @@ PLATFORMS
141159
x86_64-linux-musl
142160

143161
DEPENDENCIES
144-
bootstrap (~> 5.3.3)
162+
bootstrap (~> 5.3.5)
145163
bootswatch!
146164
http_parser.rb (~> 0.6.0)
147165
jekyll (~> 4.3)
148-
jekyll-github-metadata (~> 2.16)
149166
json
167+
sass-embedded (~> 1.78.0)
150168
tzinfo (>= 1, < 3)
151169
tzinfo-data
152170
wdm (~> 0.1.1)

site/assets/css/site.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ div.highlighter-rouge {
6363
}
6464

6565
#page-title {
66-
@include markdown-header;
6766
font-size: calc(1.375em + 1.5vw);
67+
@include markdown-header;
6868
}
6969

7070
@media (min-width: 1200px) {

0 commit comments

Comments
 (0)