Skip to content

Commit

Permalink
Merge pull request #2651 from projectblacklight/engine_cart_stanza
Browse files Browse the repository at this point in the history
Update engine cart stanza from upstream
  • Loading branch information
jcoyne committed Mar 1, 2022
2 parents c39cf32 + 83507c5 commit c842d5e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ group :test do
end

# BEGIN ENGINE_CART BLOCK
# engine_cart: 0.10.0
# engine_cart stanza: 0.10.0
# engine_cart: 2.5.0
# engine_cart stanza: 2.5.0
# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
if File.exist?(file)
Expand All @@ -23,7 +23,6 @@ if File.exist?(file)
end
else
Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"

if ENV['RAILS_VERSION']
if ENV['RAILS_VERSION'] == 'edge'
gem 'rails', github: 'rails/rails'
Expand All @@ -33,12 +32,14 @@ else
end
end

case ENV['RAILS_VERSION']
case ENV['RAILS_VERSION'].to_s
when /^6.0/
gem 'sass-rails', '>= 6'
gem 'webpacker', '~> 4.0'
when /^5.[12]/
gem 'sass-rails', '~> 5.0'
gem 'sprockets', '~> 3.7'
gem 'thor', '~> 0.20'
end
end
# END ENGINE_CART BLOCK
Expand Down

0 comments on commit c842d5e

Please sign in to comment.