Skip to content

Commit 109b059

Browse files
eriksundeneriksunden
committed
Docs generation fix and CR updates.
1 parent 0a50ac5 commit 109b059

File tree

98 files changed

+231
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+231
-121
lines changed

‎.github/workflows/pages.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
working-directory: docs
5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353
- name: Setup Ruby
5454
uses: ruby/setup-ruby@v1
5555
with:
@@ -59,15 +59,15 @@ jobs:
5959
working-directory: '${{ github.workspace }}/docs'
6060
- name: Setup Pages
6161
id: pages
62-
uses: actions/configure-pages@v3
62+
uses: actions/configure-pages@v5
6363
- name: Build with Jekyll
6464
# Outputs to the './_site' directory by default
6565
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
6666
env:
6767
JEKYLL_ENV: production
6868
- name: Upload artifact
6969
# Automatically uploads an artifact from the './_site' directory by default
70-
uses: actions/upload-pages-artifact@v1
70+
uses: actions/upload-pages-artifact@v3
7171
with:
7272
path: "docs/_site/"
7373

@@ -81,4 +81,4 @@ jobs:
8181
steps:
8282
- name: Deploy to GitHub Pages
8383
id: deployment
84-
uses: actions/deploy-pages@v2
84+
uses: actions/deploy-pages@v4

‎data/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright: 2024 Erik Sunden <[email protected]>
2+
# Copyright: 2024-2025 Erik Sunden <[email protected]>
33
#
44
# SPDX-License-Identifier: GPL-3.0-or-later
55
#

‎docs/Gemfile‎

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

3-
gem "jekyll", "~> 4.3.3" # installed by `gem jekyll`
3+
gem "jekyll", "~> 4.4.1" # installed by `gem jekyll`
44
# gem "webrick" # required when using Ruby >= 3 and Jekyll <= 4.2.2
55

6-
gem "just-the-docs", "0.8.2" # pinned to the current release
6+
gem "just-the-docs", "0.10.1" # pinned to the current release
77
# gem "just-the-docs" # always download the latest release
8-
9-
gem 'wdm', '>= 0.1.0' if Gem.win_platform?

‎docs/Gemfile.lock‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,43 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.6)
5-
public_suffix (>= 2.0.2, < 6.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
base64 (0.2.0)
7+
bigdecimal (3.1.9)
68
colorator (1.1.0)
7-
concurrent-ruby (1.2.3)
9+
concurrent-ruby (1.3.5)
10+
csv (3.3.2)
811
em-websocket (0.5.3)
912
eventmachine (>= 0.12.9)
1013
http_parser.rb (~> 0)
1114
eventmachine (1.2.7)
12-
ffi (1.16.3)
13-
ffi (1.16.3-x64-mingw-ucrt)
15+
ffi (1.17.1-arm64-darwin)
16+
ffi (1.17.1-x86_64-linux-gnu)
1417
forwardable-extended (2.6.0)
15-
google-protobuf (4.26.1-arm64-darwin)
18+
google-protobuf (4.29.3-arm64-darwin)
19+
bigdecimal
1620
rake (>= 13)
17-
google-protobuf (4.26.1-x64-mingw-ucrt)
18-
rake (>= 13)
19-
google-protobuf (4.26.1-x86_64-linux)
21+
google-protobuf (4.29.3-x86_64-linux)
22+
bigdecimal
2023
rake (>= 13)
2124
http_parser.rb (0.8.0)
22-
i18n (1.14.4)
25+
i18n (1.14.7)
2326
concurrent-ruby (~> 1.0)
24-
jekyll (4.3.3)
27+
jekyll (4.4.1)
2528
addressable (~> 2.4)
29+
base64 (~> 0.2)
2630
colorator (~> 1.0)
31+
csv (~> 3.0)
2732
em-websocket (~> 0.5)
2833
i18n (~> 1.0)
2934
jekyll-sass-converter (>= 2.0, < 4.0)
3035
jekyll-watch (~> 2.0)
36+
json (~> 2.6)
3137
kramdown (~> 2.3, >= 2.3.1)
3238
kramdown-parser-gfm (~> 1.0)
3339
liquid (~> 4.0)
34-
mercenary (>= 0.3.6, < 0.5)
40+
mercenary (~> 0.3, >= 0.3.6)
3541
pathutil (~> 0.9)
3642
rouge (>= 3.0, < 5.0)
3743
safe_yaml (~> 1.0)
@@ -45,13 +51,14 @@ GEM
4551
jekyll (>= 3.8, < 5.0)
4652
jekyll-watch (2.2.1)
4753
listen (~> 3.0)
48-
just-the-docs (0.8.2)
54+
json (2.9.1)
55+
just-the-docs (0.10.1)
4956
jekyll (>= 3.8.5)
5057
jekyll-include-cache
5158
jekyll-seo-tag (>= 2.0)
5259
rake (>= 12.3.1)
53-
kramdown (2.4.0)
54-
rexml
60+
kramdown (2.5.1)
61+
rexml (>= 3.3.9)
5562
kramdown-parser-gfm (1.1.0)
5663
kramdown (~> 2.0)
5764
liquid (4.0.4)
@@ -61,36 +68,30 @@ GEM
6168
mercenary (0.4.0)
6269
pathutil (0.16.2)
6370
forwardable-extended (~> 2.6)
64-
public_suffix (5.0.5)
71+
public_suffix (6.0.1)
6572
rake (13.2.1)
6673
rb-fsevent (0.11.2)
67-
rb-inotify (0.10.1)
74+
rb-inotify (0.11.1)
6875
ffi (~> 1.0)
69-
rexml (3.2.6)
70-
rouge (4.2.1)
76+
rexml (3.4.0)
77+
rouge (4.5.1)
7178
safe_yaml (1.0.5)
72-
sass-embedded (1.75.0-arm64-darwin)
73-
google-protobuf (>= 3.25, < 5.0)
74-
sass-embedded (1.75.0-x64-mingw-ucrt)
75-
google-protobuf (>= 3.25, < 5.0)
76-
sass-embedded (1.75.0-x86_64-linux-gnu)
77-
google-protobuf (>= 3.25, < 5.0)
79+
sass-embedded (1.83.4-arm64-darwin)
80+
google-protobuf (~> 4.29)
81+
sass-embedded (1.83.4-x86_64-linux-gnu)
82+
google-protobuf (~> 4.29)
7883
terminal-table (3.0.2)
7984
unicode-display_width (>= 1.1.1, < 3)
80-
unicode-display_width (2.5.0)
81-
wdm (0.1.1)
82-
webrick (1.8.1)
85+
unicode-display_width (2.6.0)
86+
webrick (1.9.1)
8387

8488
PLATFORMS
8589
arm64-darwin
86-
x64-mingw-ucrt
87-
x86_64-linux
8890
x86_64-linux-gnu
8991

9092
DEPENDENCIES
91-
jekyll (~> 4.3.3)
92-
just-the-docs (= 0.8.2)
93-
wdm (>= 0.1.0)
93+
jekyll (~> 4.4.1)
94+
just-the-docs (= 0.10.1)
9495

9596
BUNDLED WITH
9697
2.5.9

‎help/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright: 2024 Erik Sunden <[email protected]>
2+
# Copyright: 2024-2025 Erik Sunden <[email protected]>
33
#
44
# SPDX-License-Identifier: GPL-3.0-or-later
55
#

‎src/application.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SPDX-FileCopyrightText:
3-
* 2021-2025 Erik Sundén <[email protected]>
3+
* 2021-2025 Erik Sunden <[email protected]>
44
* 2020 George Florea Bănuș <[email protected]>
55
*
66
* SPDX-License-Identifier: GPL-3.0-or-later

‎src/application.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SPDX-FileCopyrightText:
3-
* 2021-2025 Erik Sundén <[email protected]>
3+
* 2021-2025 Erik Sunden <[email protected]>
44
* 2020 George Florea Bănuș <[email protected]>
55
*
66
* SPDX-License-Identifier: GPL-3.0-or-later

‎src/haction.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SPDX-FileCopyrightText:
3-
* 2021-2025 Erik Sundén <[email protected]>
3+
* 2021-2025 Erik Sunden <[email protected]>
44
* 2020 George Florea Bănuș <[email protected]>
55
*
66
* SPDX-License-Identifier: GPL-3.0-or-later

‎src/haction.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* SPDX-FileCopyrightText:
3-
* 2021-2025 Erik Sundén <[email protected]>
3+
* 2021-2025 Erik Sunden <[email protected]>
44
* 2020 George Florea Bănuș <[email protected]>
55
*
66
* SPDX-License-Identifier: GPL-3.0-or-later

‎src/httpserverthread.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/*
2+
* SPDX-FileCopyrightText:
3+
* 2024-2025 Erik Sunden <[email protected]>
4+
*
5+
* SPDX-License-Identifier: GPL-3.0-or-later
6+
*/
7+
18
#include "httpserverthread.h"
29
#include "mpvobject.h"
310
#include "playbacksettings.h"

0 commit comments

Comments
 (0)