Skip to content

Commit

Permalink
Update the build to work w/ rails 5 & 6.
Browse files Browse the repository at this point in the history
  • Loading branch information
jkeck committed Dec 13, 2019
1 parent e8e36e4 commit 26523bf
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ else
gem 'rails', ENV['RAILS_VERSION']
end
end

case ENV['RAILS_VERSION']
when /^5.[12]/, /^6.0/
gem 'sass-rails', '~> 5.0'
end
end
# END ENGINE_CART BLOCK
eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))
2 changes: 1 addition & 1 deletion blacklight-hierarchy.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|

# Most likely available for even earlier versions of Blacklight, but this is what I validated
s.add_dependency 'blacklight', '> 6.20', '< 8.0'
s.add_dependency 'rails', '>= 4.1', '< 6'
s.add_dependency 'rails', '>= 5.1', '< 7'
s.add_dependency 'jquery-rails'

s.add_development_dependency 'rsolr'
Expand Down
8 changes: 8 additions & 0 deletions spec/test_app_templates/lib/generators/test_app_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,12 @@ def run_blacklight_generator
def run_hierarchy_install
generate 'blacklight_hierarchy:install'
end

def create_images_directory
run 'mkdir app/assets/images'
end

def add_js_reference
inject_into_file 'app/assets/config/manifest.js', "\n//= link application.js", after: '//= link_directory ../stylesheets .css'
end
end

0 comments on commit 26523bf

Please sign in to comment.