Skip to content

Commit 83ff4d8

Browse files
authored
Merge pull request #756 from lcreid/propshaft
Use propshaft for Rails > 8.0
2 parents 7b620f6 + f83f542 commit 83ff4d8

File tree

4 files changed

+35
-18
lines changed

4 files changed

+35
-18
lines changed

demo/Gemfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@ source "https://rubygems.org"
22

33
gem "bootstrap_form", path: ".."
44

5-
gem "rails", "~> 8.0.0"
6-
75
gem "bootsnap", require: false
86
gem "cssbundling-rails"
97
gem "htmlbeautifier"
108
gem "jbuilder"
119
gem "jsbundling-rails"
12-
gem "puma"
13-
gem "sprockets-rails", require: "sprockets/railtie"
14-
gem "sqlite3"
10+
gem "propshaft"
11+
gem "puma", ">= 5.0"
12+
gem "rails", "~> 8.0.0"
13+
gem "sqlite3", ">= 2.1"
14+
gem "stimulus-rails"
15+
gem "thruster", require: false
16+
gem "turbo-rails"
1517
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
1618

1719
group :development, :test do
20+
gem "brakeman", require: false
1821
gem "debug", platforms: %i[mri mingw x64_mingw]
1922
end
2023

@@ -23,7 +26,7 @@ group :development do
2326
end
2427

2528
group :test do
26-
gem "capybara-screenshot-diff"
29+
gem "capybara-screenshot-diff", require: false
2730
gem "chunky_png", "~> 1.4"
2831
gem "selenium-webdriver"
2932
end

demo/Gemfile.lock

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ GEM
8787
bindex (0.8.1)
8888
bootsnap (1.18.4)
8989
msgpack (~> 1.2)
90+
brakeman (7.0.2)
91+
racc
9092
builder (3.3.0)
9193
capybara (3.40.0)
9294
addressable
@@ -168,6 +170,11 @@ GEM
168170
pp (0.6.2)
169171
prettyprint
170172
prettyprint (0.2.0)
173+
propshaft (1.1.0)
174+
actionpack (>= 7.0.0)
175+
activesupport (>= 7.0.0)
176+
rack
177+
railties (>= 7.0.0)
171178
psych (5.2.3)
172179
date
173180
stringio
@@ -227,22 +234,25 @@ GEM
227234
rexml (~> 3.2, >= 3.2.5)
228235
rubyzip (>= 1.2.2, < 3.0)
229236
websocket (~> 1.0)
230-
sprockets (4.2.1)
231-
concurrent-ruby (~> 1.0)
232-
rack (>= 2.2.4, < 4)
233-
sprockets-rails (3.5.2)
234-
actionpack (>= 6.1)
235-
activesupport (>= 6.1)
236-
sprockets (>= 3.0.0)
237237
sqlite3 (2.6.0-aarch64-linux-gnu)
238238
sqlite3 (2.6.0-arm-linux-gnu)
239239
sqlite3 (2.6.0-arm64-darwin)
240240
sqlite3 (2.6.0-x86-linux-gnu)
241241
sqlite3 (2.6.0-x86_64-darwin)
242242
sqlite3 (2.6.0-x86_64-linux-gnu)
243+
stimulus-rails (1.3.4)
244+
railties (>= 6.0.0)
243245
stringio (3.1.5)
244246
thor (1.3.2)
247+
thruster (0.1.14)
248+
thruster (0.1.14-aarch64-linux)
249+
thruster (0.1.14-arm64-darwin)
250+
thruster (0.1.14-x86_64-darwin)
251+
thruster (0.1.14-x86_64-linux)
245252
timeout (0.4.3)
253+
turbo-rails (2.0.16)
254+
actionpack (>= 7.1.0)
255+
railties (>= 7.1.0)
246256
tzinfo (2.0.6)
247257
concurrent-ruby (~> 1.0)
248258
uri (1.0.3)
@@ -272,18 +282,22 @@ PLATFORMS
272282
DEPENDENCIES
273283
bootsnap
274284
bootstrap_form!
285+
brakeman
275286
capybara-screenshot-diff
276287
chunky_png (~> 1.4)
277288
cssbundling-rails
278289
debug
279290
htmlbeautifier
280291
jbuilder
281292
jsbundling-rails
282-
puma
293+
propshaft
294+
puma (>= 5.0)
283295
rails (~> 8.0.0)
284296
selenium-webdriver
285-
sprockets-rails
286-
sqlite3
297+
sqlite3 (>= 2.1)
298+
stimulus-rails
299+
thruster
300+
turbo-rails
287301
tzinfo-data
288302
web-console
289303

gemfiles/8.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
55
gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
66
gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
77
gem "rails", "~> 8.0.1"
8-
gem "sprockets-rails", require: "sprockets/railtie"
8+
gem "propshaft"
99
gem "sqlite3"

gemfiles/edge.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ gem "bigdecimal" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
55
gem "drb" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
66
gem "mutex_m" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
77
gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
8-
gem "sprockets-rails", require: "sprockets/railtie"
8+
gem "propshaft"
99
gem "sqlite3"

0 commit comments

Comments
 (0)