Skip to content

Commit 68adcf8

Browse files
authored
Chore: Bulk update gems + update to Ruby 3.1.3 (#8822)
* bulk update gems * test * 3.1.3 * add webrick * update slate * pronto * liquid-c * cmake pkg-config * liquid-c * remove liquid-c from workflow * nkf * Update Gemfile
1 parent 0b676c5 commit 68adcf8

File tree

9 files changed

+108
-105
lines changed

9 files changed

+108
-105
lines changed

.circleci/config.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
build_api_docs: # a job to manage building our api documentation and persisting it to the workspace.
152152
executor:
153153
name: ruby/default
154-
tag: '2.7.6-browsers'
154+
tag: '3.1.3-browsers'
155155
steps:
156156
- checkout
157157
- *attach_workspace
@@ -187,7 +187,7 @@ jobs:
187187
build:
188188
executor:
189189
name: ruby/default
190-
tag: '2.7.6-browsers'
190+
tag: '3.1.3-browsers'
191191
resource_class: medium+
192192
working_directory: ~/circleci-docs
193193
environment:
@@ -203,9 +203,7 @@ jobs:
203203
command: md-proofer lint jekyll/_cci2/ jekyll/_api/
204204
- run:
205205
name: Install dependencies for pronto gem
206-
command: |
207-
sudo apt-get update --allow-releaseinfo-change
208-
sudo apt-get install cmake pkg-config
206+
command: sudo apt-get install cmake pkg-config
209207
- ruby-deps
210208
- node/install-packages:
211209
pkg-manager: yarn
@@ -228,7 +226,7 @@ jobs:
228226
# remove unusued /api folder.
229227
rm -rf jekyll/_api/api
230228
cp -r /tmp/workspace/api/* jekyll/_api/
231-
- run: sudo apt-get update; sudo apt-get --yes install nkf
229+
- run: sudo apt-get --yes install nkf
232230
- set-jekyll-basename
233231
- run:
234232
name: Build the Jekyll site
@@ -263,7 +261,7 @@ jobs:
263261
reindex-search:
264262
executor:
265263
name: ruby/default
266-
tag: '2.7.6-browsers'
264+
tag: '3.1.3-browsers'
267265
working_directory: ~/circleci-docs
268266
environment:
269267
JEKYLL_ENV: production

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.6
1+
3.1.3

Dockerfile

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

33
RUN apt update -y
44
RUN apt-get install -y cmake pkg-config

Gemfile

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

3-
ruby '2.7.6'
3+
ruby '3.1.3'
44

55
gem "jekyll", '~> 4.2.0', github: "jekyll/jekyll"
66
gem 'html-proofer'
@@ -9,11 +9,10 @@ gem 'pygments.rb', '~> 1.1.2'
99
gem 'rake'
1010
gem 'dotenv'
1111
gem "kramdown-parser-gfm"
12-
gem "liquid-c"
13-
gem 'nokogiri', '~> 1.14'
12+
gem 'liquid-c', '~> 4.0.1'
1413
gem 'htmlcompressor'
1514
gem 'htmlentities', '~> 4.3', '>= 4.3.4'
16-
gem 'rack', '~> 2.2.3.1'
15+
gem 'rack', '~> 2.2.6.3'
1716

1817
group :jekyll_plugins do
1918
gem 'jekyll-sitemap'

Gemfile.lock

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ GEM
100100
kramdown-parser-gfm (1.1.0)
101101
kramdown (~> 2.0)
102102
liquid (4.0.3)
103-
liquid-c (4.0.0)
103+
liquid-c (4.0.1)
104104
liquid (>= 3.0.0)
105105
listen (3.5.1)
106106
rb-fsevent (~> 0.10, >= 0.10.3)
@@ -139,7 +139,7 @@ GEM
139139
pygments.rb (1.1.2)
140140
multi_json (>= 1.0.0)
141141
racc (1.7.1)
142-
rack (2.2.3.1)
142+
rack (2.2.6.4)
143143
rainbow (3.0.0)
144144
rake (13.0.3)
145145
rb-fsevent (0.11.0)
@@ -180,16 +180,15 @@ DEPENDENCIES
180180
jekyll-last-modified-at
181181
jekyll-sitemap
182182
kramdown-parser-gfm
183-
liquid-c
184-
nokogiri (~> 1.14)
183+
liquid-c (~> 4.0.1)
185184
pronto
186185
pronto-markdownlint
187186
pygments.rb (~> 1.1.2)
188-
rack (~> 2.2.3.1)
187+
rack (~> 2.2.6.3)
189188
rake
190189

191190
RUBY VERSION
192-
ruby 2.7.6p219
191+
ruby 3.1.3p185
193192

194193
BUNDLED WITH
195194
2.1.4

jekyll/Gemfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

jekyll/Gemfile.lock

Lines changed: 0 additions & 1 deletion
This file was deleted.

src-api/Gemfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
ruby '>=2.3.1'
1+
ruby '3.1.3'
22
source 'https://rubygems.org'
33

44
# Middleman
5-
gem 'middleman', '~> 4.3.7'
6-
gem 'middleman-syntax', '~> 3.0.0'
7-
gem 'middleman-autoprefixer', '~> 2.7.1'
8-
gem 'middleman-sprockets', '~> 4.1.0'
9-
gem 'rouge', '~> 2.0.5'
10-
gem 'redcarpet', '~> 3.4.0'
11-
gem 'nokogiri', '~> 1.14.3'
5+
gem 'middleman', '~> 4.4'
6+
gem 'middleman-syntax', '~> 3.2'
7+
gem 'middleman-autoprefixer', '~> 3.0'
8+
gem 'middleman-sprockets', '~> 4.1'
9+
gem 'rouge', '~> 3.21'
10+
gem 'redcarpet', '~> 3.6.0'
11+
gem 'nokogiri', '~> 1.13.3'
1212
gem 'sprockets', '~> 3.7'
13-
gem 'sass', '~> 3.7'
14-
gem 'rack', '~> 2.2.3.1'
13+
gem 'sass'
14+
gem 'webrick'

src-api/Gemfile.lock

Lines changed: 83 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,108 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.2.6)
4+
activesupport (7.0.8.4)
55
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)
11-
autoprefixer-rails (6.7.7.2)
12-
execjs
13-
backports (3.21.0)
6+
i18n (>= 1.6, < 2)
7+
minitest (>= 5.1)
8+
tzinfo (~> 2.0)
9+
addressable (2.8.7)
10+
public_suffix (>= 2.0.2, < 7.0)
11+
autoprefixer-rails (10.4.16.0)
12+
execjs (~> 2)
13+
backports (3.25.0)
14+
base64 (0.2.0)
1415
coffee-script (2.4.1)
1516
coffee-script-source
1617
execjs
1718
coffee-script-source (1.12.2)
18-
concurrent-ruby (1.1.9)
19-
contracts (0.13.0)
20-
dotenv (2.7.6)
19+
concurrent-ruby (1.3.3)
20+
contracts (0.16.1)
21+
dotenv (3.1.2)
2122
erubis (2.7.0)
22-
execjs (2.8.1)
23+
execjs (2.9.1)
2324
fast_blank (1.0.1)
24-
fastimage (2.2.5)
25-
ffi (1.15.3)
26-
haml (5.2.2)
27-
temple (>= 0.8.0)
25+
fastimage (2.3.1)
26+
ffi (1.17.0)
27+
haml (6.3.0)
28+
temple (>= 0.8.2)
29+
thor
2830
tilt
2931
hamster (3.0.0)
3032
concurrent-ruby (~> 1.0)
3133
hashie (3.6.0)
32-
i18n (0.9.5)
34+
i18n (1.6.0)
3335
concurrent-ruby (~> 1.0)
34-
kramdown (2.3.1)
36+
kramdown (2.4.0)
3537
rexml
36-
listen (3.0.8)
37-
rb-fsevent (~> 0.9, >= 0.9.4)
38-
rb-inotify (~> 0.9, >= 0.9.7)
38+
listen (3.9.0)
39+
rb-fsevent (~> 0.10, >= 0.10.3)
40+
rb-inotify (~> 0.9, >= 0.9.10)
3941
memoist (0.16.2)
40-
middleman (4.3.11)
42+
middleman (4.5.1)
4143
coffee-script (~> 2.2)
4244
haml (>= 4.0.5)
4345
kramdown (>= 2.3.0)
44-
middleman-cli (= 4.3.11)
45-
middleman-core (= 4.3.11)
46-
middleman-autoprefixer (2.7.1)
47-
autoprefixer-rails (>= 6.5.2, < 7.0.0)
48-
middleman-core (>= 3.3.3)
49-
middleman-cli (4.3.11)
50-
thor (>= 0.17.0, < 2.0)
51-
middleman-core (4.3.11)
52-
activesupport (>= 4.2, < 6.0)
53-
addressable (~> 2.3)
46+
middleman-cli (= 4.5.1)
47+
middleman-core (= 4.5.1)
48+
middleman-autoprefixer (3.0.0)
49+
autoprefixer-rails (~> 10.0)
50+
middleman-core (>= 4.0.0)
51+
middleman-cli (4.5.1)
52+
thor (>= 0.17.0, < 1.3.0)
53+
middleman-core (4.5.1)
54+
activesupport (>= 6.1, < 7.1)
55+
addressable (~> 2.4)
5456
backports (~> 3.6)
55-
bundler
56-
contracts (~> 0.13.0)
57+
bundler (~> 2.0)
58+
contracts (~> 0.13, < 0.17)
5759
dotenv
5860
erubis
5961
execjs (~> 2.0)
6062
fast_blank
6163
fastimage (~> 2.0)
6264
hamster (~> 3.0)
6365
hashie (~> 3.4)
64-
i18n (~> 0.9.0)
65-
listen (~> 3.0.0)
66+
i18n (~> 1.6.0)
67+
listen (~> 3.0)
6668
memoist (~> 0.14)
67-
padrino-helpers (~> 0.13.0)
69+
padrino-helpers (~> 0.15.0)
6870
parallel
6971
rack (>= 1.4.5, < 3)
7072
sassc (~> 2.0)
7173
servolux
7274
tilt (~> 2.0.9)
75+
toml
7376
uglifier (~> 3.0)
77+
webrick
7478
middleman-sprockets (4.1.1)
7579
middleman-core (~> 4.0)
7680
sprockets (>= 3.0)
77-
middleman-syntax (3.0.0)
81+
middleman-syntax (3.4.0)
7882
middleman-core (>= 3.2)
79-
rouge (~> 2.0)
80-
mini_portile2 (2.8.1)
81-
minitest (5.14.4)
82-
nokogiri (1.14.3)
83+
rouge (~> 3.2)
84+
mini_portile2 (2.8.7)
85+
minitest (5.24.0)
86+
nokogiri (1.13.10)
8387
mini_portile2 (~> 2.8.0)
8488
racc (~> 1.4)
85-
padrino-helpers (0.13.3.4)
86-
i18n (~> 0.6, >= 0.6.7)
87-
padrino-support (= 0.13.3.4)
89+
padrino-helpers (0.15.3)
90+
i18n (>= 0.6.7, < 2)
91+
padrino-support (= 0.15.3)
8892
tilt (>= 1.4.1, < 3)
89-
padrino-support (0.13.3.4)
90-
activesupport (>= 3.1)
91-
parallel (1.20.1)
92-
public_suffix (4.0.6)
93-
racc (1.6.2)
94-
rack (2.2.3.1)
95-
rb-fsevent (0.11.0)
96-
rb-inotify (0.10.1)
93+
padrino-support (0.15.3)
94+
parallel (1.25.1)
95+
parslet (2.0.0)
96+
public_suffix (6.0.0)
97+
racc (1.8.0)
98+
rack (2.2.9)
99+
rb-fsevent (0.11.2)
100+
rb-inotify (0.11.1)
97101
ffi (~> 1.0)
98-
redcarpet (3.4.0)
99-
rexml (3.2.5)
100-
rouge (2.0.7)
102+
redcarpet (3.6.0)
103+
rexml (3.3.1)
104+
strscan
105+
rouge (3.30.0)
101106
sass (3.7.4)
102107
sass-listen (~> 4.0.0)
103108
sass-listen (4.0.0)
@@ -106,35 +111,39 @@ GEM
106111
sassc (2.4.0)
107112
ffi (~> 1.9)
108113
servolux (0.13.0)
109-
sprockets (3.7.2)
114+
sprockets (3.7.3)
115+
base64
110116
concurrent-ruby (~> 1.0)
111117
rack (> 1, < 3)
112-
temple (0.8.2)
113-
thor (1.1.0)
114-
thread_safe (0.3.6)
115-
tilt (2.0.10)
116-
tzinfo (1.2.9)
117-
thread_safe (~> 0.1)
118+
strscan (3.1.0)
119+
temple (0.10.3)
120+
thor (1.2.2)
121+
tilt (2.0.11)
122+
toml (0.3.0)
123+
parslet (>= 1.8.0, < 3.0.0)
124+
tzinfo (2.0.6)
125+
concurrent-ruby (~> 1.0)
118126
uglifier (3.2.0)
119127
execjs (>= 0.3.0, < 3)
128+
webrick (1.8.1)
120129

121130
PLATFORMS
122131
ruby
123132

124133
DEPENDENCIES
125-
middleman (~> 4.3.7)
126-
middleman-autoprefixer (~> 2.7.1)
127-
middleman-sprockets (~> 4.1.0)
128-
middleman-syntax (~> 3.0.0)
129-
nokogiri (~> 1.14.3)
130-
rack (~> 2.2.3.1)
131-
redcarpet (~> 3.4.0)
132-
rouge (~> 2.0.5)
133-
sass (~> 3.7)
134+
middleman (~> 4.4)
135+
middleman-autoprefixer (~> 3.0)
136+
middleman-sprockets (~> 4.1)
137+
middleman-syntax (~> 3.2)
138+
nokogiri (~> 1.13.3)
139+
redcarpet (~> 3.6.0)
140+
rouge (~> 3.21)
141+
sass
134142
sprockets (~> 3.7)
143+
webrick
135144

136145
RUBY VERSION
137-
ruby 2.3.3p222
146+
ruby 3.1.3p185
138147

139148
BUNDLED WITH
140149
2.1.4

0 commit comments

Comments
 (0)