Merge branch 'master' into mpj/enable-hlint-910

Author: mergify[bot]

ghcide-test/exe/Main.hs

@@ -33,6 +33,7 @@ module Main (main) where
 import qualified HieDbRetry
 import           Test.Tasty
 import           Test.Tasty.Ingredients.Rerun
+import           Test.Tasty.Runners
 
 import           AsyncTests
 import           BootTests
@@ -70,7 +71,7 @@ import           WatchedFileTests
 main :: IO ()
 main = do
   -- We mess with env vars so run single-threaded.
-  defaultMainWithRerun $ testGroup "ghcide"
+  defaultMainWithRerun $ PlusTestOptions mkSequential $ testGroup "ghcide"
     [ OpenCloseTest.tests
     , InitializeResponseTests.tests
     , CompletionTests.tests
@@ -104,3 +105,6 @@ main = do
     , HieDbRetry.tests
     , ExceptionTests.tests
     ]
+    where
+       PlusTestOptions mkSequential _ =sequentialTestGroup "foo" AllFinish []
+

ghcide/ghcide.cabal

@@ -57,7 +57,7 @@ library
     , deepseq
     , dependent-map
     , dependent-sum
-    , Diff                         ^>=0.5
+    , Diff                         ^>=0.5 || ^>=1.0.0
     , directory
     , dlist
     , enummapset

haskell-language-server.cabal

@@ -473,7 +473,7 @@ library hls-eval-plugin
     , bytestring
     , containers
     , deepseq
-    , Diff                  ^>=0.5
+    , Diff                  ^>=0.5 || ^>=1.0.0
     , dlist
     , extra
     , filepath
@@ -2115,7 +2115,7 @@ test-suite ghcide-tests
     , sqlite-simple
     , stm
     , stm-containers
-    , tasty
+    , tasty                  >=1.5
     , tasty-expected-failure
     , tasty-hunit             >=0.10
     , tasty-quickcheck

hls-plugin-api/hls-plugin-api.cabal

@@ -60,7 +60,7 @@ library
     , data-default
     , dependent-map
     , dependent-sum         >=0.7
-    , Diff                  ^>=0.5
+    , Diff                  ^>=0.5 || ^>=1.0.0
     , dlist
     , extra
     , filepath

stack-lts22.yaml

@@ -27,6 +27,7 @@ extra-deps:
   - lsp-types-2.3.0.0
   - monad-dijkstra-0.1.1.4 # 5
   - retrie-1.2.3
+  - tasty-1.5.3
 
   # stan and friends
   - stan-0.1.3.0