diff --git a/lib/dashing/app.rb b/lib/dashing/app.rb index 015ab4a..374866b 100644 --- a/lib/dashing/app.rb +++ b/lib/dashing/app.rb @@ -3,7 +3,8 @@ require 'sinatra/content_for' require 'rufus/scheduler' require 'coffee-script' -require 'sass' +require 'sass' if RUBY_VERSION < "2.5.0" +require 'sassc' if RUBY_VERSION >= "2.5.0" require 'json' require 'yaml' require 'thin' diff --git a/smashing.gemspec b/smashing.gemspec index 27dcc52..fecf37b 100644 --- a/smashing.gemspec +++ b/smashing.gemspec @@ -15,7 +15,6 @@ Gem::Specification.new do |s| s.files = Dir['README.md', 'javascripts/**/*', 'templates/**/*','templates/**/.[a-z]*', 'lib/**/*'] - s.add_dependency('sass', '~> 3.4.24') s.add_dependency('coffee-script', '~> 2.4.1') s.add_dependency('execjs', '~> 2.7.0') if RUBY_VERSION < "2.4.0" @@ -27,7 +26,13 @@ Gem::Specification.new do |s| s.add_dependency('thin', '~> 1.7.0') s.add_dependency('rufus-scheduler', '~> 3.4.2') s.add_dependency('thor', '~> 0.19.4') - s.add_dependency('sprockets', '~> 3.7.1') + if RUBY_VERSION < "2.5.0" + s.add_dependency('sprockets', '~> 3.7.1') + s.add_dependency('sass', '~> 3.4.24') + else + s.add_dependency('sprockets', '~> 4.0') + s.add_dependency('sassc', '~> 2.0') + end s.add_dependency('rack', '~> 2.0.0') s.add_development_dependency('rake', '~> 12.3.3')