Merge pull request #1008 from phadej/lower-ghc-8.0
Support only GHC-8.0+
This commit is contained in:
commit
720bb40645
21 changed files with 30 additions and 67 deletions
|
@ -41,12 +41,6 @@ matrix:
|
||||||
- compiler: "ghc-8.0.2"
|
- compiler: "ghc-8.0.2"
|
||||||
# env: TEST=--disable-tests BENCH=--disable-benchmarks
|
# env: TEST=--disable-tests BENCH=--disable-benchmarks
|
||||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
|
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
|
||||||
- compiler: "ghc-7.10.3"
|
|
||||||
# env: TEST=--disable-tests BENCH=--disable-benchmarks
|
|
||||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
|
|
||||||
- compiler: "ghc-7.8.4"
|
|
||||||
# env: TEST=--disable-tests BENCH=--disable-benchmarks
|
|
||||||
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- HC=${CC}
|
- HC=${CC}
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-basic-auth
|
executable cookbook-basic-auth
|
||||||
main-is: BasicAuth.lhs
|
main-is: BasicAuth.lhs
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-db-postgres-pool
|
executable cookbook-db-postgres-pool
|
||||||
main-is: PostgresPool.lhs
|
main-is: PostgresPool.lhs
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-db-sqlite-simple
|
executable cookbook-db-sqlite-simple
|
||||||
main-is: DBConnection.lhs
|
main-is: DBConnection.lhs
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-file-upload
|
executable cookbook-file-upload
|
||||||
main-is: FileUpload.lhs
|
main-is: FileUpload.lhs
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-using-custom-monad
|
executable cookbook-using-custom-monad
|
||||||
main-is: Generic.lhs
|
main-is: Generic.lhs
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-https
|
executable cookbook-https
|
||||||
main-is: Https.lhs
|
main-is: Https.lhs
|
||||||
|
|
|
@ -11,12 +11,9 @@ maintainer: haskell-servant-maintainers@googlegroups.com
|
||||||
category: Servant
|
category: Servant
|
||||||
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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-jwt-and-basic-auth
|
executable cookbook-jwt-and-basic-auth
|
||||||
if !impl(ghc >= 7.10)
|
|
||||||
buildable: False
|
|
||||||
|
|
||||||
main-is: JWTAndBasicAuth.lhs
|
main-is: JWTAndBasicAuth.lhs
|
||||||
build-depends: base == 4.*
|
build-depends: base == 4.*
|
||||||
, text >= 1.2
|
, text >= 1.2
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
```haskell
|
|
||||||
module Main (main) where
|
|
||||||
main :: IO ()
|
|
||||||
main = return ()
|
|
||||||
```
|
|
|
@ -8,25 +8,16 @@ 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
|
||||||
extra-source-files:
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
Pagination.lhs
|
|
||||||
dummy/Pagination.lhs
|
|
||||||
tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
|
||||||
|
|
||||||
executable cookbook-pagination
|
executable cookbook-pagination
|
||||||
main-is: Pagination.lhs
|
main-is: Pagination.lhs
|
||||||
build-tool-depends: markdown-unlit:markdown-unlit
|
build-tool-depends: markdown-unlit:markdown-unlit
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
ghc-options: -Wall -pgmL markdown-unlit
|
ghc-options: -Wall -pgmL markdown-unlit
|
||||||
|
|
||||||
if impl(ghc >= 8.0)
|
|
||||||
hs-source-dirs: .
|
|
||||||
build-depends: base >= 4.8 && <4.12
|
build-depends: base >= 4.8 && <4.12
|
||||||
, aeson
|
, aeson
|
||||||
, servant
|
, servant
|
||||||
, servant-server
|
, servant-server
|
||||||
, servant-pagination >= 2.1.0 && < 3.0.0
|
, servant-pagination >= 2.1.0 && < 3.0.0
|
||||||
, warp
|
, warp
|
||||||
else
|
|
||||||
hs-source-dirs: dummy
|
|
||||||
build-depends: base
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-structuring-apis
|
executable cookbook-structuring-apis
|
||||||
main-is: StructuringApis.lhs
|
main-is: StructuringApis.lhs
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-using-custom-monad
|
executable cookbook-using-custom-monad
|
||||||
main-is: UsingCustomMonad.lhs
|
main-is: UsingCustomMonad.lhs
|
||||||
|
|
|
@ -8,11 +8,11 @@ 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.2, GHC==8.4.3
|
tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
|
||||||
|
|
||||||
executable cookbook-using-free-client
|
executable cookbook-using-free-client
|
||||||
main-is: UsingFreeClient.lhs
|
main-is: UsingFreeClient.lhs
|
||||||
build-depends: base == 4.*
|
build-depends: base >= 4.9 && <5
|
||||||
, free
|
, free
|
||||||
, servant
|
, servant
|
||||||
, servant-client
|
, servant-client
|
||||||
|
|
|
@ -13,8 +13,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
cabal-version: >=1.10
|
cabal-version: >=1.10
|
||||||
tested-with:
|
tested-with:
|
||||||
GHC==7.8.4
|
|
||||||
GHC==7.10.3
|
|
||||||
GHC==8.0.2
|
GHC==8.0.2
|
||||||
GHC==8.2.2
|
GHC==8.2.2
|
||||||
GHC==8.4.3
|
GHC==8.4.3
|
||||||
|
|
|
@ -19,8 +19,6 @@ extra-source-files:
|
||||||
CHANGELOG.md
|
CHANGELOG.md
|
||||||
README.md
|
README.md
|
||||||
tested-with:
|
tested-with:
|
||||||
GHC==7.8.4
|
|
||||||
GHC==7.10.3
|
|
||||||
GHC==8.0.2
|
GHC==8.0.2
|
||||||
GHC==8.2.2
|
GHC==8.2.2
|
||||||
GHC==8.4.3
|
GHC==8.4.3
|
||||||
|
|
|
@ -17,8 +17,6 @@ category: Servant, Web
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
cabal-version: >=1.10
|
cabal-version: >=1.10
|
||||||
tested-with:
|
tested-with:
|
||||||
GHC==7.8.4
|
|
||||||
GHC==7.10.3
|
|
||||||
GHC==8.0.2
|
GHC==8.0.2
|
||||||
GHC==8.2.2
|
GHC==8.2.2
|
||||||
GHC==8.4.3
|
GHC==8.4.3
|
||||||
|
|
|
@ -17,8 +17,6 @@ category: Servant, Web
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
cabal-version: >=1.10
|
cabal-version: >=1.10
|
||||||
tested-with:
|
tested-with:
|
||||||
GHC==7.8.4
|
|
||||||
GHC==7.10.3
|
|
||||||
GHC==8.0.2
|
GHC==8.0.2
|
||||||
GHC==8.2.2
|
GHC==8.2.2
|
||||||
GHC==8.4.3
|
GHC==8.4.3
|
||||||
|
|
|
@ -24,8 +24,6 @@ extra-source-files:
|
||||||
README.md
|
README.md
|
||||||
bug-reports: http://github.com/haskell-servant/servant/issues
|
bug-reports: http://github.com/haskell-servant/servant/issues
|
||||||
tested-with:
|
tested-with:
|
||||||
GHC==7.8.4
|
|
||||||
GHC==7.10.3
|
|
||||||
GHC==8.0.2
|
GHC==8.0.2
|
||||||
GHC==8.2.2
|
GHC==8.2.2
|
||||||
GHC==8.4.3
|
GHC==8.4.3
|
||||||
|
|
|
@ -22,8 +22,6 @@ category: Servant, Web
|
||||||
build-type: Custom
|
build-type: Custom
|
||||||
cabal-version: >=1.10
|
cabal-version: >=1.10
|
||||||
tested-with:
|
tested-with:
|
||||||
GHC==7.8.4
|
|
||||||
GHC==7.10.3
|
|
||||||
GHC==8.0.2
|
GHC==8.0.2
|
||||||
GHC==8.2.2
|
GHC==8.2.2
|
||||||
GHC==8.4.3
|
GHC==8.4.3
|
||||||
|
@ -181,7 +179,7 @@ test-suite doctests
|
||||||
build-depends:
|
build-depends:
|
||||||
base
|
base
|
||||||
, servant-server
|
, servant-server
|
||||||
, doctest >= 0.15.0 && <0.16
|
, doctest >= 0.16.0 && <0.17
|
||||||
type: exitcode-stdio-1.0
|
type: exitcode-stdio-1.0
|
||||||
main-is: test/doctests.hs
|
main-is: test/doctests.hs
|
||||||
buildable: True
|
buildable: True
|
||||||
|
|
|
@ -18,8 +18,6 @@ category: Servant, Web
|
||||||
build-type: Custom
|
build-type: Custom
|
||||||
cabal-version: >=1.10
|
cabal-version: >=1.10
|
||||||
tested-with:
|
tested-with:
|
||||||
GHC==7.8.4
|
|
||||||
GHC==7.10.3
|
|
||||||
GHC==8.0.2
|
GHC==8.0.2
|
||||||
GHC==8.2.2
|
GHC==8.2.2
|
||||||
GHC==8.4.3
|
GHC==8.4.3
|
||||||
|
@ -74,22 +72,22 @@ library
|
||||||
--
|
--
|
||||||
-- note: mtl lower bound is so low because of GHC-7.8
|
-- note: mtl lower bound is so low because of GHC-7.8
|
||||||
build-depends:
|
build-depends:
|
||||||
base >= 4.7 && < 4.12
|
base >= 4.9 && < 4.12
|
||||||
, bytestring >= 0.10.4.0 && < 0.11
|
, bytestring >= 0.10.8.1 && < 0.11
|
||||||
, mtl >= 2.1 && < 2.3
|
, mtl >= 2.1 && < 2.3
|
||||||
, text >= 1.2.3.0 && < 1.3
|
, text >= 1.2.3.0 && < 1.3
|
||||||
|
|
||||||
if !impl(ghc >= 8.0)
|
if !impl(ghc >= 8.0)
|
||||||
build-depends:
|
build-depends:
|
||||||
semigroups >= 0.18.4 && < 0.19
|
semigroups >= 0.18.5 && < 0.19
|
||||||
|
|
||||||
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
|
-- Other dependencies: Lower bound around what is in the latest Stackage LTS.
|
||||||
-- Here can be exceptions if we really need features from the newer versions.
|
-- Here can be exceptions if we really need features from the newer versions.
|
||||||
build-depends:
|
build-depends:
|
||||||
base-compat >= 0.10.1 && < 0.11
|
base-compat >= 0.10.4 && < 0.11
|
||||||
, aeson >= 1.3.1.1 && < 1.5
|
, aeson >= 1.3.1.1 && < 1.5
|
||||||
, attoparsec >= 0.13.2.2 && < 0.14
|
, attoparsec >= 0.13.2.2 && < 0.14
|
||||||
, case-insensitive >= 1.2.0.10 && < 1.3
|
, case-insensitive >= 1.2.0.11 && < 1.3
|
||||||
, http-api-data >= 0.3.8.1 && < 0.4
|
, http-api-data >= 0.3.8.1 && < 0.4
|
||||||
, http-media >= 0.7.1.2 && < 0.8
|
, http-media >= 0.7.1.2 && < 0.8
|
||||||
, http-types >= 0.12.1 && < 0.13
|
, http-types >= 0.12.1 && < 0.13
|
||||||
|
@ -154,23 +152,23 @@ test-suite spec
|
||||||
|
|
||||||
-- Additonal dependencies
|
-- Additonal dependencies
|
||||||
build-depends:
|
build-depends:
|
||||||
aeson-compat >= 0.3.7.1 && < 0.4
|
aeson-compat >= 0.3.8 && < 0.4
|
||||||
, hspec >= 2.5.1 && < 2.6
|
, hspec >= 2.5.4 && < 2.6
|
||||||
, QuickCheck >= 2.11.3 && < 2.12
|
, QuickCheck >= 2.11.3 && < 2.12
|
||||||
, quickcheck-instances >= 0.3.18 && < 0.4
|
, quickcheck-instances >= 0.3.18 && < 0.4
|
||||||
|
|
||||||
build-tool-depends:
|
build-tool-depends:
|
||||||
hspec-discover:hspec-discover >= 2.5.1 && < 2.6
|
hspec-discover:hspec-discover >= 2.5.4 && < 2.6
|
||||||
|
|
||||||
test-suite doctests
|
test-suite doctests
|
||||||
build-depends:
|
build-depends:
|
||||||
base
|
base
|
||||||
, servant
|
, servant
|
||||||
, doctest >= 0.15.0 && <0.16
|
, doctest >= 0.16.0 && <0.17
|
||||||
|
|
||||||
-- We test Links failure with doctest, so we need extra dependencies
|
-- We test Links failure with doctest, so we need extra dependencies
|
||||||
build-depends:
|
build-depends:
|
||||||
hspec >= 2.5.1 && < 2.6
|
hspec >= 2.5.4 && < 2.6
|
||||||
|
|
||||||
type: exitcode-stdio-1.0
|
type: exitcode-stdio-1.0
|
||||||
main-is: test/doctests.hs
|
main-is: test/doctests.hs
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Let's try to keep resolver at the first day of the month
|
# Let's try to keep resolver at the first day of the month
|
||||||
resolver: nightly-2018-06-01
|
resolver: nightly-2018-07-08
|
||||||
packages:
|
packages:
|
||||||
- servant-client/
|
- servant-client/
|
||||||
- servant-client-core/
|
- servant-client-core/
|
||||||
|
|
Loading…
Reference in a new issue