Gemfile in blacklight-7.40.0 vs Gemfile in blacklight-8.0.0.beta1

- old
+ new

@@ -8,34 +8,39 @@ group :test do gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby 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__))) +file = File.expand_path('Gemfile', ENV.fetch('ENGINE_CART_DESTINATION') { ENV.fetch('RAILS_ROOT') { File.expand_path('.internal_test_app', File.dirname(__FILE__)) } }) if File.exist?(file) begin eval_gemfile file rescue Bundler::GemfileError => e Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:' Bundler.ui.warn e.message 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' ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge' else gem 'rails', ENV['RAILS_VERSION'] end end - unless ENV['VIEW_COMPONENT_VERSION'].to_s == "" - gem 'view_component', ENV.fetch('VIEW_COMPONENT_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 eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))