Skip to content

Commit 4e596e8

Browse files
committed
Support both Rails 7.1 and 7.2 in the example app
Using the multiple Gemfile approach spelled out in bootboot's README: https://github.com/Shopify/bootboot/blob/2ee386b19ca76d40cd31bcb534d9ed24637872e8/README.md
1 parent be77bc5 commit 4e596e8

7 files changed

+383
-134
lines changed

example/Gemfile

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
source "https://rubygems.org"
22

33
gem "rails"
4-
gem "sqlite3"
5-
gem "puma"
6-
gem "webpacker"
7-
gem "bootsnap", require: false
8-
9-
group :development, :test do
10-
gem "cypress-rails", path: ".."
11-
end
4+
eval_gemfile "Gemfile.common"

example/Gemfile.common

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
source "https://rubygems.org"
2+
3+
gem "sqlite3"
4+
gem "puma"
5+
gem "webpacker"
6+
gem "bootsnap", require: false
7+
8+
group :development, :test do
9+
gem "cypress-rails", path: ".."
10+
end

example/Gemfile.lock

+87-91
Original file line numberDiff line numberDiff line change
@@ -8,100 +8,96 @@ PATH
88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actioncable (7.1.3)
12-
actionpack (= 7.1.3)
13-
activesupport (= 7.1.3)
11+
actioncable (7.2.1)
12+
actionpack (= 7.2.1)
13+
activesupport (= 7.2.1)
1414
nio4r (~> 2.0)
1515
websocket-driver (>= 0.6.1)
1616
zeitwerk (~> 2.6)
17-
actionmailbox (7.1.3)
18-
actionpack (= 7.1.3)
19-
activejob (= 7.1.3)
20-
activerecord (= 7.1.3)
21-
activestorage (= 7.1.3)
22-
activesupport (= 7.1.3)
23-
mail (>= 2.7.1)
24-
net-imap
25-
net-pop
26-
net-smtp
27-
actionmailer (7.1.3)
28-
actionpack (= 7.1.3)
29-
actionview (= 7.1.3)
30-
activejob (= 7.1.3)
31-
activesupport (= 7.1.3)
32-
mail (~> 2.5, >= 2.5.4)
33-
net-imap
34-
net-pop
35-
net-smtp
17+
actionmailbox (7.2.1)
18+
actionpack (= 7.2.1)
19+
activejob (= 7.2.1)
20+
activerecord (= 7.2.1)
21+
activestorage (= 7.2.1)
22+
activesupport (= 7.2.1)
23+
mail (>= 2.8.0)
24+
actionmailer (7.2.1)
25+
actionpack (= 7.2.1)
26+
actionview (= 7.2.1)
27+
activejob (= 7.2.1)
28+
activesupport (= 7.2.1)
29+
mail (>= 2.8.0)
3630
rails-dom-testing (~> 2.2)
37-
actionpack (7.1.3)
38-
actionview (= 7.1.3)
39-
activesupport (= 7.1.3)
31+
actionpack (7.2.1)
32+
actionview (= 7.2.1)
33+
activesupport (= 7.2.1)
4034
nokogiri (>= 1.8.5)
4135
racc
42-
rack (>= 2.2.4)
36+
rack (>= 2.2.4, < 3.2)
4337
rack-session (>= 1.0.1)
4438
rack-test (>= 0.6.3)
4539
rails-dom-testing (~> 2.2)
4640
rails-html-sanitizer (~> 1.6)
47-
actiontext (7.1.3)
48-
actionpack (= 7.1.3)
49-
activerecord (= 7.1.3)
50-
activestorage (= 7.1.3)
51-
activesupport (= 7.1.3)
41+
useragent (~> 0.16)
42+
actiontext (7.2.1)
43+
actionpack (= 7.2.1)
44+
activerecord (= 7.2.1)
45+
activestorage (= 7.2.1)
46+
activesupport (= 7.2.1)
5247
globalid (>= 0.6.0)
5348
nokogiri (>= 1.8.5)
54-
actionview (7.1.3)
55-
activesupport (= 7.1.3)
49+
actionview (7.2.1)
50+
activesupport (= 7.2.1)
5651
builder (~> 3.1)
5752
erubi (~> 1.11)
5853
rails-dom-testing (~> 2.2)
5954
rails-html-sanitizer (~> 1.6)
60-
activejob (7.1.3)
61-
activesupport (= 7.1.3)
55+
activejob (7.2.1)
56+
activesupport (= 7.2.1)
6257
globalid (>= 0.3.6)
63-
activemodel (7.1.3)
64-
activesupport (= 7.1.3)
65-
activerecord (7.1.3)
66-
activemodel (= 7.1.3)
67-
activesupport (= 7.1.3)
58+
activemodel (7.2.1)
59+
activesupport (= 7.2.1)
60+
activerecord (7.2.1)
61+
activemodel (= 7.2.1)
62+
activesupport (= 7.2.1)
6863
timeout (>= 0.4.0)
69-
activestorage (7.1.3)
70-
actionpack (= 7.1.3)
71-
activejob (= 7.1.3)
72-
activerecord (= 7.1.3)
73-
activesupport (= 7.1.3)
64+
activestorage (7.2.1)
65+
actionpack (= 7.2.1)
66+
activejob (= 7.2.1)
67+
activerecord (= 7.2.1)
68+
activesupport (= 7.2.1)
7469
marcel (~> 1.0)
75-
activesupport (7.1.3)
70+
activesupport (7.2.1)
7671
base64
7772
bigdecimal
78-
concurrent-ruby (~> 1.0, >= 1.0.2)
73+
concurrent-ruby (~> 1.0, >= 1.3.1)
7974
connection_pool (>= 2.2.5)
8075
drb
8176
i18n (>= 1.6, < 2)
77+
logger (>= 1.4.2)
8278
minitest (>= 5.1)
83-
mutex_m
84-
tzinfo (~> 2.0)
79+
securerandom (>= 0.3)
80+
tzinfo (~> 2.0, >= 2.0.5)
8581
base64 (0.2.0)
86-
bigdecimal (3.1.6)
82+
bigdecimal (3.1.8)
8783
bootsnap (1.18.3)
8884
msgpack (~> 1.2)
89-
builder (3.2.4)
90-
concurrent-ruby (1.2.3)
85+
builder (3.3.0)
86+
concurrent-ruby (1.3.4)
9187
connection_pool (2.4.1)
9288
crass (1.0.6)
9389
date (3.3.4)
94-
drb (2.2.0)
95-
ruby2_keywords
96-
erubi (1.12.0)
90+
drb (2.2.1)
91+
erubi (1.13.0)
9792
globalid (1.2.1)
9893
activesupport (>= 6.1)
99-
i18n (1.14.1)
94+
i18n (1.14.6)
10095
concurrent-ruby (~> 1.0)
10196
io-console (0.7.2)
102-
irb (1.11.2)
103-
rdoc
97+
irb (1.14.0)
98+
rdoc (>= 4.0.0)
10499
reline (>= 0.4.2)
100+
logger (1.6.1)
105101
loofah (2.22.0)
106102
crass (~> 1.0.2)
107103
nokogiri (>= 1.12.0)
@@ -110,30 +106,29 @@ GEM
110106
net-imap
111107
net-pop
112108
net-smtp
113-
marcel (1.0.2)
109+
marcel (1.0.4)
114110
mini_mime (1.1.5)
115-
mini_portile2 (2.8.5)
116-
minitest (5.22.2)
111+
mini_portile2 (2.8.7)
112+
minitest (5.25.1)
117113
msgpack (1.7.2)
118-
mutex_m (0.2.0)
119-
net-imap (0.4.10)
114+
net-imap (0.4.16)
120115
date
121116
net-protocol
122117
net-pop (0.1.2)
123118
net-protocol
124119
net-protocol (0.2.2)
125120
timeout
126-
net-smtp (0.4.0.1)
121+
net-smtp (0.5.0)
127122
net-protocol
128-
nio4r (2.7.0)
129-
nokogiri (1.16.2)
123+
nio4r (2.7.3)
124+
nokogiri (1.16.7)
130125
mini_portile2 (~> 2.8.2)
131126
racc (~> 1.4)
132127
psych (5.1.2)
133128
stringio
134129
puma (6.4.2)
135130
nio4r (~> 2.0)
136-
racc (1.7.3)
131+
racc (1.8.1)
137132
rack (3.1.7)
138133
rack-proxy (0.7.7)
139134
rack
@@ -144,49 +139,50 @@ GEM
144139
rackup (2.1.0)
145140
rack (>= 3)
146141
webrick (~> 1.8)
147-
rails (7.1.3)
148-
actioncable (= 7.1.3)
149-
actionmailbox (= 7.1.3)
150-
actionmailer (= 7.1.3)
151-
actionpack (= 7.1.3)
152-
actiontext (= 7.1.3)
153-
actionview (= 7.1.3)
154-
activejob (= 7.1.3)
155-
activemodel (= 7.1.3)
156-
activerecord (= 7.1.3)
157-
activestorage (= 7.1.3)
158-
activesupport (= 7.1.3)
142+
rails (7.2.1)
143+
actioncable (= 7.2.1)
144+
actionmailbox (= 7.2.1)
145+
actionmailer (= 7.2.1)
146+
actionpack (= 7.2.1)
147+
actiontext (= 7.2.1)
148+
actionview (= 7.2.1)
149+
activejob (= 7.2.1)
150+
activemodel (= 7.2.1)
151+
activerecord (= 7.2.1)
152+
activestorage (= 7.2.1)
153+
activesupport (= 7.2.1)
159154
bundler (>= 1.15.0)
160-
railties (= 7.1.3)
155+
railties (= 7.2.1)
161156
rails-dom-testing (2.2.0)
162157
activesupport (>= 5.0.0)
163158
minitest
164159
nokogiri (>= 1.6)
165160
rails-html-sanitizer (1.6.0)
166161
loofah (~> 2.21)
167162
nokogiri (~> 1.14)
168-
railties (7.1.3)
169-
actionpack (= 7.1.3)
170-
activesupport (= 7.1.3)
171-
irb
163+
railties (7.2.1)
164+
actionpack (= 7.2.1)
165+
activesupport (= 7.2.1)
166+
irb (~> 1.13)
172167
rackup (>= 1.0.0)
173168
rake (>= 12.2)
174169
thor (~> 1.0, >= 1.2.2)
175170
zeitwerk (~> 2.6)
176-
rake (13.1.0)
177-
rdoc (6.6.2)
171+
rake (13.2.1)
172+
rdoc (6.7.0)
178173
psych (>= 4.0.0)
179-
reline (0.4.2)
174+
reline (0.5.10)
180175
io-console (~> 0.5)
181-
ruby2_keywords (0.0.5)
176+
securerandom (0.3.1)
182177
semantic_range (3.0.0)
183178
sqlite3 (1.7.2)
184179
mini_portile2 (~> 2.8.0)
185-
stringio (3.1.0)
186-
thor (1.3.0)
180+
stringio (3.1.1)
181+
thor (1.3.2)
187182
timeout (0.4.1)
188183
tzinfo (2.0.6)
189184
concurrent-ruby (~> 1.0)
185+
useragent (0.16.10)
190186
webpacker (5.4.4)
191187
activesupport (>= 5.2)
192188
rack-proxy (>= 0.6.1)
@@ -196,7 +192,7 @@ GEM
196192
websocket-driver (0.7.6)
197193
websocket-extensions (>= 0.1.0)
198194
websocket-extensions (0.1.5)
199-
zeitwerk (2.6.13)
195+
zeitwerk (2.6.18)
200196

201197
PLATFORMS
202198
ruby

example/Gemfile.rails71

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source "https://rubygems.org"
2+
3+
gem "rails", "~> 7.1", "< 7.2"
4+
eval_gemfile "Gemfile.common"

0 commit comments

Comments
 (0)