Merge pull request #1226 from alanz/bump-resolvers-201904

Bump resolvers to current as at 2019-04-30

Author: alanz

stack-8.6.4.yaml

@@ -1,4 +1,4 @@
-resolver: lts-13.15 # GHC 8.6.4
+resolver: lts-13.19 # GHC 8.6.4
 packages:
 - .
 - hie-plugin-api
@@ -18,7 +18,6 @@ extra-deps:
 - haskell-lsp-0.9.0.0
 - haskell-lsp-types-0.9.0.0
 - haskell-src-exts-1.21.0
-- haskell-src-exts-util-0.2.5
 - hlint-2.1.17
 - hoogle-5.0.17.6
 - hsimport-0.8.8

stack.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2019-04-05 # GHC 8.6.4
+resolver: nightly-2019-04-30 # First GHC 8.6.5
 packages:
 - .
 - hie-plugin-api
@@ -20,7 +20,6 @@ extra-deps:
 - haddock-api-2.22.0
 - haskell-lsp-0.9.0.0
 - haskell-lsp-types-0.9.0.0
-- haskell-src-exts-util-0.2.5
 - hlint-2.1.17
 - hsimport-0.8.8
 - lsp-test-0.5.1.1

test/utils/TestUtils.hs

@@ -133,7 +133,9 @@ ghcVersion = GHCPre84
 
 stackYaml :: FilePath
 stackYaml =
-#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)))
+#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,5,0)))
+  "stack.yaml"
+#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)))
   "stack-8.6.4.yaml"
 #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,3,0)))
   "stack-8.6.3.yaml"