ghc 8.8 fixes

semantic-ast/src/Main.hs

@@ -10,9 +10,7 @@ import Source.Range
 import Source.Span
 import Data.ByteString.Char8
 import Data.ByteString (readFile)
-import System.IO (FilePath)
 import Options.Applicative hiding (style)
-import Data.Semigroup ((<>))
 import Text.Pretty.Simple (pPrint, pPrintNoColor)
 import Data.Foldable (traverse_)
 import Control.Monad ((>=>))

semantic-ruby/semantic-ruby.cabal

@@ -20,7 +20,7 @@ tested-with:         GHC == 8.6.5
 
 common haskell
   default-language:    Haskell2010
-  build-depends:       base ^>=4.12
+  build-depends:       base ^>= 4.13
                      , fused-effects ^>= 1.0
                      , fused-syntax
                      , parsers ^>= 0.12.10
@@ -43,6 +43,8 @@ common haskell
     -Wno-missed-specialisations
     -Wno-all-missed-specialisations
     -Wno-star-is-type
+  if (impl(ghc >= 8.8))
+    ghc-options: -Wno-missing-deriving-strategies
 
 library
   import: haskell
@@ -50,33 +52,3 @@ library
     Language.Ruby
     Language.Ruby.Tags
   hs-source-dirs: src
-
--- test-suite test
---   import: haskell
---   type: exitcode-stdio-1.0
---   hs-source-dirs: test
---   main-is: Test.hs
---   ghc-options: -threaded
-
---   other-modules: Directive
---                , Instances
-
---   build-depends: semantic-ruby == 0.0.0.0
---                , aeson ^>= 1.4.4
---                , aeson-pretty ^>= 0.8.7
---                , bytestring ^>= 0.10.8.2
---                , containers ^>= 0.6
---                , directory ^>= 1.3.3
---                , exceptions ^>= 0.10.2
---                , pathtype ^>= 0.8.1
---                , pretty-show ^>= 1.9.5
---                , process ^>= 1.6.5
---                , resourcet ^>= 1.2.2
---                , semantic-analysis ^>= 0
---                , streaming ^>= 0.2.2
---                , streaming-process ^>= 0.1
---                , streaming-bytestring ^>= 0.1.6
---                , tasty ^>= 1.2.3
---                , tasty-hunit ^>= 0.10.0.2
---                , trifecta >= 2 && <3
---                , unordered-containers ^>= 0.2.10

semantic.cabal

@@ -377,7 +377,7 @@ test-suite parse-examples
   build-depends:       semantic
                      , Glob
                      , foldl ^>= 1.4.5
-                     , lens ^>= 4.17
+                     , lens >= 4.17 && < 4.19
                      , resourcet ^>= 1.2
                      , streaming
                      , streaming-bytestring ^>= 0.1.6

test/Examples.hs

@@ -14,7 +14,6 @@ import           Data.Blob
 import qualified Data.ByteString.Lazy.Char8 as BLC
 import qualified Data.ByteString.Streaming.Char8 as ByteStream
 import           Data.Foldable
-import           Data.Function ((&))
 import           Data.Language (LanguageMode (..), PerLanguageModes (..))
 import           Data.List
 import qualified Data.Text as Text
@@ -50,6 +49,7 @@ rubySkips :: [Path.RelFile]
 rubySkips = Path.relFile <$>
   [
   -- UTF8 encoding issues ("Cannot decode byte '\xe3': Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream")
+  -- These are going to be hard to fix as Ruby allows non-utf8 characters content in string literals
     "ruby_spec/optional/capi/string_spec.rb"
   , "ruby_spec/core/string/b_spec.rb"
   , "ruby_spec/core/string/shared/encode.rb"