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

Support http-api-data-0.3

Browse source
This commit is contained in:
Oleg Grenrus 2016-08-31 13:32:12 +03:00
parent 9e7356c6d3
commit a9afd37afe
5 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ library
, base64-bytestring >= 1.0.0.1 && < 1.1
, bytestring >= 0.10 && < 0.11
, exceptions >= 0.8 && < 0.9
, http-api-data >= 0.1 && < 0.3
, http-api-data >= 0.1 && < 0.4
, http-client >= 0.4.18.1 && < 0.6
, http-client-tls >= 0.2.2 && < 0.4
, http-media >= 0.6.2 && < 0.7

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

@ -52,7 +52,7 @@ library
, base64-bytestring >= 1.0 && < 1.1
, bytestring >= 0.10 && < 0.11
, containers >= 0.5 && < 0.6
, http-api-data >= 0.1 && < 0.3
, http-api-data >= 0.1 && < 0.4
, http-types >= 0.8 && < 0.10
, network-uri >= 2.6 && < 2.7
, mtl >= 2 && < 2.3

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

@ -43,10 +43,17 @@ import Network.Wai (Application, Request, Response,
import Prelude ()
import Prelude.Compat
import Web.HttpApiData (FromHttpApiData)
#if MIN_VERSION_http_api_data(0,3,0)
import Web.Internal.HttpApiData (parseHeaderMaybe,
parseQueryParamMaybe,
parseUrlPieceMaybe,
parseUrlPieces)
#else
import Web.HttpApiData.Internal (parseHeaderMaybe,
parseQueryParamMaybe,
parseUrlPieceMaybe,
parseUrlPieces)
#endif
import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture,
CaptureAll, Verb,

2
servant/servant.cabal
View file

@ -56,7 +56,7 @@ library
, bytestring >= 0.10 && < 0.11
, bytestring-conversion >= 0.3 && < 0.4
, case-insensitive >= 1.2 && < 1.3
, http-api-data >= 0.1 && < 0.3
, http-api-data >= 0.1 && < 0.4
, http-media >= 0.4 && < 0.7
, http-types >= 0.8 && < 0.10
, mtl >= 2.0 && < 2.3

1
stack.yaml
View file

@ -9,4 +9,5 @@ packages:
- servant-server/
- doc/tutorial
extra-deps:
- http-api-data-0.3
resolver: lts-6.0