067ab35 · typeable/servant

.travis.yml+8

compare with master

unifiedsplit

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

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

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

197 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

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

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

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

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

200 - cat cabal.project || true

204 - cat cabal.project || true

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

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

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

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

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

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

342 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

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

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

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

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

341 - cat cabal.project || true

349 - cat cabal.project || true

cabal.project+6

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

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

64allow-newer: servant-pagination-2.2.2:servant

65allow-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 @@

1cabal-version: >=1.10

2name: servant-client-core

3−version: 0.17

3+version: 0.18

4

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

6category: Servant, Web

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

70

71 -- Servant dependencies

72 build-depends:

73− servant >= 0.17 && <0.18

73+ servant >= 0.18 && <0.19

74

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

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

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

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

1cabal-version: >=1.10

2name: servant-client

3−version: 0.17

3+version: 0.18

4

5synopsis: Automatic derivation of querying functions for servant

6category: Servant, Web

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

63 -- Servant dependencies.

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

65 build-depends:

66− servant == 0.17.*

66+ servant == 0.18.*

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

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

68

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

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

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

128 , HUnit >= 1.6.0.0 && < 1.7

129 , network >= 2.8.0.0 && < 3.2

130 , QuickCheck >= 2.12.6.1 && < 2.14

131− , servant == 0.17.*

131+ , servant == 0.18.*

132− , servant-server == 0.17.*

132+ , servant-server == 0.18.*

133 , tdigest >= 0.2 && < 0.3

134

135 build-tool-depends:

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

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

40 , conduit >=1.3.1 && <1.4

41 , mtl >=2.2.2 && <2.3

42 , resourcet >=1.2.2 && <1.3

43− , servant >=0.15 && <0.18

43+ , servant >=0.15 && <0.19

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

45 hs-source-dirs: src

46 default-language: Haskell2010

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

61 , resourcet

62 , servant

63 , servant-conduit

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

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

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

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

66 , wai >=3.2.1.2 && <3.3

67 , warp >=3.2.25 && <3.4

68 , http-client

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

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

53

54 -- Servant dependencies

55 build-depends:

56− servant >= 0.17 && <0.18

56+ servant >= 0.18 && <0.19

57

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

59 -- 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

52

53 -- Servant dependencies

54 build-depends:

55− servant >=0.17 && <0.18

55+ servant >=0.18 && <0.19

56

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

58 -- 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 @@

1cabal-version: >=1.10

2name: servant-http-streams

3−version: 0.17

3+version: 0.18

4

5synopsis: Automatic derivation of querying functions for servant

6category: Servant, Web

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

60 -- Servant dependencies.

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

62 build-depends:

63− servant == 0.17.*

63+ servant == 0.18.*

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

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

65

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

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

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

122 , HUnit >= 1.6.0.0 && < 1.7

123 , network >= 2.8.0.0 && < 3.2

124 , QuickCheck >= 2.12.6.1 && < 2.14

125− , servant == 0.17.*

125+ , servant == 0.18.*

126− , servant-server == 0.17.*

126+ , servant-server == 0.18.*

127 , tdigest >= 0.2 && < 0.3

128

129 build-tool-depends:

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

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

39 , bytestring >=0.10.8.1 && <0.11

40 , machines >=0.6.4 && <0.8

41 , mtl >=2.2.2 && <2.3

42− , servant >=0.15 && <0.18

42+ , servant >=0.15 && <0.19

43 hs-source-dirs: src

44 default-language: Haskell2010

45 ghc-options: -Wall

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

58 , servant

59 , machines

60 , servant-machines

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

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

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

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

63 , wai >=3.2.1.2 && <3.3

64 , warp >=3.2.25 && <3.4

65 , http-client

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

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

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

42 , mtl >=2.2.2 && <2.3

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

44− , servant >=0.15 && <0.18

44+ , servant >=0.15 && <0.19

45 hs-source-dirs: src

46 default-language: Haskell2010

47 ghc-options: -Wall

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

62 , pipes-safe

63 , servant-pipes

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

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

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

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

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

67 , wai >=3.2.1.2 && <3.3

68 , warp >=3.2.25 && <3.4

69 , http-client

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

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

1cabal-version: >=1.10

2name: servant-server

3−version: 0.17

3+version: 0.18

4x-revision: 1

5

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

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

77 -- Servant dependencies

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

79 build-depends:

80− servant >= 0.17 && < 0.17.1

80+ servant >= 0.18 && < 0.19.1

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

82

83 -- 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 #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE KindSignatures #-}

3−{-# LANGUAGE PolyKinds #-}

2+{-# LANGUAGE PolyKinds #-}

4−{-# LANGUAGE RankNTypes #-}

3+{-# LANGUAGE RankNTypes #-}

5{-# LANGUAGE TypeOperators #-}

4{-# LANGUAGE TypeOperators #-}

6

5

7module Servant.Server.Internal.ErrorFormatter

6module Servant.Server.Internal.ErrorFormatter

7+ ( ErrorFormatters(..)

8+ , ErrorFormatter

9+ , NotFoundErrorFormatter

10+

11+ , DefaultErrorFormatters

12+ , defaultErrorFormatters

13+

14+ , MkContextWithErrorFormatter

15+ , mkContextWithErrorFormatter

8− where

16+ ) where

9

17

10import Data.String.Conversions

18import Data.String.Conversions

11 (cs)

19 (cs)

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

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

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

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

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

74_RB :: Proxy ReqBody

82_RB :: Proxy ReqBody

75−_RB = undefined

83+_RB = Proxy

76_C :: Proxy Capture

84_C :: Proxy Capture

77−_C = undefined

85+_C = Proxy

78_CT :: Proxy Context

86_CT :: Proxy Context

79−_CT = undefined

87+_CT = Proxy

servant/servant.cabal+1−1

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

1cabal-version: >=1.10

2name: servant

3−version: 0.17

3+version: 0.18

4

5synopsis: A family of combinators for defining webservices APIs

6category: Servant, Web