d3aba7a · typeable/servant

git.iko.soy/typeable/servant

on master help sign in

Merge pull request #1229 from haskell-servant/servant-jsaddle-8.8

d3aba7aOleg Grenrus7 years ago

.travis.yml+28−2

compare with master

unifiedsplit

@@ -143,7 +143,7 @@ install:

143 if ! $GHCJS ; then echo "packages: servant-machines" >> cabal.project ; fi

144 if ! $GHCJS ; then echo "packages: servant-conduit" >> cabal.project ; fi

145 if ! $GHCJS ; then echo "packages: servant-pipes" >> cabal.project ; fi

146− if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: servant-jsaddle" >> cabal.project ; fi

146+ echo "packages: servant-jsaddle" >> cabal.project

147 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi

148 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi

149 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi

@@ -159,6 +159,7 @@ install:

159 echo "constraints: foundation >=0.0.14" >> cabal.project

160 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

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

162+ echo "constraints: base-compat ^>=0.11" >> cabal.project

162 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project

163 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project

163 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

164 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

164 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

165 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

@@ -167,6 +168,18 @@ install:

167 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

168 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

168 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project

169 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project

169 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

170 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

171+ echo "allow-newer: jsaddle-0.9.6.0:lens" >> cabal.project

172+ echo "allow-newer: jsaddle-0.9.6.0:primitive" >> cabal.project

173+ echo "allow-newer: jsaddle-0.9.6.0:time" >> cabal.project

174+ echo "allow-newer: jsaddle-dom-0.9.3.1:base" >> cabal.project

175+ echo "allow-newer: jsaddle-dom-0.9.3.1:base-compat" >> cabal.project

176+ echo "allow-newer: jsaddle-dom-0.9.3.1:Cabal" >> cabal.project

177+ echo "allow-newer: jsaddle-dom-0.9.3.1:lens" >> cabal.project

178+ echo "allow-newer: jsaddle-dom-0.9.3.2:base" >> cabal.project

179+ echo "allow-newer: jsaddle-dom-0.9.3.2:base-compat" >> cabal.project

180+ echo "allow-newer: jsaddle-dom-0.9.3.2:Cabal" >> cabal.project

181+ echo "allow-newer: jsaddle-dom-0.9.3.2:lens" >> cabal.project

182+ echo "allow-newer: jsaddle-warp-0.9.6.0:time" >> cabal.project

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

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

171 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

184 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

172 - cat cabal.project || true

185 - cat cabal.project || true

@@ -247,7 +260,7 @@ script:

247 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi

260 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_machines}" >> cabal.project ; fi

248 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi

261 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project ; fi

249 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi

262 if ! $GHCJS ; then echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project ; fi

250− if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project ; fi

263+ echo "packages: ${PKGDIR_servant_jsaddle}" >> cabal.project

251 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi

264 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi

252 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi

265 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi

253 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi

266 if ! $GHCJS && [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi

@@ -263,6 +276,7 @@ script:

263 echo "constraints: foundation >=0.0.14" >> cabal.project

276 echo "constraints: foundation >=0.0.14" >> cabal.project

264 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

277 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

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

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

279+ echo "constraints: base-compat ^>=0.11" >> cabal.project

266 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project

280 echo "allow-newer: aeson-pretty-0.8.7:base-compat" >> cabal.project

267 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

281 echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project

268 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

282 echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project

@@ -271,6 +285,18 @@ script:

271 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

285 echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project

272 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project

286 echo "allow-newer: io-streams-1.5.1.0:primitive" >> cabal.project

273 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

287 echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project

288+ echo "allow-newer: jsaddle-0.9.6.0:lens" >> cabal.project

289+ echo "allow-newer: jsaddle-0.9.6.0:primitive" >> cabal.project

290+ echo "allow-newer: jsaddle-0.9.6.0:time" >> cabal.project

291+ echo "allow-newer: jsaddle-dom-0.9.3.1:base" >> cabal.project

292+ echo "allow-newer: jsaddle-dom-0.9.3.1:base-compat" >> cabal.project

293+ echo "allow-newer: jsaddle-dom-0.9.3.1:Cabal" >> cabal.project

294+ echo "allow-newer: jsaddle-dom-0.9.3.1:lens" >> cabal.project

295+ echo "allow-newer: jsaddle-dom-0.9.3.2:base" >> cabal.project

296+ echo "allow-newer: jsaddle-dom-0.9.3.2:base-compat" >> cabal.project

297+ echo "allow-newer: jsaddle-dom-0.9.3.2:Cabal" >> cabal.project

298+ echo "allow-newer: jsaddle-dom-0.9.3.2:lens" >> cabal.project

299+ echo "allow-newer: jsaddle-warp-0.9.6.0:time" >> cabal.project

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

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

275 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

301 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-jsaddle|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

276 - cat cabal.project || true

302 - cat cabal.project || true

cabal.project+16−2

@@ -38,8 +38,6 @@ packages:

38 doc/cookbook/using-free-client

39 -- doc/cookbook/open-id-connect

41−

42−

43tests: True

41tests: True

44optimization: False

42optimization: False

45-- reorder-goals: True

43-- reorder-goals: True

@@ -62,3 +60,19 @@ allow-newer: openssl-streams-1.2.2.0:network

62-- MonadFail

60-- MonadFail

63-- https://github.com/nurpax/sqlite-simple/issues/74

61-- https://github.com/nurpax/sqlite-simple/issues/74

64constraints: sqlite-simple < 0

62constraints: sqlite-simple < 0

63+

64+-- jsaddle

65+allow-newer: jsaddle-0.9.6.0:lens

66+allow-newer: jsaddle-0.9.6.0:primitive

67+allow-newer: jsaddle-0.9.6.0:time

68+allow-newer: jsaddle-dom-0.9.3.1:base

69+allow-newer: jsaddle-dom-0.9.3.1:base-compat

70+allow-newer: jsaddle-dom-0.9.3.1:Cabal

71+allow-newer: jsaddle-dom-0.9.3.1:lens

72+allow-newer: jsaddle-dom-0.9.3.2:base

73+allow-newer: jsaddle-dom-0.9.3.2:base-compat

74+allow-newer: jsaddle-dom-0.9.3.2:Cabal

75+allow-newer: jsaddle-dom-0.9.3.2:lens

76+allow-newer: jsaddle-warp-0.9.6.0:time

77+

78+constraints: base-compat ^>=0.11

servant-client/CHANGELOG.md+5

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

1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md)

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

4+0.16.0.1

5+--------

7+- Allow `base-compat-0.11`

40.16

90.16

5----

10----

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

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

1cabal-version: >=1.10

2name: servant-client

3−version: 0.16

3+version: 0.16.0.1

5synopsis: Automatic derivation of querying functions for servant

6category: Servant, Web

servant-client/src/Servant/Client/Internal/HttpClient.hs+7−3

@@ -16,10 +16,11 @@ import Prelude.Compat

17import Control.Concurrent.MVar

18 (modifyMVar, newMVar)

19−import qualified Data.ByteString as BS

20import Control.Concurrent.STM.TVar

19import Control.Concurrent.STM.TVar

21import Control.Exception

20import Control.Exception

21+ (SomeException (..), catch)

22import Control.Monad

23+ (unless)

23import Control.Monad.Base

24import Control.Monad.Base

24 (MonadBase (..))

25 (MonadBase (..))

25import Control.Monad.Catch

26import Control.Monad.Catch

@@ -27,15 +28,18 @@ import Control.Monad.Catch

27import Control.Monad.Error.Class

28import Control.Monad.Error.Class

28 (MonadError (..))

29 (MonadError (..))

29import Control.Monad.IO.Class

30import Control.Monad.IO.Class

30− (liftIO)

31+ (MonadIO (..))

31import Control.Monad.Reader

32import Control.Monad.Reader

33+ (MonadReader, ReaderT, ask, runReaderT)

32import Control.Monad.STM

34import Control.Monad.STM

33 (STM, atomically)

35 (STM, atomically)

34import Control.Monad.Trans.Control

36import Control.Monad.Trans.Control

35 (MonadBaseControl (..))

37 (MonadBaseControl (..))

36import Control.Monad.Trans.Except

38import Control.Monad.Trans.Except

39+ (ExceptT, runExceptT)

37import Data.Bifunctor

40import Data.Bifunctor

38 (bimap)

41 (bimap)

42+import qualified Data.ByteString as BS

39import Data.ByteString.Builder

43import Data.ByteString.Builder

40 (toLazyByteString)

44 (toLazyByteString)

41import qualified Data.ByteString.Lazy as BSL

45import qualified Data.ByteString.Lazy as BSL

@@ -64,8 +68,8 @@ import Network.HTTP.Types

64 (hContentType, renderQuery, statusCode)

68 (hContentType, renderQuery, statusCode)

65import Servant.Client.Core

69import Servant.Client.Core

67−import qualified Servant.Types.SourceT as S

68import qualified Network.HTTP.Client as Client

71import qualified Network.HTTP.Client as Client

72+import qualified Servant.Types.SourceT as S

70-- | The environment in which a request is run.

74-- | The environment in which a request is run.

71data ClientEnv

75data ClientEnv

servant-http-streams/CHANGELOG.md+5

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

1 [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/CHANGELOG.md)

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

4+0.16.0.1

5+--------

7+- Allow `base-compat-0.11`

40.16

90.16

5----

10----

servant-http-streams/src/Servant/HttpStreams/Internal.hs+7−1

@@ -18,6 +18,8 @@ import Control.DeepSeq

18 (NFData, force)

19import Control.Exception

20 (IOException, SomeException (..), catch, evaluate, throwIO)

21+import Control.Monad

22+ (unless)

21import Control.Monad.Base

23import Control.Monad.Base

22 (MonadBase (..))

24 (MonadBase (..))

23import Control.Monad.Codensity

25import Control.Monad.Codensity

@@ -25,9 +27,13 @@ import Control.Monad.Codensity

25import Control.Monad.Error.Class

27import Control.Monad.Error.Class

26 (MonadError (..))

28 (MonadError (..))

27import Control.Monad.IO.Class

29import Control.Monad.IO.Class

28− (liftIO)

30+ (MonadIO (..))

29import Control.Monad.Reader

31import Control.Monad.Reader

32+ (MonadReader, ReaderT, ask, runReaderT)

33+import Control.Monad.Trans.Class

34+ (lift)

30import Control.Monad.Trans.Except

35import Control.Monad.Trans.Except

36+ (ExceptT, runExceptT)

31import Data.Bifunctor

37import Data.Bifunctor

32 (bimap, first)

38 (bimap, first)

33import Data.ByteString.Builder

39import Data.ByteString.Builder

servant-jsaddle/servant-jsaddle.cabal+4−4

@@ -22,7 +22,7 @@ category: Servant, Web

22build-type: Simple

23cabal-version: >=1.10

24tested-with:

25− GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5

25+ GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1

26 , GHCJS ==8.4

28homepage: http://haskell-servant.readthedocs.org/

@@ -46,7 +46,7 @@ library

46 -- Bundled with GHC: Lower bound to not force re-installs

47 -- text and mtl are bundled starting with GHC-8.4

48 build-depends:

49− base >=4.9 && <4.13

49+ base >=4.9 && <4.14

50 , bytestring >=0.10.8.1 && <0.11

51 , containers >=0.5.7.1 && <0.7

52 , mtl >=2.2.2 && <2.3

@@ -60,10 +60,10 @@ library

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

61 build-depends: servant-client-core >=0.16 && <0.16.1

62 build-depends:

63− base-compat >=0.10.5 && <0.11

63+ base-compat >=0.10.5 && <0.12

64 , case-insensitive >=1.2.0.0 && <1.3

65 , exceptions >=0.10.0 && <0.11

66− , ghcjs-dom

66+ , ghcjs-dom >=0.9.4.0 && <0.10

67 , http-media >=0.7.1.3 && <0.9

68 , http-types >=0.12.2 && <0.13

69 , jsaddle >=0.9.6.0 && <0.10