From 2e14b1106ec0e7578e0165b905d75da1928e2beb Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 1 Nov 2018 22:29:27 +0000
Subject: [PATCH] Update to sassc 2.x

---
 .travis.yml               |  2 +-
 Gemfile                   |  2 +-
 Gemfile.lock              | 21 ++++++++-------------
 config/initializers/r2.rb |  2 +-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ce7f5f30..3b56d2b4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.3.3
 cache: bundler
 addons:
   postgresql: 9.5
diff --git a/Gemfile b/Gemfile
index 9e86b5ec7..d60f1ba94 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem "json"
 gem "pg", "~> 0.18"
 
 # Use SCSS for stylesheets
-gem "sassc-rails", "~> 1.3"
+gem "sassc-rails"
 
 # Use Uglifier as compressor for JavaScript assets
 gem "uglifier", ">= 1.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 8589dc2bf..5ddadc3e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -305,7 +305,8 @@ GEM
     request_store (1.4.1)
       rack (>= 1.4)
     rinku (2.0.4)
-    rotp (4.0.0)
+    rotp (4.0.2)
+      addressable (~> 2.5)
     rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -322,19 +323,13 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sass (3.6.0)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (1.12.1)
+    sassc (2.0.0)
       ffi (~> 1.9.6)
-      sass (>= 3.3.0)
-    sassc-rails (1.3.0)
+      rake
+    sassc-rails (2.0.0)
       railties (>= 4.0.0)
-      sass
-      sassc (~> 1.9)
-      sprockets (> 2.11)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
       sprockets-rails
       tilt
     secure_headers (6.0.0)
@@ -443,7 +438,7 @@ DEPENDENCIES
   rotp
   rubocop
   sanitize
-  sassc-rails (~> 1.3)
+  sassc-rails
   secure_headers
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
diff --git a/config/initializers/r2.rb b/config/initializers/r2.rb
index 7fbb5c115..4f951b30c 100644
--- a/config/initializers/r2.rb
+++ b/config/initializers/r2.rb
@@ -1,6 +1,6 @@
 require "r2"
 
-class R2ScssProcessor < Sprockets::ScssProcessor
+class R2ScssProcessor < SassC::Rails::ScssTemplate
   def self.call(input)
     output = super(input)
     data = R2.r2(output[:data])
-- 
2.39.5