Build on Blacklight master

jcoyne · jcoyne · commit 54015b82a4f5 · 2018-10-11T17:26:44.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,8 +8,9 @@ rvm:
   - 2.5.1
 
 env:
- - "RAILS_VERSION=5.2.0"
- - "RAILS_VERSION=5.1.0"
+ - "BLACKLIGHT_VERSION=master RAILS_VERSION=5.2.1"
+ - "RAILS_VERSION=5.2.1"
+ - "RAILS_VERSION=5.1.6"
 
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
diff --git a/blacklight-access_controls.gemspec b/blacklight-access_controls.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.1.0'
 
-  gem.add_dependency 'blacklight', '~> 6.0'
+  gem.add_dependency 'blacklight', '> 6.0', '< 8'
   gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'deprecation', '~> 1.0'
 
diff --git a/spec/test_app_templates/Gemfile.extra b/spec/test_app_templates/Gemfile.extra
@@ -0,0 +1,3 @@
+if ENV['BLACKLIGHT_VERSION'] == 'master'
+  gem 'blacklight', github: 'projectblacklight/blacklight'
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+if ENV['BLACKLIGHT_VERSION'] == 'master'`
	`2`	`+ gem 'blacklight', github: 'projectblacklight/blacklight'`
	`3`	`+end`