eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1326 from maksbotan/maksbotan/bump-version

Browse source 
Bump version to 0.18
This commit is contained in:
fisx 2020-07-31 09:24:09 +02:00 committed by GitHub
commit 067ab350ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 56 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -195,6 +195,10 @@ install:
echo "constraints: sqlite-simple < 0" >> cabal.project echo "constraints: sqlite-simple < 0" >> cabal.project
echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project
echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project
echo "allow-newer: servant-multipart:servant" >> cabal.project
echo "allow-newer: servant-multipart:servant-server" >> cabal.project
echo "allow-newer: servant-multipart:servant-client-core" >> cabal.project
echo "allow-newer: servant-js:servant" >> cabal.project
echo "optimization: False" >> cabal.project echo "optimization: False" >> cabal.project
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-custom-errors|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-custom-errors|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- cat cabal.project || true - cat cabal.project || true
@ -336,6 +340,10 @@ script:
echo "constraints: sqlite-simple < 0" >> cabal.project echo "constraints: sqlite-simple < 0" >> cabal.project
echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project
echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project
echo "allow-newer: servant-multipart:servant" >> cabal.project
echo "allow-newer: servant-multipart:servant-server" >> cabal.project
echo "allow-newer: servant-multipart:servant-client-core" >> cabal.project
echo "allow-newer: servant-js:servant" >> cabal.project
echo "optimization: False" >> cabal.project echo "optimization: False" >> cabal.project
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-custom-errors|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-custom-errors|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- cat cabal.project || true - cat cabal.project || true

6
cabal.project
View file

@ -63,3 +63,9 @@ write-ghc-environment-files: always
-- https://github.com/chordify/haskell-servant-pagination/pull/12 -- https://github.com/chordify/haskell-servant-pagination/pull/12
allow-newer: servant-pagination-2.2.2:servant allow-newer: servant-pagination-2.2.2:servant
allow-newer: servant-pagination-2.2.2:servant-server allow-newer: servant-pagination-2.2.2:servant-server
-- https://github.com/haskell-servant/servant-multipart/pull/41
allow-newer: servant-multipart:servant
allow-newer: servant-multipart:servant-server
allow-newer: servant-multipart:servant-client-core
allow-newer: servant-js:servant

4
servant-client-core/servant-client-core.cabal
View file

@ -1,6 +1,6 @@
cabal-version: >=1.10 cabal-version: >=1.10
name: servant-client-core name: servant-client-core
version: 0.17 version: 0.18
synopsis: Core functionality and class for client function generation for servant APIs synopsis: Core functionality and class for client function generation for servant APIs
category: Servant, Web category: Servant, Web
@ -70,7 +70,7 @@ library
-- Servant dependencies -- Servant dependencies
build-depends: build-depends:
servant >= 0.17 && <0.18 servant >= 0.18 && <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.

10
servant-client/servant-client.cabal
View file

@ -1,6 +1,6 @@
cabal-version: >=1.10 cabal-version: >=1.10
name: servant-client name: servant-client
version: 0.17 version: 0.18
synopsis: Automatic derivation of querying functions for servant synopsis: Automatic derivation of querying functions for servant
category: Servant, Web category: Servant, Web
@ -63,8 +63,8 @@ library
-- Servant dependencies. -- Servant dependencies.
-- Strict dependency on `servant-client-core` as we re-export things. -- Strict dependency on `servant-client-core` as we re-export things.
build-depends: build-depends:
servant == 0.17.* servant == 0.18.*
, servant-client-core >= 0.17 && <0.17.1 , servant-client-core >= 0.18 && <0.18.1
-- 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.
@ -128,8 +128,8 @@ test-suite spec
, HUnit >= 1.6.0.0 && < 1.7 , HUnit >= 1.6.0.0 && < 1.7
, network >= 2.8.0.0 && < 3.2 , network >= 2.8.0.0 && < 3.2
, QuickCheck >= 2.12.6.1 && < 2.14 , QuickCheck >= 2.12.6.1 && < 2.14
, servant == 0.17.* , servant == 0.18.*
, servant-server == 0.17.* , servant-server == 0.18.*
, tdigest >= 0.2 && < 0.3 , tdigest >= 0.2 && < 0.3
build-tool-depends: build-tool-depends:

6
servant-conduit/servant-conduit.cabal
View file

@ -40,7 +40,7 @@ library
, conduit >=1.3.1 && <1.4 , conduit >=1.3.1 && <1.4
, mtl >=2.2.2 && <2.3 , mtl >=2.2.2 && <2.3
, resourcet >=1.2.2 && <1.3 , resourcet >=1.2.2 && <1.3
, servant >=0.15 && <0.18 , servant >=0.15 && <0.19
, unliftio-core >=0.1.2.0 && <0.3 , unliftio-core >=0.1.2.0 && <0.3
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
@ -61,8 +61,8 @@ test-suite example
, resourcet , resourcet
, servant , servant
, servant-conduit , servant-conduit
, servant-server >=0.15 && <0.18 , servant-server >=0.15 && <0.19
, servant-client >=0.15 && <0.18 , servant-client >=0.15 && <0.19
, wai >=3.2.1.2 && <3.3 , wai >=3.2.1.2 && <3.3
, warp >=3.2.25 && <3.4 , warp >=3.2.25 && <3.4
, http-client , http-client

2
servant-docs/servant-docs.cabal
View file

@ -53,7 +53,7 @@ library
-- Servant dependencies -- Servant dependencies
build-depends: build-depends:
servant >= 0.17 && <0.18 servant >= 0.18 && <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.

2
servant-foreign/servant-foreign.cabal
View file

@ -52,7 +52,7 @@ library
-- Servant dependencies -- Servant dependencies
build-depends: build-depends:
servant >=0.17 && <0.18 servant >=0.18 && <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.

10
servant-http-streams/servant-http-streams.cabal
View file

@ -1,6 +1,6 @@
cabal-version: >=1.10 cabal-version: >=1.10
name: servant-http-streams name: servant-http-streams
version: 0.17 version: 0.18
synopsis: Automatic derivation of querying functions for servant synopsis: Automatic derivation of querying functions for servant
category: Servant, Web category: Servant, Web
@ -60,8 +60,8 @@ library
-- Servant dependencies. -- Servant dependencies.
-- Strict dependency on `servant-client-core` as we re-export things. -- Strict dependency on `servant-client-core` as we re-export things.
build-depends: build-depends:
servant == 0.17.* servant == 0.18.*
, servant-client-core >= 0.17 && <0.17.1 , servant-client-core >= 0.18 && <0.19.1
-- 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.
@ -122,8 +122,8 @@ test-suite spec
, HUnit >= 1.6.0.0 && < 1.7 , HUnit >= 1.6.0.0 && < 1.7
, network >= 2.8.0.0 && < 3.2 , network >= 2.8.0.0 && < 3.2
, QuickCheck >= 2.12.6.1 && < 2.14 , QuickCheck >= 2.12.6.1 && < 2.14
, servant == 0.17.* , servant == 0.18.*
, servant-server == 0.17.* , servant-server == 0.18.*
, tdigest >= 0.2 && < 0.3 , tdigest >= 0.2 && < 0.3
build-tool-depends: build-tool-depends:

6
servant-machines/servant-machines.cabal
View file

@ -39,7 +39,7 @@ library
, bytestring >=0.10.8.1 && <0.11 , bytestring >=0.10.8.1 && <0.11
, machines >=0.6.4 && <0.8 , machines >=0.6.4 && <0.8
, mtl >=2.2.2 && <2.3 , mtl >=2.2.2 && <2.3
, servant >=0.15 && <0.18 , servant >=0.15 && <0.19
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wall ghc-options: -Wall
@ -58,8 +58,8 @@ test-suite example
, servant , servant
, machines , machines
, servant-machines , servant-machines
, servant-server >=0.15 && <0.18 , servant-server >=0.15 && <0.19
, servant-client >=0.15 && <0.18 , servant-client >=0.15 && <0.19
, wai >=3.2.1.2 && <3.3 , wai >=3.2.1.2 && <3.3
, warp >=3.2.25 && <3.4 , warp >=3.2.25 && <3.4
, http-client , http-client

6
servant-pipes/servant-pipes.cabal
View file

@ -41,7 +41,7 @@ library
, pipes-safe >=2.3.1 && <2.4 , pipes-safe >=2.3.1 && <2.4
, mtl >=2.2.2 && <2.3 , mtl >=2.2.2 && <2.3
, monad-control >=1.0.2.3 && <1.1 , monad-control >=1.0.2.3 && <1.1
, servant >=0.15 && <0.18 , servant >=0.15 && <0.19
hs-source-dirs: src hs-source-dirs: src
default-language: Haskell2010 default-language: Haskell2010
ghc-options: -Wall ghc-options: -Wall
@ -62,8 +62,8 @@ test-suite example
, pipes-safe , pipes-safe
, servant-pipes , servant-pipes
, pipes-bytestring >=2.1.6 && <2.2 , pipes-bytestring >=2.1.6 && <2.2
, servant-server >=0.15 && <0.18 , servant-server >=0.15 && <0.19
, servant-client >=0.15 && <0.18 , servant-client >=0.15 && <0.19
, wai >=3.2.1.2 && <3.3 , wai >=3.2.1.2 && <3.3
, warp >=3.2.25 && <3.4 , warp >=3.2.25 && <3.4
, http-client , http-client

4
servant-server/servant-server.cabal
View file

@ -1,6 +1,6 @@
cabal-version: >=1.10 cabal-version: >=1.10
name: servant-server name: servant-server
version: 0.17 version: 0.18
x-revision: 1 x-revision: 1
synopsis: A family of combinators for defining webservices APIs and serving them synopsis: A family of combinators for defining webservices APIs and serving them
@ -77,7 +77,7 @@ library
-- Servant dependencies -- Servant dependencies
-- strict dependency as we re-export 'servant' things. -- strict dependency as we re-export 'servant' things.
build-depends: build-depends:
servant >= 0.17 && < 0.17.1 servant >= 0.18 && < 0.19.1
, http-api-data >= 0.4.1 && < 0.4.2 , http-api-data >= 0.4.1 && < 0.4.2
-- Other dependencies: Lower bound around what is in the latest Stackage LTS. -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

18
servant-server/src/Servant/Server/Internal/ErrorFormatter.hs
View file

@ -1,11 +1,19 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE PolyKinds #-} {-# LANGUAGE PolyKinds #-}
{-# LANGUAGE RankNTypes #-} {-# LANGUAGE RankNTypes #-}
{-# LANGUAGE TypeOperators #-} {-# LANGUAGE TypeOperators #-}
module Servant.Server.Internal.ErrorFormatter module Servant.Server.Internal.ErrorFormatter
where ( ErrorFormatters(..)
, ErrorFormatter
, NotFoundErrorFormatter
, DefaultErrorFormatters
, defaultErrorFormatters
, MkContextWithErrorFormatter
, mkContextWithErrorFormatter
) where
import Data.String.Conversions import Data.String.Conversions
(cs) (cs)
@ -72,8 +80,8 @@ err400Formatter _ _ e = err400 { errBody = cs e }
-- These definitions suppress "unused import" warning. -- These definitions suppress "unused import" warning.
-- The imorts are needed for Haddock to correctly link to them. -- The imorts are needed for Haddock to correctly link to them.
_RB :: Proxy ReqBody _RB :: Proxy ReqBody
_RB = undefined _RB = Proxy
_C :: Proxy Capture _C :: Proxy Capture
_C = undefined _C = Proxy
_CT :: Proxy Context _CT :: Proxy Context
_CT = undefined _CT = Proxy

2
servant/servant.cabal
View file

@ -1,6 +1,6 @@
cabal-version: >=1.10 cabal-version: >=1.10
name: servant name: servant
version: 0.17 version: 0.18
synopsis: A family of combinators for defining webservices APIs synopsis: A family of combinators for defining webservices APIs
category: Servant, Web category: Servant, Web