067ab35 · servant · git.iko.soy

git.iko.soy/servant

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

Bump version to 0.18

commit067ab350ef2f83da660346072d1b2c5c03af85e6 authorfisx <mf@zerobuzz.net> dateFri 31 Jul 2020, 09:24 (6 years ago) parentc5717a6 d740c18

13 files changed+56−34

compare with master

unifiedsplit

.travis.yml+8 cabal.project+6 servant-client-core/servant-client-core.cabal+2−2 servant-client/servant-client.cabal+5−5 servant-conduit/servant-conduit.cabal+3−3 servant-docs/servant-docs.cabal+1−1 servant-foreign/servant-foreign.cabal+1−1 servant-http-streams/servant-http-streams.cabal+5−5 servant-machines/servant-machines.cabal+3−3 servant-pipes/servant-pipes.cabal+3−3 servant-server/servant-server.cabal+2−2 servant-server/src/Servant/Server/Internal/ErrorFormatter.hs+16−8 servant/servant.cabal+1−1

.travis.yml+8

@@ -195,6 +195,10 @@ install:

195195 echo "constraints: sqlite-simple < 0" >> cabal.project

196196 echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project

197197 echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project

198+ echo "allow-newer: servant-multipart:servant" >> cabal.project

199+ echo "allow-newer: servant-multipart:servant-server" >> cabal.project

200+ echo "allow-newer: servant-multipart:servant-client-core" >> cabal.project

201+ echo "allow-newer: servant-js:servant" >> cabal.project

198202 echo "optimization: False" >> cabal.project

199203 - "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"

200204 - cat cabal.project || true

@@ -336,6 +340,10 @@ script:

336340 echo "constraints: sqlite-simple < 0" >> cabal.project

337341 echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project

338342 echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project

343+ echo "allow-newer: servant-multipart:servant" >> cabal.project

344+ echo "allow-newer: servant-multipart:servant-server" >> cabal.project

345+ echo "allow-newer: servant-multipart:servant-client-core" >> cabal.project

346+ echo "allow-newer: servant-js:servant" >> cabal.project

339347 echo "optimization: False" >> cabal.project

340348 - "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"

341349 - cat cabal.project || true

cabal.project+6

@@ -63,3 +63,9 @@ write-ghc-environment-files: always

6363-- https://github.com/chordify/haskell-servant-pagination/pull/12

6464allow-newer: servant-pagination-2.2.2:servant

6565allow-newer: servant-pagination-2.2.2:servant-server

66+

67+-- https://github.com/haskell-servant/servant-multipart/pull/41

68+allow-newer: servant-multipart:servant

69+allow-newer: servant-multipart:servant-server

70+allow-newer: servant-multipart:servant-client-core

71+allow-newer: servant-js:servant

servant-client-core/servant-client-core.cabal+2−2

@@ -1,6 +1,6 @@

11cabal-version: >=1.10

22name: servant-client-core

3−version: 0.17

3+version: 0.18

55synopsis: Core functionality and class for client function generation for servant APIs

66category: Servant, Web

@@ -70,7 +70,7 @@ library

7070

7171 -- Servant dependencies

7272 build-depends:

73− servant >= 0.17 && <0.18

73+ servant >= 0.18 && <0.19

7474

7575 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

7676 -- Here can be exceptions if we really need features from the newer versions.

servant-client/servant-client.cabal+5−5

@@ -1,6 +1,6 @@

11cabal-version: >=1.10

22name: servant-client

3−version: 0.17

3+version: 0.18

55synopsis: Automatic derivation of querying functions for servant

66category: Servant, Web

@@ -63,8 +63,8 @@ library

6363 -- Servant dependencies.

6464 -- Strict dependency on `servant-client-core` as we re-export things.

6565 build-depends:

66− servant == 0.17.*

67− , servant-client-core >= 0.17 && <0.17.1

66+ servant == 0.18.*

67+ , servant-client-core >= 0.18 && <0.18.1

6868

6969 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

7070 -- Here can be exceptions if we really need features from the newer versions.

@@ -128,8 +128,8 @@ test-suite spec

128128 , HUnit >= 1.6.0.0 && < 1.7

129129 , network >= 2.8.0.0 && < 3.2

130130 , QuickCheck >= 2.12.6.1 && < 2.14

131− , servant == 0.17.*

132− , servant-server == 0.17.*

131+ , servant == 0.18.*

132+ , servant-server == 0.18.*

133133 , tdigest >= 0.2 && < 0.3

134134

135135 build-tool-depends:

servant-conduit/servant-conduit.cabal+3−3

@@ -40,7 +40,7 @@ library

4040 , conduit >=1.3.1 && <1.4

4141 , mtl >=2.2.2 && <2.3

4242 , resourcet >=1.2.2 && <1.3

43− , servant >=0.15 && <0.18

43+ , servant >=0.15 && <0.19

4444 , unliftio-core >=0.1.2.0 && <0.3

4545 hs-source-dirs: src

4646 default-language: Haskell2010

@@ -61,8 +61,8 @@ test-suite example

6161 , resourcet

6262 , servant

6363 , servant-conduit

64− , servant-server >=0.15 && <0.18

65− , servant-client >=0.15 && <0.18

64+ , servant-server >=0.15 && <0.19

65+ , servant-client >=0.15 && <0.19

6666 , wai >=3.2.1.2 && <3.3

6767 , warp >=3.2.25 && <3.4

6868 , http-client

servant-docs/servant-docs.cabal+1−1

@@ -53,7 +53,7 @@ library

5353

5454 -- Servant dependencies

5555 build-depends:

56− servant >= 0.17 && <0.18

56+ servant >= 0.18 && <0.19

5757

5858 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

5959 -- Here can be exceptions if we really need features from the newer versions.

servant-foreign/servant-foreign.cabal+1−1

@@ -52,7 +52,7 @@ library

5252

5353 -- Servant dependencies

5454 build-depends:

55− servant >=0.17 && <0.18

55+ servant >=0.18 && <0.19

5656

5757 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

5858 -- Here can be exceptions if we really need features from the newer versions.

servant-http-streams/servant-http-streams.cabal+5−5

@@ -1,6 +1,6 @@

11cabal-version: >=1.10

22name: servant-http-streams

3−version: 0.17

3+version: 0.18

55synopsis: Automatic derivation of querying functions for servant

66category: Servant, Web

@@ -60,8 +60,8 @@ library

6060 -- Servant dependencies.

6161 -- Strict dependency on `servant-client-core` as we re-export things.

6262 build-depends:

63− servant == 0.17.*

64− , servant-client-core >= 0.17 && <0.17.1

63+ servant == 0.18.*

64+ , servant-client-core >= 0.18 && <0.19.1

6565

6666 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

6767 -- Here can be exceptions if we really need features from the newer versions.

@@ -122,8 +122,8 @@ test-suite spec

122122 , HUnit >= 1.6.0.0 && < 1.7

123123 , network >= 2.8.0.0 && < 3.2

124124 , QuickCheck >= 2.12.6.1 && < 2.14

125− , servant == 0.17.*

126− , servant-server == 0.17.*

125+ , servant == 0.18.*

126+ , servant-server == 0.18.*

127127 , tdigest >= 0.2 && < 0.3

128128

129129 build-tool-depends:

servant-machines/servant-machines.cabal+3−3

@@ -39,7 +39,7 @@ library

3939 , bytestring >=0.10.8.1 && <0.11

4040 , machines >=0.6.4 && <0.8

4141 , mtl >=2.2.2 && <2.3

42− , servant >=0.15 && <0.18

42+ , servant >=0.15 && <0.19

4343 hs-source-dirs: src

4444 default-language: Haskell2010

4545 ghc-options: -Wall

@@ -58,8 +58,8 @@ test-suite example

5858 , servant

5959 , machines

6060 , servant-machines

61− , servant-server >=0.15 && <0.18

62− , servant-client >=0.15 && <0.18

61+ , servant-server >=0.15 && <0.19

62+ , servant-client >=0.15 && <0.19

6363 , wai >=3.2.1.2 && <3.3

6464 , warp >=3.2.25 && <3.4

6565 , http-client

servant-pipes/servant-pipes.cabal+3−3

@@ -41,7 +41,7 @@ library

4141 , pipes-safe >=2.3.1 && <2.4

4242 , mtl >=2.2.2 && <2.3

4343 , monad-control >=1.0.2.3 && <1.1

44− , servant >=0.15 && <0.18

44+ , servant >=0.15 && <0.19

4545 hs-source-dirs: src

4646 default-language: Haskell2010

4747 ghc-options: -Wall

@@ -62,8 +62,8 @@ test-suite example

6262 , pipes-safe

6363 , servant-pipes

6464 , pipes-bytestring >=2.1.6 && <2.2

65− , servant-server >=0.15 && <0.18

66− , servant-client >=0.15 && <0.18

65+ , servant-server >=0.15 && <0.19

66+ , servant-client >=0.15 && <0.19

6767 , wai >=3.2.1.2 && <3.3

6868 , warp >=3.2.25 && <3.4

6969 , http-client

servant-server/servant-server.cabal+2−2

@@ -1,6 +1,6 @@

11cabal-version: >=1.10

22name: servant-server

3−version: 0.17

3+version: 0.18

44x-revision: 1

66synopsis: A family of combinators for defining webservices APIs and serving them

@@ -77,7 +77,7 @@ library

7777 -- Servant dependencies

7878 -- strict dependency as we re-export 'servant' things.

7979 build-depends:

80− servant >= 0.17 && < 0.17.1

80+ servant >= 0.18 && < 0.19.1

8181 , http-api-data >= 0.4.1 && < 0.4.2

8282

8383 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

servant-server/src/Servant/Server/Internal/ErrorFormatter.hs+16−8

@@ -1,11 +1,19 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE KindSignatures #-}

3−{-# LANGUAGE PolyKinds #-}

4−{-# LANGUAGE RankNTypes #-}

1+{-# LANGUAGE DataKinds #-}

2+{-# LANGUAGE PolyKinds #-}

3+{-# LANGUAGE RankNTypes #-}

54{-# LANGUAGE TypeOperators #-}

76module Servant.Server.Internal.ErrorFormatter

8− where

7+ ( ErrorFormatters(..)

8+ , ErrorFormatter

9+ , NotFoundErrorFormatter

10+

11+ , DefaultErrorFormatters

12+ , defaultErrorFormatters

13+

14+ , MkContextWithErrorFormatter

15+ , mkContextWithErrorFormatter

16+ ) where

917

1018import Data.String.Conversions

1119 (cs)

@@ -72,8 +80,8 @@ err400Formatter _ _ e = err400 { errBody = cs e }

7280-- These definitions suppress "unused import" warning.

7381-- The imorts are needed for Haddock to correctly link to them.

7482_RB :: Proxy ReqBody

75−_RB = undefined

83+_RB = Proxy

7684_C :: Proxy Capture

77−_C = undefined

85+_C = Proxy

7886_CT :: Proxy Context

79−_CT = undefined

87+_CT = Proxy

servant/servant.cabal+1−1

@@ -1,6 +1,6 @@

11cabal-version: >=1.10

22name: servant

3−version: 0.17

3+version: 0.18

55synopsis: A family of combinators for defining webservices APIs

66category: Servant, Web