79f53ce · servant · git.iko.soy

servant-client/servant-client.cabal+2

compare with master

unifiedsplit

@@ -36,6 +36,7 @@ library

36 Servant.Common.Req

37 build-depends:

38 base >= 4.7 && < 4.10

39+ , base-compat >= 0.9.1 && < 0.10

39 , aeson >= 0.7 && < 1.1

40 , aeson >= 0.7 && < 1.1

40 , attoparsec >= 0.12 && < 0.14

41 , attoparsec >= 0.12 && < 0.14

41 , base64-bytestring >= 1.0.0.1 && < 1.1

42 , base64-bytestring >= 1.0.0.1 && < 1.1

@@ -72,6 +73,7 @@ test-suite spec

72 , Servant.Common.BaseUrlSpec

73 , Servant.Common.BaseUrlSpec

73 build-depends:

74 build-depends:

74 base == 4.*

75 base == 4.*

76+ , base-compat

75 , transformers

77 , transformers

76 , transformers-compat

78 , transformers-compat

77 , aeson

79 , aeson

servant-client/src/Servant/Client.hs+2−3

@@ -27,9 +27,6 @@ module Servant.Client

27 , module Servant.Common.BaseUrl

28 ) where

29

30−#if !MIN_VERSION_base(4,8,0)

31−import Control.Applicative ((<$>))

32−#endif

33import Data.ByteString.Lazy (ByteString)

30import Data.ByteString.Lazy (ByteString)

34import Data.List

31import Data.List

35import Data.Proxy

32import Data.Proxy

@@ -40,6 +37,8 @@ import Network.HTTP.Client (Response)

40import Network.HTTP.Media

37import Network.HTTP.Media

41import qualified Network.HTTP.Types as H

38import qualified Network.HTTP.Types as H

42import qualified Network.HTTP.Types.Header as HTTP

39import qualified Network.HTTP.Types.Header as HTTP

40+import Prelude ()

41+import Prelude.Compat

43import Servant.API

42import Servant.API

44import Servant.Client.Experimental.Auth

43import Servant.Client.Experimental.Auth

45import Servant.Common.BaseUrl

44import Servant.Common.BaseUrl

servant-client/src/Servant/Common/Req.hs+3−3

@@ -7,9 +7,9 @@

7

8module Servant.Common.Req where

9

10−#if !MIN_VERSION_base(4,8,0)

10+import Prelude ()

11−import Control.Applicative

11+import Prelude.Compat

12−#endif

12+

13import Control.Exception

14import Control.Monad

15import Control.Monad.Catch (MonadThrow)

servant-client/test/Servant/ClientSpec.hs+5−6

@@ -10,8 +10,8 @@

10{-# LANGUAGE OverloadedStrings #-}

11{-# LANGUAGE PolyKinds #-}

12{-# LANGUAGE RecordWildCards #-}

13−{-# LANGUAGE StandaloneDeriving #-}

14{-# LANGUAGE ScopedTypeVariables #-}

13{-# LANGUAGE ScopedTypeVariables #-}

14+{-# LANGUAGE StandaloneDeriving #-}

15{-# LANGUAGE TypeFamilies #-}

16{-# LANGUAGE TypeOperators #-}

17{-# LANGUAGE UndecidableInstances #-}

@@ -26,9 +26,6 @@

26#include "overlapping-compat.h"

27module Servant.ClientSpec where

28

29−#if !MIN_VERSION_base(4,8,0)

30−import Control.Applicative ((<$>))

31−#endif

32import Control.Arrow (left)

29import Control.Arrow (left)

33import Control.Concurrent (forkIO, killThread, ThreadId)

30import Control.Concurrent (forkIO, killThread, ThreadId)

34import Control.Exception (bracket)

31import Control.Exception (bracket)

@@ -46,19 +43,21 @@ import qualified Network.HTTP.Types as HTTP

46import Network.Socket

43import Network.Socket

47import Network.Wai (Request, requestHeaders, responseLBS)

44import Network.Wai (Request, requestHeaders, responseLBS)

48import Network.Wai.Handler.Warp

45import Network.Wai.Handler.Warp

46+import Prelude ()

47+import Prelude.Compat

49import System.IO.Unsafe (unsafePerformIO)

48import System.IO.Unsafe (unsafePerformIO)

49+import Test.HUnit

50import Test.Hspec

51import Test.Hspec.QuickCheck

52−import Test.HUnit

53import Test.QuickCheck

52import Test.QuickCheck

54import Web.FormUrlEncoded (FromForm, ToForm)

53import Web.FormUrlEncoded (FromForm, ToForm)

55

54

56import Servant.API

55import Servant.API

57import Servant.API.Internal.Test.ComprehensiveAPI

56import Servant.API.Internal.Test.ComprehensiveAPI

58import Servant.Client

57import Servant.Client

58+import qualified Servant.Common.Req as SCR

59import Servant.Server

60import Servant.Server.Experimental.Auth

61−import qualified Servant.Common.Req as SCR

62

61

63-- This declaration simply checks that all instances are in place.

62-- This declaration simply checks that all instances are in place.

64_ = client comprehensiveAPI

63_ = client comprehensiveAPI

servant-client/test/Servant/Common/BaseUrlSpec.hs+2−4

@@ -1,11 +1,9 @@

1−{-# LANGUAGE CPP #-}

2{-# OPTIONS_GHC -fno-warn-orphans #-}

1{-# OPTIONS_GHC -fno-warn-orphans #-}

3module Servant.Common.BaseUrlSpec where

2module Servant.Common.BaseUrlSpec where

4

3

5−#if !MIN_VERSION_base(4,8,0)

6−import Control.Applicative

7−#endif

8import Control.DeepSeq

4import Control.DeepSeq

5+import Prelude ()

6+import Prelude.Compat

9import Test.Hspec

7import Test.Hspec

10import Test.QuickCheck

8import Test.QuickCheck

11

9