From 5ba0e439dc163461bd6decb9d76a39c29dec4969 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 10 Jul 2018 17:17:44 +0300 Subject: [PATCH] Support only GHC-8.0+ Let's bump lower bounds to whatever is in LTS close to release date. --- .travis.yml | 6 ----- doc/cookbook/basic-auth/basic-auth.cabal | 2 +- .../db-postgres-pool/db-postgres-pool.cabal | 2 +- .../db-sqlite-simple/db-sqlite-simple.cabal | 2 +- doc/cookbook/file-upload/file-upload.cabal | 2 +- doc/cookbook/generic/generic.cabal | 2 +- doc/cookbook/https/https.cabal | 2 +- .../jwt-and-basic-auth.cabal | 5 +--- doc/cookbook/pagination/dummy/Pagination.lhs | 5 ---- doc/cookbook/pagination/pagination.cabal | 23 ++++++------------- .../structuring-apis/structuring-apis.cabal | 2 +- .../using-custom-monad.cabal | 2 +- .../using-free-client/using-free-client.cabal | 4 ++-- doc/tutorial/tutorial.cabal | 2 -- servant-client-core/servant-client-core.cabal | 2 -- servant-client/servant-client.cabal | 2 -- servant-docs/servant-docs.cabal | 2 -- servant-foreign/servant-foreign.cabal | 2 -- servant-server/servant-server.cabal | 4 +--- servant/servant.cabal | 22 ++++++++---------- stack.yaml | 2 +- 21 files changed, 30 insertions(+), 67 deletions(-) delete mode 100644 doc/cookbook/pagination/dummy/Pagination.lhs diff --git a/.travis.yml b/.travis.yml index 8d500dab..c45710ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,12 +41,6 @@ matrix: - compiler: "ghc-8.0.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks 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: - HC=${CC} diff --git a/doc/cookbook/basic-auth/basic-auth.cabal b/doc/cookbook/basic-auth/basic-auth.cabal index ea9bfb09..a56c1df0 100644 --- a/doc/cookbook/basic-auth/basic-auth.cabal +++ b/doc/cookbook/basic-auth/basic-auth.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: BasicAuth.lhs diff --git a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal index 6e2da06b..a810d208 100644 --- a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal +++ b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: PostgresPool.lhs diff --git a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal index a6736adc..6d3b4be6 100644 --- a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal +++ b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: DBConnection.lhs diff --git a/doc/cookbook/file-upload/file-upload.cabal b/doc/cookbook/file-upload/file-upload.cabal index f422e59e..d856742e 100644 --- a/doc/cookbook/file-upload/file-upload.cabal +++ b/doc/cookbook/file-upload/file-upload.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: FileUpload.lhs diff --git a/doc/cookbook/generic/generic.cabal b/doc/cookbook/generic/generic.cabal index 0db6db1d..828ef4e4 100644 --- a/doc/cookbook/generic/generic.cabal +++ b/doc/cookbook/generic/generic.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: Generic.lhs diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal index 790acaef..b5ed5ee0 100644 --- a/doc/cookbook/https/https.cabal +++ b/doc/cookbook/https/https.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: Https.lhs diff --git a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal index 4ff5e6f1..a12eaa21 100644 --- a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal +++ b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal @@ -11,12 +11,9 @@ maintainer: haskell-servant-maintainers@googlegroups.com category: Servant build-type: Simple 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 - if !impl(ghc >= 7.10) - buildable: False - main-is: JWTAndBasicAuth.lhs build-depends: base == 4.* , text >= 1.2 diff --git a/doc/cookbook/pagination/dummy/Pagination.lhs b/doc/cookbook/pagination/dummy/Pagination.lhs deleted file mode 100644 index ab900f27..00000000 --- a/doc/cookbook/pagination/dummy/Pagination.lhs +++ /dev/null @@ -1,5 +0,0 @@ -```haskell -module Main (main) where -main :: IO () -main = return () -``` diff --git a/doc/cookbook/pagination/pagination.cabal b/doc/cookbook/pagination/pagination.cabal index 91382df4..bbc29ab5 100644 --- a/doc/cookbook/pagination/pagination.cabal +++ b/doc/cookbook/pagination/pagination.cabal @@ -8,25 +8,16 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple cabal-version: >=1.10 -extra-source-files: - 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 +tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.3 executable cookbook-pagination main-is: Pagination.lhs build-tool-depends: markdown-unlit:markdown-unlit default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit - - if impl(ghc >= 8.0) - hs-source-dirs: . - build-depends: base >= 4.8 && <4.12 - , aeson - , servant - , servant-server - , servant-pagination >= 2.1.0 && < 3.0.0 - , warp - else - hs-source-dirs: dummy - build-depends: base + build-depends: base >= 4.8 && <4.12 + , aeson + , servant + , servant-server + , servant-pagination >= 2.1.0 && < 3.0.0 + , warp diff --git a/doc/cookbook/structuring-apis/structuring-apis.cabal b/doc/cookbook/structuring-apis/structuring-apis.cabal index de50bf43..f3a3b596 100644 --- a/doc/cookbook/structuring-apis/structuring-apis.cabal +++ b/doc/cookbook/structuring-apis/structuring-apis.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: StructuringApis.lhs diff --git a/doc/cookbook/using-custom-monad/using-custom-monad.cabal b/doc/cookbook/using-custom-monad/using-custom-monad.cabal index d5945b01..8271f81b 100644 --- a/doc/cookbook/using-custom-monad/using-custom-monad.cabal +++ b/doc/cookbook/using-custom-monad/using-custom-monad.cabal @@ -8,7 +8,7 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: UsingCustomMonad.lhs diff --git a/doc/cookbook/using-free-client/using-free-client.cabal b/doc/cookbook/using-free-client/using-free-client.cabal index ff0fa247..2284815e 100644 --- a/doc/cookbook/using-free-client/using-free-client.cabal +++ b/doc/cookbook/using-free-client/using-free-client.cabal @@ -8,11 +8,11 @@ author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 main-is: UsingFreeClient.lhs - build-depends: base == 4.* + build-depends: base >= 4.9 && <5 , free , servant , servant-client diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal index fb82085c..81de79b3 100644 --- a/doc/tutorial/tutorial.cabal +++ b/doc/tutorial/tutorial.cabal @@ -13,8 +13,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com build-type: Simple 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 diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 9b2c842e..5aa31e0a 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -19,8 +19,6 @@ extra-source-files: CHANGELOG.md README.md tested-with: - GHC==7.8.4 - GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 GHC==8.4.3 diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 7f4ef1a6..77737b7c 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -17,8 +17,6 @@ category: Servant, Web build-type: Simple 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 diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index 6543e66d..2766cb25 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -17,8 +17,6 @@ category: Servant, Web build-type: Simple 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 diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index 3c61da29..8054be5e 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -24,8 +24,6 @@ extra-source-files: README.md bug-reports: http://github.com/haskell-servant/servant/issues tested-with: - GHC==7.8.4 - GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 GHC==8.4.3 diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 6b0bee2e..cf1c2b9a 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -22,8 +22,6 @@ category: Servant, Web build-type: Custom 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 @@ -181,7 +179,7 @@ test-suite doctests build-depends: base , servant-server - , doctest >= 0.15.0 && <0.16 + , doctest >= 0.16.0 && <0.17 type: exitcode-stdio-1.0 main-is: test/doctests.hs buildable: True diff --git a/servant/servant.cabal b/servant/servant.cabal index 778207dc..05658322 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -18,8 +18,6 @@ category: Servant, Web build-type: Custom 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 @@ -74,22 +72,22 @@ library -- -- note: mtl lower bound is so low because of GHC-7.8 build-depends: - base >= 4.7 && < 4.12 - , bytestring >= 0.10.4.0 && < 0.11 + base >= 4.9 && < 4.12 + , bytestring >= 0.10.8.1 && < 0.11 , mtl >= 2.1 && < 2.3 , text >= 1.2.3.0 && < 1.3 if !impl(ghc >= 8.0) 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. -- Here can be exceptions if we really need features from the newer versions. build-depends: - base-compat >= 0.10.1 && < 0.11 + base-compat >= 0.10.4 && < 0.11 , aeson >= 1.3.1.1 && < 1.5 , 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-media >= 0.7.1.2 && < 0.8 , http-types >= 0.12.1 && < 0.13 @@ -154,23 +152,23 @@ test-suite spec -- Additonal dependencies build-depends: - aeson-compat >= 0.3.7.1 && < 0.4 - , hspec >= 2.5.1 && < 2.6 + aeson-compat >= 0.3.8 && < 0.4 + , hspec >= 2.5.4 && < 2.6 , QuickCheck >= 2.11.3 && < 2.12 , quickcheck-instances >= 0.3.18 && < 0.4 build-tool-depends: - hspec-discover:hspec-discover >= 2.5.1 && < 2.6 + hspec-discover:hspec-discover >= 2.5.4 && < 2.6 test-suite doctests build-depends: base , servant - , doctest >= 0.15.0 && <0.16 + , doctest >= 0.16.0 && <0.17 -- We test Links failure with doctest, so we need extra dependencies build-depends: - hspec >= 2.5.1 && < 2.6 + hspec >= 2.5.4 && < 2.6 type: exitcode-stdio-1.0 main-is: test/doctests.hs diff --git a/stack.yaml b/stack.yaml index e0290726..bfa09df1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,5 @@ # Let's try to keep resolver at the first day of the month -resolver: nightly-2018-06-01 +resolver: nightly-2018-07-08 packages: - servant-client/ - servant-client-core/