Merge 7ec63cd into 0a67cdd

sul-dlss · Oct 31, 2019 · 4d7b6e8 · 4d7b6e8
2 parents 0a67cdd + 7ec63cd
commit 4d7b6e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,12 @@ before_install:
   - gem update --system
 
 rvm:
-  - 2.4.0
+  - 2.6.3
+
+env:
+ - "RAILS_VERSION=5.2.3"
+ - "RAILS_VERSION=6.0.0"
 
 sudo: false
 language: ruby
+dist: trusty
diff --git a/Gemfile b/Gemfile
@@ -28,13 +28,6 @@ else
     end
   end
 
-  case ENV['RAILS_VERSION']
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
-  end
+  gem 'sass-rails', '~> 5.0'
 end
 # END ENGINE_CART BLOCK
diff --git a/riiif.gemspec b/riiif.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'railties', '>= 4.2', '<6'
+  spec.add_dependency 'railties', '>= 4.2', '<7'
   spec.add_dependency 'deprecation', '>= 1.0.0'
   spec.add_dependency 'iiif-image-api', '~> 0.1.0'
   spec.add_development_dependency 'bundler'