Switch to http-conduit from http-enumerator.

Author: mike-burns

Github/Data/Definitions.hs

@@ -4,10 +4,10 @@ module Github.Data.Definitions where
 
 import Data.Time
 import Data.Data
-import Network.HTTP.Enumerator (HttpException(..))
+import Network.HTTP.Conduit (HttpException(..))
 import qualified Control.Exception as E
 
-deriving instance Eq Network.HTTP.Enumerator.HttpException
+deriving instance Eq Network.HTTP.Conduit.HttpException
 
 -- | Errors have been tagged according to their source, so you can more easily
 -- dispatch and handle them.

Github/Private.hs

@@ -9,7 +9,7 @@ import Data.List
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy.Char8 as LBS
 import qualified Network.HTTP.Types as Types
-import Network.HTTP.Enumerator
+import Network.HTTP.Conduit
 import Text.URI
 import Control.Failure hiding (Error(..))
 import qualified Control.Exception as E
@@ -38,12 +38,12 @@ githubAPI method url body = do
  result
  where encodedBody = RequestBodyLBS $ encode $ toJSON body
 
-doHttps :: BS.ByteString -> String -> Maybe (RequestBody IO) -> IO (Either E.IOException Response)
+doHttps :: BS.ByteString -> String -> Maybe (RequestBody IO) -> IO (Either E.IOException (Response LBS.ByteString))
 doHttps method url body = do
  let (Just uri) = parseURI url
  (Just host) = uriRegName uri
  requestBody = fromMaybe (RequestBodyBS $ BS.pack "") body
- queryString = Types.parseQuery $ BS.pack $ fromMaybe "" $ uriQuery uri
+ queryString = BS.pack $ fromMaybe "" $ uriQuery uri
  request = def { method = method
  , secure = True
  , host = BS.pack host

Github/Repos/Collaborators.hs

@@ -10,7 +10,8 @@ import Github.Data
 import Github.Private
 
 import Data.ByteString.Char8 (pack)
-import Network.HTTP.Enumerator (statusCode)
+import qualified Network.HTTP.Conduit as C (statusCode)
+import qualified Network.HTTP.Types as T (statusCode)
 
 -- | All the users who have collaborated on a repo.
 --
@@ -30,5 +31,5 @@ isCollaboratorOn userName repoOwnerName repoName = do
  (buildUrl ["repos", repoOwnerName, repoName, "collaborators", userName])
  Nothing
  return $ either (Left . HTTPConnectionError)
- (Right . (204 ==) . statusCode)
+ (Right . (204 ==) . T.statusCode . C.statusCode)
  result

github.cabal

@@ -152,7 +152,7 @@ Library
  old-locale,
  HTTP,
  network,
- http-enumerator == 0.7.2.1,
+ http-conduit == 1.1.0.1,
  uri,
  failure,
  http-types,