Add support for GHC 8.6.4

README.md

@@ -46,12 +46,18 @@ cd haskell-code-explorer
 
 To build Haskell Code Explorer Stack ([https://docs.haskellstack.org/en/stable/README/](https://docs.haskellstack.org/en/stable/README/)) is needed.
 
-At the moment Haskell Code Explorer supports GHC 8.6.3, GHC 8.4.4, GHC 8.4.3, GHC 8.2.2, and 8.0.2.
+At the moment Haskell Code Explorer supports GHC 8.6.4, GHC 8.6.3, GHC 8.4.4, GHC 8.4.3, GHC 8.2.2, and 8.0.2.
+
+For GHC 8.6.4:
+
+```bash
+stack install
+```
 
 For GHC 8.6.3:
 
 ```bash
-stack install
+stack --stack-yaml=stack-8.6.3.yaml install
 ```
 
 For GHC 8.4.4:

app/Indexer.hs

@@ -73,7 +73,10 @@ data Compression
   | NoCompression
   deriving (Show, Eq)
 
-#if MIN_VERSION_GLASGOW_HASKELL(8,6,3,0)
+#if MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)
+ghcVersion :: Version
+ghcVersion = Version {versionBranch = [8, 6, 4, 0], versionTags = []}
+#elif MIN_VERSION_GLASGOW_HASKELL(8,6,3,0)     
 ghcVersion :: Version
 ghcVersion = Version {versionBranch = [8, 6, 3, 0], versionTags = []}    
 #elif MIN_VERSION_GLASGOW_HASKELL(8,4,4,0) 

app/Store.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilyDependencies #-}
@@ -41,9 +42,13 @@ data Location = Location
   } deriving (Show, Eq, Ord, Generic, NFData)
 
 instance Serialize Location
+
+#if MIN_VERSION_cereal(0,5,8)
+#else
 instance Serialize BSS.ShortByteString where
   put = put . BSS.fromShort
   get = BSS.toShort <$> get
+#endif  
 
 class StoreItem item where
   toByteString :: item -> BS.ByteString

stack-8.6.3.yaml

@@ -0,0 +1,8 @@
+resolver: lts-13.0
+packages:
+- '.'
+- location: vendor/cabal-helper-0.8.1.2
+  extra-dep: true
+allow-newer: true
+extra-deps:
+  - cabal-plan-0.4.0.0

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-13.0
+resolver: lts-13.12
 packages:
 - '.'
 - location: vendor/cabal-helper-0.8.1.2

test/Main.hs

@@ -155,8 +155,10 @@ moduleInfoSpec modInfo =
       HCE.idOccMap (modInfo :: HCE.ModuleInfo) `shouldBe` testIdOccMap
 
 stackYamlArg :: [String]
-#if MIN_VERSION_GLASGOW_HASKELL(8,6,1,0)
+#if MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)
 stackYamlArg = []
+#elif MIN_VERSION_GLASGOW_HASKELL(8,6,1,0)
+stackYamlArg = ["--stack-yaml=stack-8.6.3.yaml"]
 #elif MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)
 stackYamlArg = ["--stack-yaml=stack-8.4.4.yaml"]
 #elif MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)

test/test-package/stack-8.6.3.yaml

@@ -0,0 +1 @@
+resolver: lts-13.0

test/test-package/stack.yaml

@@ -1 +1 @@
-resolver: nightly-2018-12-21
+resolver: lts-13.12