From: Luke Lau <luke_lau@icloud.com>
Date: Mon, 22 Apr 2019 14:23:32 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/bubba/lsp-test
X-Git-Tag: 0.5.1.2~1
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=dda4890500346f3b439896e809ddc9cc456b6541;hp=-c

Merge branch 'master' of https://github.com/bubba/lsp-test
---

dda4890500346f3b439896e809ddc9cc456b6541
diff --combined lsp-test.cabal
index 468052f,1c6ca38..0fc0cfc
--- a/lsp-test.cabal
+++ b/lsp-test.cabal
@@@ -6,15 -6,15 +6,15 @@@ description
    <https://microsoft.github.io/language-server-protocol/ Language Server Protocol servers>.
    @Language.Haskell.LSP.Test@ launches your server as a subprocess and allows you to simulate a session
    down to the wire, and @Language.Haskell.LSP.Test@ can replay captured sessions from
 -  <haskell-lsp-test https://hackage.haskell.org/package/haskell-lsp>.
 +  <haskell-lsp https://hackage.haskell.org/package/haskell-lsp>.
    It's currently used for testing in <https://github.com/haskell/haskell-ide-engine haskell-ide-engine>.
 -homepage:            https://github.com/Bubba/haskell-lsp-test#readme
 +homepage:            https://github.com/bubba/lsp-test#readme
  license:             BSD3
  license-file:        LICENSE
  author:              Luke Lau
  maintainer:          luke_lau@icloud.com
  stability:           experimental
 -bug-reports:         https://github.com/Bubba/haskell-lsp-test/issues
 +bug-reports:         https://github.com/bubba/lsp-test/issues
  copyright:           2019 Luke Lau
  category:            Testing
  build-type:          Simple
@@@ -25,7 -25,7 +25,7 @@@ tested-with:         GHC == 8.2.2 , GH
  
  source-repository head
    type:     git
 -  location: https://github.com/Bubba/haskell-lsp-test/
 +  location: https://github.com/bubba/haskell-lsp-test/
  
  library
    hs-source-dirs:      src
@@@ -36,7 -36,7 +36,7 @@@
                       , parser-combinators:Control.Applicative.Combinators
    default-language:    Haskell2010
    build-depends:       base >= 4.10 && < 5
 -                     , haskell-lsp >= 0.8 && < 0.10
 +                     , haskell-lsp >= 0.8 && < 0.11
                       , aeson
                       , aeson-pretty
                       , ansi-terminal
@@@ -78,11 -78,10 +78,10 @@@ test-suite test
    build-depends:       base >= 4.10 && < 5
                       , hspec
                       , lens
 -                     , haskell-lsp >= 0.8 && < 0.10
 +                     , haskell-lsp >= 0.8 && < 0.11
                       , lsp-test
                       , data-default
                       , aeson
                       , unordered-containers
                       , text
    default-language:    Haskell2010
-