Skip to content

Commit a1f29d9

Browse files
authored
Merge pull request #1000 from tdiary/bundle_update_and_ruby3_1
support ruby 3.1 and update bundles
2 parents 489dc6d + 4d9e702 commit a1f29d9

File tree

4 files changed

+37
-41
lines changed

4 files changed

+37
-41
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: build (${{ matrix.ruby }}/${{ matrix.test_mode }})
88
strategy:
99
matrix:
10-
ruby: [ '3.0', '2.7', '2.6' ]
10+
ruby: [ '3.1', '3.0', '2.7', '2.6' ]
1111
test_mode: [ rack, gem ]
1212
runs-on: ubuntu-latest
1313
steps:

Gemfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ GEM
2828
docile (1.4.0)
2929
emot (0.0.4)
3030
thor
31-
faraday (1.9.3)
31+
faraday (1.10.0)
3232
faraday-em_http (~> 1.0)
3333
faraday-em_synchrony (~> 1.0)
3434
faraday-excon (~> 1.1)
@@ -71,7 +71,7 @@ GEM
7171
matrix (0.4.2)
7272
mime-types (3.4.1)
7373
mime-types-data (~> 3.2015)
74-
mime-types-data (3.2021.1115)
74+
mime-types-data (3.2022.0105)
7575
mini_mime (1.1.2)
7676
mini_portile2 (2.8.0)
7777
multipart-post (2.1.1)
@@ -101,7 +101,7 @@ GEM
101101
rack-test (>= 0.5)
102102
rake (13.0.6)
103103
redcarpet (3.5.1)
104-
regexp_parser (2.2.0)
104+
regexp_parser (2.2.1)
105105
reline (0.3.1)
106106
io-console (~> 0.5)
107107
rexml (3.2.5)
@@ -141,7 +141,7 @@ GEM
141141
power_assert
142142
thor (1.2.1)
143143
timeout (0.2.0)
144-
tins (1.30.0)
144+
tins (1.31.0)
145145
sync
146146
webrick (1.7.0)
147147
xpath (3.2.0)
@@ -179,4 +179,4 @@ DEPENDENCIES
179179
webrick
180180

181181
BUNDLED WITH
182-
2.2.32
182+
2.3.8

misc/paas/heroku/Gemfile.local

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ruby '~> 3.1.0'
1+
ruby '~> 3.1.1'
22
gem 'puma', require: false
33
gem 'tdiary-io-mongodb', git: 'https://github.com/tdiary/tdiary-io-mongodb.git'
44
gem 'tdiary-contrib', git: 'https://github.com/tdiary/tdiary-contrib.git'

misc/paas/heroku/Gemfile.lock

+30-34
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,16 @@ GIT
2121
GEM
2222
remote: https://rubygems.org/
2323
specs:
24-
activemodel (6.1.4.4)
25-
activesupport (= 6.1.4.4)
26-
activesupport (6.1.4.4)
24+
activemodel (7.0.2.2)
25+
activesupport (= 7.0.2.2)
26+
activesupport (7.0.2.2)
2727
concurrent-ruby (~> 1.0, >= 1.0.2)
2828
i18n (>= 1.6, < 2)
2929
minitest (>= 5.1)
3030
tzinfo (~> 2.0)
31-
zeitwerk (~> 2.3)
3231
addressable (2.8.0)
3332
public_suffix (>= 2.0.2, < 5.0)
34-
bson (4.13.0)
33+
bson (4.14.1)
3534
capybara (3.36.0)
3635
addressable
3736
matrix
@@ -61,13 +60,13 @@ GEM
6160
docile (1.4.0)
6261
emot (0.0.4)
6362
thor
64-
faraday (0.17.4)
63+
faraday (0.17.5)
6564
multipart-post (>= 1.2, < 3)
6665
fastimage (2.2.6)
6766
hashie (5.0.0)
6867
hikidoc (0.1.0)
6968
holiday_japan (1.4.4)
70-
i18n (1.8.11)
69+
i18n (1.10.0)
7170
concurrent-ruby (~> 1.0)
7271
idn-ruby (0.1.4)
7372
io-console (0.5.11)
@@ -89,14 +88,13 @@ GEM
8988
memcachier (0.0.2)
9089
mime-types (3.4.1)
9190
mime-types-data (~> 3.2015)
92-
mime-types-data (3.2021.1115)
91+
mime-types-data (3.2022.0105)
9392
mini_mime (1.1.2)
94-
mini_portile2 (2.6.1)
9593
minitest (5.15.0)
9694
mongo (2.17.0)
9795
bson (>= 4.8.2, < 5.0.0)
98-
mongoid (7.3.3)
99-
activemodel (>= 5.1, < 6.2)
96+
mongoid (7.3.4)
97+
activemodel (>= 5.1, < 7.1, != 7.0.0)
10098
mongo (>= 2.10.5, < 3.0.0)
10199
ruby2_keywords (~> 0.0.5)
102100
multipart-post (2.1.1)
@@ -108,11 +106,10 @@ GEM
108106
net-protocol
109107
timeout
110108
nio4r (2.5.8)
111-
nokogiri (1.12.5)
112-
mini_portile2 (~> 2.6.1)
109+
nokogiri (1.13.3-x86_64-linux)
113110
racc (~> 1.4)
114111
oauth (0.5.8)
115-
octokit (4.21.0)
112+
octokit (4.22.0)
116113
faraday (>= 0.9)
117114
sawyer (~> 0.8.0, >= 0.5.3)
118115
omniauth (2.0.4)
@@ -129,14 +126,14 @@ GEM
129126
pit (0.0.7)
130127
power_assert (2.0.1)
131128
public_suffix (4.0.6)
132-
puma (5.5.2)
129+
puma (5.6.2)
133130
nio4r (~> 2.0)
134131
pushbullet_ruby (1.1.4)
135132
faraday (>= 0.13.0, < 1.0)
136133
mime-types
137134
racc (1.6.0)
138135
rack (2.2.3)
139-
rack-protection (2.1.0)
136+
rack-protection (2.2.0)
140137
rack
141138
rack-test (1.1.0)
142139
rack (>= 1.0, < 3)
@@ -146,23 +143,23 @@ GEM
146143
rake (13.0.6)
147144
rdtool (0.6.38)
148145
redcarpet (3.5.1)
149-
regexp_parser (2.2.0)
146+
regexp_parser (2.2.1)
150147
reline (0.3.1)
151148
io-console (~> 0.5)
152149
rexml (3.2.5)
153-
rspec (3.10.0)
154-
rspec-core (~> 3.10.0)
155-
rspec-expectations (~> 3.10.0)
156-
rspec-mocks (~> 3.10.0)
157-
rspec-core (3.10.1)
158-
rspec-support (~> 3.10.0)
159-
rspec-expectations (3.10.1)
150+
rspec (3.11.0)
151+
rspec-core (~> 3.11.0)
152+
rspec-expectations (~> 3.11.0)
153+
rspec-mocks (~> 3.11.0)
154+
rspec-core (3.11.0)
155+
rspec-support (~> 3.11.0)
156+
rspec-expectations (3.11.0)
160157
diff-lcs (>= 1.2.0, < 2.0)
161-
rspec-support (~> 3.10.0)
162-
rspec-mocks (3.10.2)
158+
rspec-support (~> 3.11.0)
159+
rspec-mocks (3.11.0)
163160
diff-lcs (>= 1.2.0, < 2.0)
164-
rspec-support (~> 3.10.0)
165-
rspec-support (3.10.3)
161+
rspec-support (~> 3.11.0)
162+
rspec-support (3.11.0)
166163
ruby2_keywords (0.0.5)
167164
rubyzip (2.3.2)
168165
sawyer (0.8.2)
@@ -172,7 +169,7 @@ GEM
172169
childprocess (>= 0.5, < 5.0)
173170
rexml (~> 3.2, >= 3.2.5)
174171
rubyzip (>= 1.2.2)
175-
sequel (5.52.0)
172+
sequel (5.53.0)
176173
simplecov (0.16.1)
177174
docile (~> 1.1)
178175
json (>= 1.8, < 3)
@@ -201,9 +198,9 @@ GEM
201198
tins (~> 1.0)
202199
test-unit (3.5.3)
203200
power_assert
204-
thor (1.1.0)
201+
thor (1.2.1)
205202
timeout (0.2.0)
206-
tins (1.30.0)
203+
tins (1.31.0)
207204
sync
208205
twitter-text (3.1.0)
209206
idn-ruby
@@ -216,7 +213,6 @@ GEM
216213
webrick (1.7.0)
217214
xpath (3.2.0)
218215
nokogiri (~> 1.8)
219-
zeitwerk (2.5.3)
220216

221217
PLATFORMS
222218
x86_64-linux
@@ -259,7 +255,7 @@ DEPENDENCIES
259255
webrick
260256

261257
RUBY VERSION
262-
ruby 3.1.0p0
258+
ruby 3.1.1p18
263259

264260
BUNDLED WITH
265-
2.3.4
261+
2.3.8

0 commit comments

Comments
 (0)