diff --git a/.rubocop.yml b/.rubocop.yml index 6f17481..91f8916 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -25,9 +25,6 @@ Naming/FileName: - 'blacklight-access_controls.gemspec' - 'lib/blacklight-access_controls.rb' -Rails: - Enabled: true - RSpec/MessageSpies: Enabled: false diff --git a/Gemfile b/Gemfile index d2b760d..be408df 100644 --- a/Gemfile +++ b/Gemfile @@ -4,8 +4,8 @@ source 'https://rubygems.org' gemspec # BEGIN ENGINE_CART BLOCK -# engine_cart: 0.10.0 -# engine_cart stanza: 0.10.0 +# engine_cart: 2.4.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) @@ -25,15 +25,16 @@ else else gem 'rails', ENV['RAILS_VERSION'] end - end - case ENV['RAILS_VERSION'] - when /^4.2/ - gem 'coffee-rails', '~> 4.1.0' - gem 'responders', '~> 2.0' - gem 'sass-rails', '>= 5.0' - when /^4.[01]/ - gem 'sass-rails', '< 5.0' + case ENV['RAILS_VERSION'] + 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 # END ENGINE_CART BLOCK diff --git a/Rakefile b/Rakefile index 6fb4efc..dcc619d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require 'bundler/setup' rescue LoadError diff --git a/blacklight-access_controls.gemspec b/blacklight-access_controls.gemspec index 897d993..5ea9ce9 100644 --- a/blacklight-access_controls.gemspec +++ b/blacklight-access_controls.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'factory_bot_rails', '~> 4.8' gem.add_development_dependency 'rake', '~> 12.3' gem.add_development_dependency 'rspec', '~> 3.1' - gem.add_development_dependency 'rubocop', '~> 0.52.1' + gem.add_development_dependency 'rubocop', '~> 1.29' gem.add_development_dependency 'rubocop-rspec' gem.add_development_dependency 'solr_wrapper' end