http-client >= 0.5

Author: phadej

hackage-security-http-client/hackage-security-http-client.cabal

@@ -20,7 +20,7 @@ library
   build-depends:       base               >= 4.4,
                        bytestring         >= 0.9,
                        data-default-class >= 0.0,
-                       http-client        >= 0.4 && < 0.6,
+                       http-client        >= 0.5 && < 0.6,
                        http-types         >= 0.8,
                        hackage-security   >= 0.5 && < 0.6
   hs-source-dirs:      src

hackage-security-http-client/src/Hackage/Security/Client/Repository/HttpLib/HttpClient.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Hackage.Security.Client.Repository.HttpLib.HttpClient (
     withClient
@@ -17,10 +16,6 @@ import qualified Network.HTTP.Client          as HttpClient
 import qualified Network.HTTP.Client.Internal as HttpClient
 import qualified Network.HTTP.Types           as HttpClient
 
-#if !MIN_VERSION_http_client(0,4,30)
-import Data.Default.Class (def)
-#endif
-
 import Hackage.Security.Client hiding (Header)
 import Hackage.Security.Client.Repository.HttpLib
 import Hackage.Security.Util.Checked
@@ -60,11 +55,7 @@ get :: Throws SomeRemoteError
 get manager reqHeaders uri callback = wrapCustomEx $ do
     -- TODO: setUri fails under certain circumstances; in particular, when
     -- the URI contains URL auth. Not sure if this is a concern.
-#if MIN_VERSION_http_client(0,4,30)
     request' <- HttpClient.setUri HttpClient.defaultRequest uri
-#else
-    request' <- HttpClient.setUri def uri
-#endif
     let request = setRequestHeaders reqHeaders
                 $ request'
     checkHttpException $ HttpClient.withResponse request manager $ \response -> do
@@ -77,11 +68,7 @@ getRange :: Throws SomeRemoteError
          -> (HttpStatus -> [HttpResponseHeader] -> BodyReader -> IO a)
          -> IO a
 getRange manager reqHeaders uri (from, to) callback = wrapCustomEx $ do
-#if MIN_VERSION_http_client(0,4,30)
     request' <- HttpClient.setUri HttpClient.defaultRequest uri
-#else
-    request' <- HttpClient.setUri def uri
-#endif
     let request = setRange from to
                 $ setRequestHeaders reqHeaders
                 $ request'
@@ -94,17 +81,10 @@ getRange manager reqHeaders uri (from, to) callback = wrapCustomEx $ do
            callback HttpStatus200OK (getResponseHeaders response) br
          _otherwise ->
            throwChecked $
-#if MIN_VERSION_http_client(0,5,0)
              HttpClient.HttpExceptionRequest request' $
                HttpClient.StatusCodeException
                  (void response)
                  BS.empty
-#else
-             HttpClient.StatusCodeException
-               (HttpClient.responseStatus    response)
-               (HttpClient.responseHeaders   response)
-               (HttpClient.responseCookieJar response)
-#endif
 
 -- | Wrap custom exceptions
 --