Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade engine_cart stanza #60

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Upgrade engine_cart stanza #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d4bd21
Update rubocop to a working version
jcoyne May 19, 2022
5b1eb2d
Upgrade engine_cart stanza
jcoyne May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ Naming/FileName:
- 'blacklight-access_controls.gemspec'
- 'lib/blacklight-access_controls.rb'

Rails:
Enabled: true

RSpec/MessageSpies:
Enabled: false

Expand Down
21 changes: 11 additions & 10 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
2 changes: 2 additions & 0 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

begin
require 'bundler/setup'
rescue LoadError
Expand Down
2 changes: 1 addition & 1 deletion blacklight-access_controls.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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