Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

Commit 09db6af

Browse files
authored
Merge pull request #33 from TwilioDevEd/DEVEDSB-152-update-rails
Update Rails to 6.1.3.1 to fix a licensing issue
2 parents 4bf3a61 + afcec06 commit 09db6af

File tree

4 files changed

+115
-110
lines changed

4 files changed

+115
-110
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.3
1+
3.0.0

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
gem 'twilio-ruby', '~> 5.23.0'
4+
gem 'twilio-ruby', '~> 5.46'
55
gem 'dotenv-rails', '~> 2.7.5'
66

77
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
8-
gem 'rails', '~> 6.0'
8+
gem 'rails', '~> 6.1.3'
99
# Use sqlite3 as the database for Active Record
1010
gem 'sqlite3'
1111
# Use Puma as the app server
12-
gem 'puma', '~> 4.3'
12+
gem 'puma', '~> 5.0'
1313
# Use SCSS for stylesheets
1414
gem 'sass-rails', '~> 6.0'
1515
# Use Uglifier as compressor for JavaScript assets
@@ -42,7 +42,7 @@ end
4242
group :development do
4343
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
4444
gem 'web-console', '>= 4.0.1'
45-
gem 'listen', '~> 3.2.1'
45+
gem 'listen', '~> 3.3'
4646
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
4747
gem 'spring'
4848
gem 'spring-watcher-listen', '~> 2.0.1'

Gemfile.lock

Lines changed: 109 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,68 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.3.2)
5-
actionpack (= 6.0.3.2)
4+
actioncable (6.1.3.1)
5+
actionpack (= 6.1.3.1)
6+
activesupport (= 6.1.3.1)
67
nio4r (~> 2.0)
78
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.3.2)
9-
actionpack (= 6.0.3.2)
10-
activejob (= 6.0.3.2)
11-
activerecord (= 6.0.3.2)
12-
activestorage (= 6.0.3.2)
13-
activesupport (= 6.0.3.2)
9+
actionmailbox (6.1.3.1)
10+
actionpack (= 6.1.3.1)
11+
activejob (= 6.1.3.1)
12+
activerecord (= 6.1.3.1)
13+
activestorage (= 6.1.3.1)
14+
activesupport (= 6.1.3.1)
1415
mail (>= 2.7.1)
15-
actionmailer (6.0.3.2)
16-
actionpack (= 6.0.3.2)
17-
actionview (= 6.0.3.2)
18-
activejob (= 6.0.3.2)
16+
actionmailer (6.1.3.1)
17+
actionpack (= 6.1.3.1)
18+
actionview (= 6.1.3.1)
19+
activejob (= 6.1.3.1)
20+
activesupport (= 6.1.3.1)
1921
mail (~> 2.5, >= 2.5.4)
2022
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.3.2)
22-
actionview (= 6.0.3.2)
23-
activesupport (= 6.0.3.2)
24-
rack (~> 2.0, >= 2.0.8)
23+
actionpack (6.1.3.1)
24+
actionview (= 6.1.3.1)
25+
activesupport (= 6.1.3.1)
26+
rack (~> 2.0, >= 2.0.9)
2527
rack-test (>= 0.6.3)
2628
rails-dom-testing (~> 2.0)
2729
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.3.2)
29-
actionpack (= 6.0.3.2)
30-
activerecord (= 6.0.3.2)
31-
activestorage (= 6.0.3.2)
32-
activesupport (= 6.0.3.2)
30+
actiontext (6.1.3.1)
31+
actionpack (= 6.1.3.1)
32+
activerecord (= 6.1.3.1)
33+
activestorage (= 6.1.3.1)
34+
activesupport (= 6.1.3.1)
3335
nokogiri (>= 1.8.5)
34-
actionview (6.0.3.2)
35-
activesupport (= 6.0.3.2)
36+
actionview (6.1.3.1)
37+
activesupport (= 6.1.3.1)
3638
builder (~> 3.1)
3739
erubi (~> 1.4)
3840
rails-dom-testing (~> 2.0)
3941
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.3.2)
41-
activesupport (= 6.0.3.2)
42+
activejob (6.1.3.1)
43+
activesupport (= 6.1.3.1)
4244
globalid (>= 0.3.6)
43-
activemodel (6.0.3.2)
44-
activesupport (= 6.0.3.2)
45-
activerecord (6.0.3.2)
46-
activemodel (= 6.0.3.2)
47-
activesupport (= 6.0.3.2)
48-
activestorage (6.0.3.2)
49-
actionpack (= 6.0.3.2)
50-
activejob (= 6.0.3.2)
51-
activerecord (= 6.0.3.2)
52-
marcel (~> 0.3.1)
53-
activesupport (6.0.3.2)
45+
activemodel (6.1.3.1)
46+
activesupport (= 6.1.3.1)
47+
activerecord (6.1.3.1)
48+
activemodel (= 6.1.3.1)
49+
activesupport (= 6.1.3.1)
50+
activestorage (6.1.3.1)
51+
actionpack (= 6.1.3.1)
52+
activejob (= 6.1.3.1)
53+
activerecord (= 6.1.3.1)
54+
activesupport (= 6.1.3.1)
55+
marcel (~> 1.0.0)
56+
mini_mime (~> 1.0.2)
57+
activesupport (6.1.3.1)
5458
concurrent-ruby (~> 1.0, >= 1.0.2)
55-
i18n (>= 0.7, < 2)
56-
minitest (~> 5.1)
57-
tzinfo (~> 1.1)
58-
zeitwerk (~> 2.2, >= 2.2.2)
59-
bcrypt (3.1.13)
59+
i18n (>= 1.6, < 2)
60+
minitest (>= 5.1)
61+
tzinfo (~> 2.0)
62+
zeitwerk (~> 2.3)
63+
bcrypt (3.1.16)
6064
bindex (0.8.1)
61-
bootsnap (1.4.6)
65+
bootsnap (1.7.3)
6266
msgpack (~> 1.0)
6367
builder (3.2.4)
6468
byebug (11.1.3)
@@ -69,82 +73,84 @@ GEM
6973
coffee-script-source
7074
execjs
7175
coffee-script-source (1.12.2)
72-
concurrent-ruby (1.1.6)
76+
concurrent-ruby (1.1.8)
7377
crass (1.0.6)
74-
dotenv (2.7.5)
75-
dotenv-rails (2.7.5)
76-
dotenv (= 2.7.5)
77-
railties (>= 3.2, < 6.1)
78-
erubi (1.9.0)
78+
dotenv (2.7.6)
79+
dotenv-rails (2.7.6)
80+
dotenv (= 2.7.6)
81+
railties (>= 3.2)
82+
erubi (1.10.0)
7983
execjs (2.7.0)
80-
faraday (0.17.3)
84+
faraday (1.3.0)
85+
faraday-net_http (~> 1.0)
8186
multipart-post (>= 1.2, < 3)
82-
ffi (1.13.1)
87+
ruby2_keywords
88+
faraday-net_http (1.0.1)
89+
ffi (1.15.0)
8390
globalid (0.4.2)
8491
activesupport (>= 4.2.0)
85-
i18n (1.8.3)
92+
i18n (1.8.10)
8693
concurrent-ruby (~> 1.0)
87-
jbuilder (2.10.0)
94+
jbuilder (2.11.2)
8895
activesupport (>= 5.0.0)
89-
jwt (2.2.1)
90-
listen (3.2.1)
96+
jwt (2.2.2)
97+
listen (3.5.1)
9198
rb-fsevent (~> 0.10, >= 0.10.3)
9299
rb-inotify (~> 0.9, >= 0.9.10)
93-
loofah (2.6.0)
100+
loofah (2.9.0)
94101
crass (~> 1.0.2)
95102
nokogiri (>= 1.5.9)
96103
mail (2.7.1)
97104
mini_mime (>= 0.1.1)
98-
marcel (0.3.3)
99-
mimemagic (~> 0.3.2)
105+
marcel (1.0.1)
100106
method_source (1.0.0)
101-
mimemagic (0.3.5)
102-
mini_mime (1.0.2)
103-
mini_portile2 (2.4.0)
104-
minitest (5.14.1)
107+
mini_mime (1.0.3)
108+
minitest (5.14.4)
105109
minitest-stub_any_instance (1.0.2)
106-
msgpack (1.3.3)
110+
msgpack (1.4.2)
107111
multipart-post (2.1.1)
108-
nio4r (2.5.2)
109-
nokogiri (1.10.9)
110-
mini_portile2 (~> 2.4.0)
111-
puma (4.3.5)
112+
nio4r (2.5.7)
113+
nokogiri (1.11.2-x86_64-darwin)
114+
racc (~> 1.4)
115+
puma (5.2.2)
112116
nio4r (~> 2.0)
117+
racc (1.5.2)
113118
rack (2.2.3)
114119
rack-proxy (0.6.5)
115120
rack
116121
rack-test (1.1.0)
117122
rack (>= 1.0, < 3)
118-
rails (6.0.3.2)
119-
actioncable (= 6.0.3.2)
120-
actionmailbox (= 6.0.3.2)
121-
actionmailer (= 6.0.3.2)
122-
actionpack (= 6.0.3.2)
123-
actiontext (= 6.0.3.2)
124-
actionview (= 6.0.3.2)
125-
activejob (= 6.0.3.2)
126-
activemodel (= 6.0.3.2)
127-
activerecord (= 6.0.3.2)
128-
activestorage (= 6.0.3.2)
129-
activesupport (= 6.0.3.2)
130-
bundler (>= 1.3.0)
131-
railties (= 6.0.3.2)
123+
rails (6.1.3.1)
124+
actioncable (= 6.1.3.1)
125+
actionmailbox (= 6.1.3.1)
126+
actionmailer (= 6.1.3.1)
127+
actionpack (= 6.1.3.1)
128+
actiontext (= 6.1.3.1)
129+
actionview (= 6.1.3.1)
130+
activejob (= 6.1.3.1)
131+
activemodel (= 6.1.3.1)
132+
activerecord (= 6.1.3.1)
133+
activestorage (= 6.1.3.1)
134+
activesupport (= 6.1.3.1)
135+
bundler (>= 1.15.0)
136+
railties (= 6.1.3.1)
132137
sprockets-rails (>= 2.0.0)
133138
rails-dom-testing (2.0.3)
134139
activesupport (>= 4.2.0)
135140
nokogiri (>= 1.6)
136141
rails-html-sanitizer (1.3.0)
137142
loofah (~> 2.3)
138-
railties (6.0.3.2)
139-
actionpack (= 6.0.3.2)
140-
activesupport (= 6.0.3.2)
143+
railties (6.1.3.1)
144+
actionpack (= 6.1.3.1)
145+
activesupport (= 6.1.3.1)
141146
method_source
142147
rake (>= 0.8.7)
143-
thor (>= 0.20.3, < 2.0)
144-
rake (13.0.1)
148+
thor (~> 1.0)
149+
rake (13.0.3)
145150
rb-fsevent (0.10.4)
146151
rb-inotify (0.10.1)
147152
ffi (~> 1.0)
153+
ruby2_keywords (0.0.4)
148154
sass-rails (6.0.0)
149155
sassc-rails (~> 2.1, >= 2.1.1)
150156
sassc (2.4.0)
@@ -155,50 +161,49 @@ GEM
155161
sprockets (> 3.0)
156162
sprockets-rails
157163
tilt
158-
semantic_range (2.3.0)
159-
spring (2.1.0)
164+
semantic_range (3.0.0)
165+
spring (2.1.1)
160166
spring-watcher-listen (2.0.1)
161167
listen (>= 2.7, < 4.0)
162168
spring (>= 1.2, < 3.0)
163169
sprockets (4.0.2)
164170
concurrent-ruby (~> 1.0)
165171
rack (> 1, < 3)
166-
sprockets-rails (3.2.1)
172+
sprockets-rails (3.2.2)
167173
actionpack (>= 4.0)
168174
activesupport (>= 4.0)
169175
sprockets (>= 3.0.0)
170176
sqlite3 (1.4.2)
171-
thor (1.0.1)
172-
thread_safe (0.3.6)
177+
thor (1.1.0)
173178
tilt (2.0.10)
174179
turbolinks (5.2.1)
175180
turbolinks-source (~> 5.2)
176181
turbolinks-source (5.2.0)
177-
twilio-ruby (5.23.1)
178-
faraday (~> 0.9)
182+
twilio-ruby (5.50.0)
183+
faraday (>= 0.9, < 2.0)
179184
jwt (>= 1.5, <= 2.5)
180185
nokogiri (>= 1.6, < 2.0)
181-
tzinfo (1.2.7)
182-
thread_safe (~> 0.1)
186+
tzinfo (2.0.4)
187+
concurrent-ruby (~> 1.0)
183188
uglifier (4.2.0)
184189
execjs (>= 0.3.0, < 3)
185-
web-console (4.0.3)
190+
web-console (4.1.0)
186191
actionview (>= 6.0.0)
187192
activemodel (>= 6.0.0)
188193
bindex (>= 0.4.0)
189194
railties (>= 6.0.0)
190-
webpacker (5.1.1)
195+
webpacker (5.2.1)
191196
activesupport (>= 5.2)
192197
rack-proxy (>= 0.6.1)
193198
railties (>= 5.2)
194199
semantic_range (>= 2.3.0)
195-
websocket-driver (0.7.2)
200+
websocket-driver (0.7.3)
196201
websocket-extensions (>= 0.1.0)
197202
websocket-extensions (0.1.5)
198-
zeitwerk (2.3.0)
203+
zeitwerk (2.4.2)
199204

200205
PLATFORMS
201-
ruby
206+
x86_64-darwin-19
202207

203208
DEPENDENCIES
204209
bcrypt (~> 3.1.13)
@@ -207,20 +212,20 @@ DEPENDENCIES
207212
coffee-rails (~> 5.0)
208213
dotenv-rails (~> 2.7.5)
209214
jbuilder (~> 2.10)
210-
listen (~> 3.2.1)
215+
listen (~> 3.3)
211216
minitest-stub_any_instance
212-
puma (~> 4.3)
213-
rails (~> 6.0)
217+
puma (~> 5.0)
218+
rails (~> 6.1.3)
214219
sass-rails (~> 6.0)
215220
spring
216221
spring-watcher-listen (~> 2.0.1)
217222
sqlite3
218223
turbolinks (~> 5)
219-
twilio-ruby (~> 5.23.0)
224+
twilio-ruby (~> 5.46)
220225
tzinfo-data
221226
uglifier (>= 4.2.0)
222227
web-console (>= 4.0.1)
223228
webpacker
224229

225230
BUNDLED WITH
226-
2.1.4
231+
2.2.13

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Implementations in other languages:
2424

2525
### Requirements
2626

27-
- [Ruby](https://www.ruby-lang.org/) **2.6.x** version.
27+
- [Ruby](https://www.ruby-lang.org/) **3.0.x** version.
2828
- [Sqlite3](https://www.sqlite.org/).
2929
- [Node.js](https://nodejs.org/en/) **10.x** or **12.x** version.
3030

0 commit comments

Comments
 (0)