develop..1653ee9 · gogol

on 1653ee9 help sign in

3 files changed+6−3

unifiedsplit

core/gogol-core.cabal+1−1

@@ -61,7 +61,7 @@ library

6161 , lens >= 4.4

6262 , resourcet >= 1.1

6363 , scientific >= 0.3

64− , servant >= 0.14.1

64+ , servant >= 0.4.4

6565 , text >= 1.1

6666 , unordered-containers >= 0.2.5

6767

core/src/Network/Google/Prelude.hs+1−1

@@ -28,7 +28,7 @@ import Network.HTTP.Client as Export (RequestBody)

2828import Numeric.Natural as Export (Natural)

2929import Prelude as Export hiding (product, span, any, Word)

3030import Servant.API as Export hiding (Headers, Link, getResponse, Stream, ResponseHeader, Header, header)

31−import Servant.Links as Export hiding (Link)

31+import Servant.Utils.Links as Export hiding (Link)

3232import Web.HttpApiData as Export (FromHttpApiData (..), ToHttpApiData (..))

3333

3434import Network.Google.Data.Bytes as Export

gogol/src/Network/Google/Internal/HTTP.hs+4−1

@@ -20,7 +20,8 @@ import Control.Monad.Catch

2020import Control.Monad.IO.Class (MonadIO)

2121import Control.Monad.Trans.Resource (MonadResource (..))

2222

23−import Data.Monoid (Dual (..), Endo (..), (<>))

23+import Data.Conduit (($$+-))

24+import Data.Monoid (Dual (..), Endo (..), (<>))

2425

2526import GHC.Exts (toList)

2627

@@ -33,6 +34,8 @@ import Network.HTTP.Conduit

3334import Network.HTTP.Media (RenderHeader (..))

3435import Network.HTTP.Types

3536

37+import qualified Data.ByteString.Lazy as LBS

38+import qualified Data.Conduit.List as Conduit

3639import qualified Data.Text.Encoding as Text

3740import qualified Data.Text.Lazy as LText

3841import qualified Data.Text.Lazy.Builder as Build