git.iko.soy/typeable/servant
on master help sign in
Fix servant-client with base-compat-0.11
commit589c65fb992286b180b6a408c91628a136056d97 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 15 Sep 2019, 14:50 (7 years ago) parent9c69111
7 files changed+35−7
compare with master
unifiedsplit
cabal.haskell-ci+5−1 cabal.project+5 servant-client/CHANGELOG.md+5 servant-client/servant-client.cabal+1−2 servant-client/src/Servant/Client/Internal/HttpClient.hs+7−3 servant-http-streams/CHANGELOG.md+5 servant-http-streams/src/Servant/HttpStreams/Internal.hs+7−1
cabal.haskell-ci+5−1
@@ -21,4 +21,8 @@ constraint-set http-media-0.8
2121constraint-set http-media-0.7
2222 constraints: http-media ==0.7.*
2323
24−head-hackage: >= 8.8
24+constraint-set base-compat-0.10
25+ constraints: base-compat ==0.10.*
26+
27+constraint-set base-compat-0.11
28+ constraints: base-compat ==0.11.*
cabal.project+5
@@ -46,6 +46,7 @@ allow-newer:
4646
4747allow-newer:
4848 servant-js:base,
49+ servant-js:base-compat,
4950 servant-js:lens
5051
5152allow-newer:
@@ -57,6 +58,7 @@ allow-newer:
5758-- servant-quickcheck
5859allow-newer:
5960 servant-quickcheck:base,
61+ servant-quickcheck:base-compat,
6062 servant-quickcheck:hspec,
6163 servant-quickcheck:http-client,
6264 servant-quickcheck:http-media,
@@ -67,6 +69,9 @@ allow-newer:
6769 servant-quickcheck:time,
6870 servant-quickcheck:warp
6971
72+allow-newer: aeson-pretty:base-compat
73+
74+
7075-- constraints: semigroups ^>=0.19
7176-- constraints: hashable ^>=1.3
7277-- constraints: network ^>=3.1
servant-client/CHANGELOG.md+5
@@ -1,6 +1,11 @@
11[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md)
22[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33
4+0.16.0.1
5+--------
6+
7+- Allow `base-compat-0.11`
8+
490.16
510----
611
servant-client/servant-client.cabal+1−2
@@ -1,7 +1,6 @@
11cabal-version: >=1.10
22name: servant-client
3−version: 0.16
4−x-revision: 3
3+version: 0.16.0.1
54
65synopsis: Automatic derivation of querying functions for servant
76category: Servant, Web
servant-client/src/Servant/Client/Internal/HttpClient.hs+7−3
@@ -16,10 +16,11 @@ import Prelude.Compat
1616
1717import Control.Concurrent.MVar
1818 (modifyMVar, newMVar)
19−import qualified Data.ByteString as BS
2019import Control.Concurrent.STM.TVar
2120import Control.Exception
21+ (SomeException (..), catch)
2222import Control.Monad
23+ (unless)
2324import Control.Monad.Base
2425 (MonadBase (..))
2526import Control.Monad.Catch
@@ -27,15 +28,18 @@ import Control.Monad.Catch
2728import Control.Monad.Error.Class
2829 (MonadError (..))
2930import Control.Monad.IO.Class
30− (liftIO)
31+ (MonadIO (..))
3132import Control.Monad.Reader
33+ (MonadReader, ReaderT, ask, runReaderT)
3234import Control.Monad.STM
3335 (STM, atomically)
3436import Control.Monad.Trans.Control
3537 (MonadBaseControl (..))
3638import Control.Monad.Trans.Except
39+ (ExceptT, runExceptT)
3740import Data.Bifunctor
3841 (bimap)
42+import qualified Data.ByteString as BS
3943import Data.ByteString.Builder
4044 (toLazyByteString)
4145import qualified Data.ByteString.Lazy as BSL
@@ -64,8 +68,8 @@ import Network.HTTP.Types
6468 (hContentType, renderQuery, statusCode)
6569import Servant.Client.Core
6670
67−import qualified Servant.Types.SourceT as S
6871import qualified Network.HTTP.Client as Client
72+import qualified Servant.Types.SourceT as S
6973
7074-- | The environment in which a request is run.
7175data ClientEnv
servant-http-streams/CHANGELOG.md+5
@@ -1,6 +1,11 @@
11 [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/CHANGELOG.md)
22[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33
4+0.16.0.1
5+--------
6+
7+- Allow `base-compat-0.11`
8+
490.16
510----
611
servant-http-streams/src/Servant/HttpStreams/Internal.hs+7−1
@@ -18,6 +18,8 @@ import Control.DeepSeq
1818 (NFData, force)
1919import Control.Exception
2020 (IOException, SomeException (..), catch, evaluate, throwIO)
21+import Control.Monad
22+ (unless)
2123import Control.Monad.Base
2224 (MonadBase (..))
2325import Control.Monad.Codensity
@@ -25,9 +27,13 @@ import Control.Monad.Codensity
2527import Control.Monad.Error.Class
2628 (MonadError (..))
2729import Control.Monad.IO.Class
28− (liftIO)
30+ (MonadIO (..))
2931import Control.Monad.Reader
32+ (MonadReader, ReaderT, ask, runReaderT)
33+import Control.Monad.Trans.Class
34+ (lift)
3035import Control.Monad.Trans.Except
36+ (ExceptT, runExceptT)
3137import Data.Bifunctor
3238 (bimap, first)
3339import Data.ByteString.Builder