X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=haskell-lsp-test.cabal;h=c5d1391eca38a99d3546c5ef407c06eaf5f564a0;hb=fbb260c6078a39ff071fefd6586af18715b3e6a3;hp=de92fce668b51032a0b669bab8a7c4dce63405d1;hpb=35925b4a5a5e24e1611431106fd8ddd7c89a4436;p=lsp-test.git

diff --git a/haskell-lsp-test.cabal b/haskell-lsp-test.cabal
index de92fce..c5d1391 100644
--- a/haskell-lsp-test.cabal
+++ b/haskell-lsp-test.cabal
@@ -10,34 +10,91 @@ maintainer:          luke_lau@icloud.com
 copyright:           2018 Luke Lau
 category:            Testing
 build-type:          Simple
-cabal-version:       >=1.10
+cabal-version:       >=2.0
 extra-source-files:  README.md
 
 library
-  hs-source-dirs:      src
+  hs-source-dirs:      lib
   exposed-modules:     Language.Haskell.LSP.Test
-                     , Language.Haskell.LSP.Test.Recorded
+                     , Language.Haskell.LSP.Test.Replay
+                     , Language.Haskell.LSP.Test.Machine
   default-language:    Haskell2010
   build-depends:       base >= 4.7 && < 5
-                     , haskell-lsp-client
                      , haskell-lsp-types
-                     , haskell-lsp
-                     , data-default
+                     , haskell-lsp >= 0.3
+                     , haskell-lsp-test-internal
+                     , aeson
                      , bytestring
+                     , containers
+                     , data-default
+                     , directory
+                     , filepath
+                     , lens
+                     , parser-combinators
+                     , text
+                     , unordered-containers
+                     , yi-rope
+
+  ghc-options:         -W
+
+library haskell-lsp-test-internal
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+  exposed-modules:     Language.Haskell.LSP.Test.Compat
+                       Language.Haskell.LSP.Test.Decoding
+                       Language.Haskell.LSP.Test.Exceptions
+                       Language.Haskell.LSP.Test.Files
+                       Language.Haskell.LSP.Test.Messages
+                       Language.Haskell.LSP.Test.Parsing
+                       Language.Haskell.LSP.Test.Script
+                       Language.Haskell.LSP.Test.Server
+                       Language.Haskell.LSP.Test.Session
+  build-depends:       base
+                     , haskell-lsp-types
+                     , haskell-lsp >= 0.3
                      , aeson
+                     , ansi-terminal
+                     , async
+                     , bytestring
+                     , conduit
+                     , conduit-parse
+                     , containers
+                     , data-default
+                     , directory
+                     , filepath
                      , lens
+                     , mtl
+                     , scientific
+                     , parser-combinators
+                     , process
                      , text
                      , transformers
-                     , process
-                     , directory
+                     , unordered-containers
+                     , yi-rope
   if os(windows)
-    build-depends:     win32
+    build-depends:     Win32
   else
     build-depends:     unix
-  other-modules:       Compat
-                       Capabilities
   ghc-options:         -W
 
+
+executable lsp-test
+  hs-source-dirs:     lsp-test
+  main-is:            Main.hs
+  default-language:   Haskell2010
+  build-depends:      base >= 4.7 && < 5
+                    , haskell-lsp-types
+                    , haskell-lsp >= 0.3
+                    , haskell-lsp-test-internal
+                    , haskell-lsp-test
+                    , aeson
+                    , bytestring
+                    , directory
+                    , filepath
+                    , text
+                    , unordered-containers
+                    , scientific
+
 test-suite tests
   type:                exitcode-stdio-1.0
   main-is:             Test.hs
@@ -45,10 +102,21 @@ test-suite tests
   ghc-options:         -W
   build-depends:       base >= 4.7 && < 5
                      , hspec
+                     , lens
+                     , data-default
+                     , directory
                      , haskell-lsp-test
+                     , haskell-lsp-test-internal
+                     , haskell-lsp
+                     , haskell-lsp-types
+                     , conduit
+                     , conduit-parse
+                     , aeson
+                     , unordered-containers
+                     , text
   default-language:    Haskell2010
 
-executable example
+executable lsp-test-example
   hs-source-dirs:      example
   main-is:             Main.hs
   default-language:    Haskell2010
@@ -58,11 +126,3 @@ executable example
                      , lens
                      , text
                      , directory
-
-executable recorded-example
-  hs-source-dirs:      example
-  main-is:             Recorded.hs
-  default-language:    Haskell2010
-  build-depends:       base >= 4.7 && < 5
-                     , haskell-lsp-test
-                     , directory