Fix tested-with fields in Cabal files

Also re-added `servant-client` to `cabal.ghcjs.project`, setting
`buildable: False` on tests as they don't run with GHCJS.
This commit is contained in:
Gaël Deest 2021-10-11 10:35:40 +02:00
parent e9ae1eeed8
commit b7c6a95929
4 changed files with 8 additions and 2 deletions

View File

@ -2,6 +2,7 @@
packages: packages:
servant/ servant/
servant-client/
servant-client-core/ servant-client-core/
-- we need to tell cabal we are using GHCJS -- we need to tell cabal we are using GHCJS

View File

@ -17,7 +17,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple build-type: Simple
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
, GHCJS == 8.4 , GHCJS ==8.6.0.1
extra-source-files: extra-source-files:
CHANGELOG.md CHANGELOG.md

View File

@ -21,6 +21,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
build-type: Simple build-type: Simple
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
, GHCJS ==8.6.0.1
extra-source-files: extra-source-files:
CHANGELOG.md CHANGELOG.md
@ -82,6 +83,8 @@ test-suite spec
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
ghc-options: -Wall -rtsopts -threaded "-with-rtsopts=-T -N2" ghc-options: -Wall -rtsopts -threaded "-with-rtsopts=-T -N2"
default-language: Haskell2010 default-language: Haskell2010
if impl(ghcjs)
buildable: False
hs-source-dirs: test hs-source-dirs: test
main-is: Spec.hs main-is: Spec.hs
other-modules: other-modules:
@ -137,3 +140,5 @@ test-suite readme
build-tool-depends: markdown-unlit:markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit
ghc-options: -pgmL markdown-unlit ghc-options: -pgmL markdown-unlit
default-language: Haskell2010 default-language: Haskell2010
if impl(ghcjs)
buildable: False

View File

@ -21,7 +21,7 @@ copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant
build-type: Simple build-type: Simple
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1 tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
, GHCJS == 8.4 , GHCJS ==8.6.0.1
extra-source-files: extra-source-files:
CHANGELOG.md CHANGELOG.md