f44b336 · typeable/servant

git.iko.soy/typeable/servant

Support http-api-data-0.3

commitf44b336bf10e9f5cb6d27a8c506e8b7cf01f33b1 authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 31 Aug 2016, 13:32 (10 years ago) parent7f208c7

5 files changed+11−3

compare with master

unifiedsplit

servant-client/servant-client.cabal+1−1 servant-server/servant-server.cabal+1−1 servant-server/src/Servant/Server/Internal.hs+7 servant/servant.cabal+1−1 stack.yaml+1

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

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

4141 , base64-bytestring >= 1.0.0.1 && < 1.1

4242 , bytestring >= 0.10 && < 0.11

4343 , exceptions >= 0.8 && < 0.9

44− , http-api-data >= 0.1 && < 0.3

44+ , http-api-data >= 0.1 && < 0.4

4545 , http-client >= 0.4.18.1 && < 0.6

4646 , http-client-tls >= 0.2.2 && < 0.4

4747 , http-media >= 0.6.2 && < 0.7

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

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

5252 , base64-bytestring >= 1.0 && < 1.1

5353 , bytestring >= 0.10 && < 0.11

5454 , containers >= 0.5 && < 0.6

55− , http-api-data >= 0.1 && < 0.3

55+ , http-api-data >= 0.1 && < 0.4

5656 , http-types >= 0.8 && < 0.10

5757 , network-uri >= 2.6 && < 2.7

5858 , mtl >= 2 && < 2.3

servant-server/src/Servant/Server/Internal.hs+7

@@ -43,10 +43,17 @@ import Network.Wai (Application, Request, Response,

4343import Prelude ()

4444import Prelude.Compat

4545import Web.HttpApiData (FromHttpApiData)

46+#if MIN_VERSION_http_api_data(0,3,0)

47+import Web.Internal.HttpApiData (parseHeaderMaybe,

48+ parseQueryParamMaybe,

49+ parseUrlPieceMaybe,

50+ parseUrlPieces)

51+#else

4652import Web.HttpApiData.Internal (parseHeaderMaybe,

4753 parseQueryParamMaybe,

4854 parseUrlPieceMaybe,

4955 parseUrlPieces)

56+#endif

5057

5158import Servant.API ((:<|>) (..), (:>), BasicAuth, Capture,

5259 CaptureAll, Verb,

servant/servant.cabal+1−1

@@ -55,7 +55,7 @@ library

5555 , attoparsec >= 0.12 && < 0.14

5656 , bytestring >= 0.10 && < 0.11

5757 , case-insensitive >= 1.2 && < 1.3

58− , http-api-data >= 0.1 && < 0.3

58+ , http-api-data >= 0.1 && < 0.4

5959 , http-media >= 0.4 && < 0.7

6060 , http-types >= 0.8 && < 0.10

6161 , mtl >= 2.0 && < 2.3

stack.yaml+1

@@ -8,4 +8,5 @@ packages:

88- servant-server/

99- doc/tutorial

1010extra-deps:

11+- http-api-data-0.3

1112resolver: lts-6.0