Skip to content

Commit 3ea275a

Browse files
authored
Merge pull request #602 from srobo/ruby-3
Move to Ruby 3
2 parents b5d731a + 17ed875 commit 3ea275a

File tree

6 files changed

+42
-39
lines changed

6 files changed

+42
-39
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.3
1+
3.3.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.7
1+
FROM ruby:3.3
22

33
ENV GLOBAL_GEMS=true
44

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ gem 'kramdown'
66
# jekyll depends on kramdown-parser-gfm, but fails to declare it
77
gem 'kramdown-parser-gfm'
88
# Pin to the version used on GitHub Pages
9-
gem 'jekyll', 3.9
9+
gem 'jekyll', '~> 3'
1010
gem 'jekyll-redirect-from'
1111

1212
# For testing output
13-
gem 'html-proofer'
13+
gem 'html-proofer', '~> 4'
1414

1515
# Avoid polling on windows
1616
gem 'wdm', '>= 0.1.0'

Gemfile.lock

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
5-
public_suffix (>= 2.0.2, < 6.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
66
colorator (1.1.0)
7-
concurrent-ruby (1.1.8)
8-
em-websocket (0.5.2)
7+
concurrent-ruby (1.3.4)
8+
csv (3.3.0)
9+
em-websocket (0.5.3)
910
eventmachine (>= 0.12.9)
10-
http_parser.rb (~> 0.6.0)
11-
ethon (0.15.0)
11+
http_parser.rb (~> 0)
12+
ethon (0.16.0)
1213
ffi (>= 1.15.0)
1314
eventmachine (1.2.7)
1415
eventmachine (1.2.7-x64-mingw32)
15-
ffi (1.15.5)
16-
ffi (1.15.5-x64-mingw32)
16+
ffi (1.17.0)
17+
ffi (1.17.0-x64-mingw32)
1718
forwardable-extended (2.6.0)
1819
html-proofer (4.4.3)
1920
addressable (~> 2.3)
@@ -24,14 +25,15 @@ GEM
2425
typhoeus (~> 1.3)
2526
yell (~> 2.0)
2627
zeitwerk (~> 2.5)
27-
http_parser.rb (0.6.0)
28-
i18n (0.9.5)
28+
http_parser.rb (0.8.0)
29+
i18n (1.14.5)
2930
concurrent-ruby (~> 1.0)
30-
jekyll (3.9.0)
31+
jekyll (3.10.0)
3132
addressable (~> 2.4)
3233
colorator (~> 1.0)
34+
csv (~> 3.0)
3335
em-websocket (~> 0.5)
34-
i18n (~> 0.7)
36+
i18n (>= 0.7, < 2)
3537
jekyll-sass-converter (~> 1.0)
3638
jekyll-watch (~> 2.0)
3739
kramdown (>= 1.17, < 3)
@@ -40,43 +42,43 @@ GEM
4042
pathutil (~> 0.9)
4143
rouge (>= 1.7, < 4)
4244
safe_yaml (~> 1.0)
45+
webrick (>= 1.0)
4346
jekyll-redirect-from (0.16.0)
4447
jekyll (>= 3.3, < 5.0)
4548
jekyll-sass-converter (1.5.2)
4649
sass (~> 3.4)
4750
jekyll-watch (2.2.1)
4851
listen (~> 3.0)
49-
kramdown (2.3.1)
52+
kramdown (2.4.0)
5053
rexml
5154
kramdown-parser-gfm (1.1.0)
5255
kramdown (~> 2.0)
53-
liquid (4.0.3)
54-
listen (3.7.1)
56+
liquid (4.0.4)
57+
listen (3.9.0)
5558
rb-fsevent (~> 0.10, >= 0.10.3)
5659
rb-inotify (~> 0.9, >= 0.9.10)
5760
mercenary (0.3.6)
58-
mini_portile2 (2.8.5)
59-
neat (3.0.0)
60-
sass (~> 3.4)
61+
mini_portile2 (2.8.7)
62+
neat (4.0.0)
6163
thor (~> 0.19)
6264
nokogiri (1.15.6)
6365
mini_portile2 (~> 2.8.2)
6466
racc (~> 1.4)
6567
nokogiri (1.15.6-x64-mingw32)
6668
racc (~> 1.4)
67-
parallel (1.22.1)
69+
parallel (1.26.3)
6870
pathutil (0.16.2)
6971
forwardable-extended (~> 2.6)
70-
public_suffix (5.0.0)
71-
racc (1.7.3)
72+
public_suffix (5.1.1)
73+
racc (1.8.1)
7274
rainbow (3.1.1)
73-
rake (12.3.3)
74-
rb-fsevent (0.11.0)
75-
rb-inotify (0.10.1)
75+
rake (13.2.1)
76+
rb-fsevent (0.11.2)
77+
rb-inotify (0.11.1)
7678
ffi (~> 1.0)
77-
rexml (3.3.3)
79+
rexml (3.3.5)
7880
strscan
79-
rouge (3.26.0)
81+
rouge (3.30.0)
8082
safe_yaml (1.0.5)
8183
sass (3.7.4)
8284
sass-listen (~> 4.0.0)
@@ -85,20 +87,20 @@ GEM
8587
rb-inotify (~> 0.9, >= 0.9.7)
8688
strscan (3.1.0)
8789
thor (0.20.3)
88-
typhoeus (1.4.0)
90+
typhoeus (1.4.1)
8991
ethon (>= 0.9.0)
90-
wdm (0.1.1)
91-
webrick (1.7.0)
92+
wdm (0.2.0)
93+
webrick (1.8.1)
9294
yell (2.2.2)
93-
zeitwerk (2.6.1)
95+
zeitwerk (2.6.17)
9496

9597
PLATFORMS
9698
ruby
9799
x64-mingw32
98100

99101
DEPENDENCIES
100-
html-proofer
101-
jekyll (= 3.9)
102+
html-proofer (~> 4)
103+
jekyll (~> 3)
102104
jekyll-redirect-from
103105
kramdown
104106
kramdown-parser-gfm
@@ -108,4 +110,4 @@ DEPENDENCIES
108110
webrick (~> 1.7)
109111

110112
BUNDLED WITH
111-
2.1.4
113+
2.3.6

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Once setup, the site will be accessible on http://localhost:4000/docs/
1414

1515
1. [Install Ruby][install-ruby]
1616

17-
2. Install Bundler (2.x) and Rake
17+
2. Install Bundler (2.3 or above) and Rake
1818

1919
``` shell
2020
$ gem install bundler rake

Rakefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require 'date'
12
require 'fileutils'
23
require 'set'
34
require 'yaml'
@@ -44,7 +45,7 @@ end
4445
task :build_spellings => [:build, :spelling_dependencies]
4546

4647
task :validate_kit_versions do
47-
data = YAML.load_file('_data/kit_versions.yml')
48+
data = YAML.load_file('_data/kit_versions.yml', permitted_classes: [Date])
4849
data.each do |entry|
4950
actual = entry.keys.to_set
5051
expected = ['version', 'released', 'link', 'changelog'].to_set

0 commit comments

Comments
 (0)