Merge branch 'master' into script-fsm

[lsp-test.git] / haskell-lsp-test.cabal

diff --git a/haskell-lsp-test.cabal b/haskell-lsp-test.cabal
index 860c29b59057ea387e9e11c6eb22b647271da9d1..6fba8f24d253b3e26a027ad083bd6e5ded67770b 100644 (file)
--- a/haskell-lsp-test.cabal
+++ b/haskell-lsp-test.cabal
@@ -12,21 +12,52 @@ bug-reports:         https://github.com/Bubba/haskell-lsp-test/issues
 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.Replay
+                     , Language.Haskell.LSP.Test.Machine
   reexported-modules:  haskell-lsp:Language.Haskell.LSP.Types
                      , haskell-lsp:Language.Haskell.LSP.Types.Capabilities
                      , parser-combinators:Control.Applicative.Combinators
   default-language:    Haskell2010
   build-depends:       base >= 4.7 && < 5
+                     , haskell-lsp-types
                      , haskell-lsp >= 0.4
+                     , haskell-lsp-test-internal
+                     , aeson
+                     , bytestring
+                     , containers
+                     , data-default
+                     , directory
+                     , filepath
+                     , lens
+                     , parser-combinators
+                     , text
+                     , unordered-containers
+                     , yi-rope
+
+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
@@ -36,6 +67,7 @@ library
                      , filepath
                      , lens
                      , mtl
+                     , scientific
                      , parser-combinators
                      , process
                      , text
@@ -46,16 +78,25 @@ library
     build-depends:     Win32
   else
     build-depends:     unix
-  other-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.Server
-                       Language.Haskell.LSP.Test.Session
   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.4
+                    , 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