X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;ds=sidebyside;f=haskell-lsp-test.cabal;h=6fba8f24d253b3e26a027ad083bd6e5ded67770b;hb=refs%2Fheads%2Fscript-fsm;hp=f724796e850e5307298a77b732933d464d327c5b;hpb=92f1ae3d69a580eee74755a38a647e27c4f164ff;p=lsp-test.git

diff --git a/haskell-lsp-test.cabal b/haskell-lsp-test.cabal
index f724796..6fba8f2 100644
--- a/haskell-lsp-test.cabal
+++ b/haskell-lsp-test.cabal
@@ -1,64 +1,58 @@
 name:                haskell-lsp-test
 version:             0.1.0.0
--- synopsis:
+synopsis:            Functional test framework for LSP servers.
 -- description:
 homepage:            https://github.com/Bubba/haskell-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
 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.3
+                     , haskell-lsp >= 0.4
+                     , haskell-lsp-test-internal
                      , aeson
-                     , ansi-terminal
-                     , async
                      , bytestring
-                     , conduit
-                     , conduit-parse
                      , containers
                      , data-default
                      , directory
                      , filepath
                      , lens
-                     , mtl
                      , parser-combinators
-                     , process
                      , text
-                     , transformers
                      , unordered-containers
                      , yi-rope
-  if os(windows)
-    build-depends:     Win32
-  else
-    build-depends:     unix
-  other-modules:       Language.Haskell.LSP.Test.Compat
+
+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.Machine
                        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
-  ghc-options:         -W
-
-executable lsp-test
-  hs-source-dirs:     src
-  main-is:            Language/Haskell/LSP/Test/Script.hs
-  default-language:   Haskell2010
-  build-depends:      base >= 4.7 && < 5
+  build-depends:       base
                      , haskell-lsp-types
                      , haskell-lsp >= 0.3
                      , aeson
@@ -73,17 +67,35 @@ executable lsp-test
                      , filepath
                      , lens
                      , mtl
+                     , scientific
                      , parser-combinators
                      , process
                      , text
                      , transformers
                      , unordered-containers
-                    , scientific
                      , yi-rope
   if os(windows)
     build-depends:     Win32
   else
     build-depends:     unix
+  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
@@ -94,16 +106,11 @@ test-suite tests
                      , hspec
                      , lens
                      , data-default
-                     , directory
+                     , haskell-lsp >= 0.4
                      , haskell-lsp-test
-                     , haskell-lsp
-                     , haskell-lsp-types
-                     , conduit
-                     , conduit-parse
                      , aeson
                      , unordered-containers
                      , text
-  other-modules:       ParsingTests
   default-language:    Haskell2010
 
 executable lsp-test-example
@@ -112,7 +119,3 @@ executable lsp-test-example
   default-language:    Haskell2010
   build-depends:       base >= 4.7 && < 5
                      , haskell-lsp-test
-                     , haskell-lsp-types
-                     , lens
-                     , text
-                     , directory