diff --git a/.travis.yml b/.travis.yml index f8e92a2..f17b9ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ rvm: - 2.1 - 2.2.5 - 2.3.1 + - 2.4.5 + - 2.5.4 + - 2.6.3 - rbx-2 gemfile: @@ -13,6 +16,9 @@ gemfile: - gemfiles/Gemfile-rails-4-1 - gemfiles/Gemfile-rails-4-2 - gemfiles/Gemfile-rails-5-0 + - gemfiles/Gemfile-rails-5-1 + - gemfiles/Gemfile-rails-5-2 + - gemfiles/Gemfile-rails-6-0 - gemfiles/Gemfile-sprockets-2-11 - gemfiles/Gemfile-sprockets-2-12 - gemfiles/Gemfile-sprockets-2-8 diff --git a/Gemfile b/Gemfile index 36a5090..c6d55dc 100644 --- a/Gemfile +++ b/Gemfile @@ -4,4 +4,3 @@ source "https://rubygems.org" gemspec gem "rails", github: "rails/rails" -gem "arel", github: "rails/arel" diff --git a/gemfiles/Gemfile-rails-5-1 b/gemfiles/Gemfile-rails-5-1 new file mode 100644 index 0000000..0893f57 --- /dev/null +++ b/gemfiles/Gemfile-rails-5-1 @@ -0,0 +1,7 @@ +source "https://rubygems.org" + +# Specify your gem"s dependencies in sass-rails.gemspec +gemspec path: ".." + +gem "rails", github: 'rails/rails', branch: '5-1-stable' +gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9') diff --git a/gemfiles/Gemfile-rails-5-2 b/gemfiles/Gemfile-rails-5-2 new file mode 100644 index 0000000..73f6dab --- /dev/null +++ b/gemfiles/Gemfile-rails-5-2 @@ -0,0 +1,7 @@ +source "https://rubygems.org" + +# Specify your gem"s dependencies in sass-rails.gemspec +gemspec path: ".." + +gem "rails", github: 'rails/rails', branch: '5-2-stable' +gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9') diff --git a/gemfiles/Gemfile-rails-6-0 b/gemfiles/Gemfile-rails-6-0 new file mode 100644 index 0000000..ebd7b0f --- /dev/null +++ b/gemfiles/Gemfile-rails-6-0 @@ -0,0 +1,6 @@ +source "https://rubygems.org" + +# Specify your gem"s dependencies in sass-rails.gemspec +gemspec path: ".." + +gem "rails", github: 'rails/rails', branch: '6-0-stable' diff --git a/sass-rails.gemspec b/sass-rails.gemspec index e268296..ae2b1ad 100644 --- a/sass-rails.gemspec +++ b/sass-rails.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.description = %q{Sass adapter for the Rails asset pipeline.} s.license = %q{MIT} - s.add_dependency 'railties', '>= 4.0.0', '< 6' + s.add_dependency 'railties', '>= 4.0.0' s.add_dependency 'sass', '~> 3.1' s.add_dependency 'sprockets-rails', '>= 2.0', '< 4.0' s.add_dependency 'sprockets', '>= 2.8', '< 4.0'