Improve .cabal files

- Add build-tool-depends, so new-build can use hspec-discover
- Add mtl bounds in tutorial (and dependency on mtl-compact)
- Add extra-source-files to tutorial, so it's buildable from sdist
This commit is contained in:
Oleg Grenrus 2017-10-22 14:13:18 +03:00
parent 781ea66a62
commit 2d6bf5055b
7 changed files with 24 additions and 1 deletions

View file

@ -8,6 +8,14 @@ author: Servant Contributors
maintainer: haskell-servant-maintainers@googlegroups.com maintainer: haskell-servant-maintainers@googlegroups.com
build-type: Simple build-type: Simple
cabal-version: >=1.10 cabal-version: >=1.10
tested-with:
GHC==7.8.4
GHC==7.10.3
GHC==8.0.2
GHC==8.2.1
extra-source-files:
static/index.html
static/ui.js
library library
exposed-modules: ApiType exposed-modules: ApiType
@ -38,7 +46,8 @@ library
, string-conversions , string-conversions
, bytestring , bytestring
, attoparsec , attoparsec
, mtl , mtl >=2.1 && <2.3
, mtl-compat
, random , random
, js-jquery , js-jquery
, wai , wai
@ -57,6 +66,8 @@ test-suite spec
hs-source-dirs: test hs-source-dirs: test
main-is: Spec.hs main-is: Spec.hs
other-modules: JavascriptSpec other-modules: JavascriptSpec
build-tool-depends:
hspec-discover:hspec-discover
build-depends: base == 4.* build-depends: base == 4.*
, tutorial , tutorial
, hspec , hspec

View file

@ -70,5 +70,7 @@ test-suite spec
, servant-client-core , servant-client-core
, hspec == 2.* , hspec == 2.*
, QuickCheck >= 2.7 && < 2.11 , QuickCheck >= 2.7 && < 2.11
build-tool-depends:
hspec-discover:hspec-discover
other-modules: other-modules:
Servant.Client.Core.Internal.BaseUrlSpec Servant.Client.Core.Internal.BaseUrlSpec

View file

@ -64,6 +64,8 @@ test-suite spec
default-language: Haskell2010 default-language: Haskell2010
hs-source-dirs: test hs-source-dirs: test
main-is: Spec.hs main-is: Spec.hs
build-tool-depends:
hspec-discover:hspec-discover
other-modules: other-modules:
Servant.ClientSpec Servant.ClientSpec
build-depends: build-depends:

View file

@ -75,6 +75,8 @@ test-suite spec
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: Spec.hs main-is: Spec.hs
other-modules: Servant.DocsSpec other-modules: Servant.DocsSpec
build-tool-depends:
hspec-discover:hspec-discover
hs-source-dirs: test hs-source-dirs: test
ghc-options: -Wall ghc-options: -Wall
build-depends: build-depends:

View file

@ -65,6 +65,8 @@ test-suite spec
include-dirs: include include-dirs: include
main-is: Spec.hs main-is: Spec.hs
other-modules: Servant.ForeignSpec other-modules: Servant.ForeignSpec
build-tool-depends:
hspec-discover:hspec-discover
build-depends: base build-depends: base
, hspec >= 2.1.8 , hspec >= 2.1.8
, servant , servant

View file

@ -120,6 +120,8 @@ test-suite spec
Servant.Server.UsingContextSpec.TestCombinators Servant.Server.UsingContextSpec.TestCombinators
Servant.ServerSpec Servant.ServerSpec
Servant.Utils.StaticFilesSpec Servant.Utils.StaticFilesSpec
build-tool-depends:
hspec-discover:hspec-discover
build-depends: build-depends:
base == 4.* base == 4.*
, base-compat , base-compat

View file

@ -118,6 +118,8 @@ test-suite spec
Servant.API.ResponseHeadersSpec Servant.API.ResponseHeadersSpec
Servant.Utils.LinksSpec Servant.Utils.LinksSpec
Servant.Utils.EnterSpec Servant.Utils.EnterSpec
build-tool-depends:
hspec-discover:hspec-discover
build-depends: build-depends:
base == 4.* base == 4.*
, base-compat , base-compat