343f55f · servant-quickcheck

git.iko.soy/servant-quickcheck

Removing GHC 7.8 support.

It never really existed.

commit343f55f61a98900410b2e97cc7cea6dee25b5eb7 authorJulian K. Arni <jkarni@gmail.com> dateSun 28 Aug 2016, 20:50 (10 years ago) parent86d9923

4 files changed+19−22

compare with master

unifiedsplit

.travis.yml−2 servant-quickcheck.cabal+15−17 src/Servant/QuickCheck/Internal/ErrorTypes.hs+3−2 src/Servant/QuickCheck/Internal/Predicates.hs+1−1

.travis.yml−2

@@ -3,7 +3,6 @@ sudo: false

33language: c

55env:

6− - GHCVER=7.8.4

76 - GHCVER=7.10.2

98addons:

@@ -11,7 +10,6 @@ addons:

1110 sources:

1211 - hvr-ghc

1312 packages:

14− - ghc-7.8.4

1513 - ghc-7.10.2

1614 - cabal-install-1.22

1715 - libgmp-dev

servant-quickcheck.cabal+15−17

@@ -27,30 +27,28 @@ library

2727 , Servant.QuickCheck.Internal.QuickCheck

2828 , Servant.QuickCheck.Internal.Equality

2929 , Servant.QuickCheck.Internal.ErrorTypes

30− build-depends: base >=4.7 && <4.9

30+ build-depends: base >=4.8 && <4.9

3131 , base-compat == 0.9.*

32− , QuickCheck == 2.8.*

32+ , aeson > 0.8 && < 0.12

3333 , bytestring == 0.10.*

34− , aeson > 0.10 && < 0.12

35− , mtl == 2.2.*

34+ , case-insensitive == 1.2.*

35+ , data-default-class == 0.0.*

36+ , hspec == 2.2.*

3637 , http-client == 0.4.*

37− , http-types == 0.9.*

3838 , http-media == 0.6.*

39+ , http-types > 0.8 && < 0.10

40+ , mtl > 2.1 && < 2.3

41+ , pretty == 1.1.*

42+ , process == 1.2.*

43+ , QuickCheck > 2.7 && < 2.9

44+ , servant > 0.6 && < 0.9

3945 , servant-client > 0.6 && < 0.9

4046 , servant-server > 0.6 && < 0.9

41− , string-conversions == 0.4.*

42− , data-default-class == 0.0.*

43− , servant > 0.6 && < 0.9

44− , warp >= 3.2.4 && < 3.3

45− , process == 1.2.*

46− , temporary == 1.2.*

4747 , split == 0.2.*

48− , case-insensitive == 1.2.*

49− , hspec == 2.2.*

48+ , string-conversions > 0.3 && < 0.5

49+ , temporary == 1.2.*

5050 , text == 1.*

51− , pretty == 1.1.*

52− if impl(ghc < 7.10)

53− build-depends: bifunctors == 5.*

51+ , warp >= 3.2.4 && < 3.3

5452

5553 hs-source-dirs: src

5654 default-extensions: TypeOperators

@@ -68,7 +66,7 @@ library

6866 , OverloadedStrings

6967 , FunctionalDependencies

7068 , NoImplicitPrelude

71− , AutoDeriveTypeable

69+ , DeriveDataTypeable

7270 default-language: Haskell2010

7371

7472test-suite spec

src/Servant/QuickCheck/Internal/ErrorTypes.hs+3−2

@@ -4,6 +4,7 @@ import Control.Exception (Exception (..))

44import qualified Data.ByteString.Lazy as LBS

55import Data.String.Conversions (cs)

66import qualified Data.Text as T

7+import Data.Typeable (Typeable)

78import GHC.Generics (Generic)

89import qualified Network.HTTP.Client as C

910import Network.HTTP.Types (Header, statusCode)

@@ -12,7 +13,7 @@ import Text.PrettyPrint

1213

1314data PredicateFailure

1415 = PredicateFailure T.Text (Maybe C.Request) (C.Response LBS.ByteString)

15− deriving (Generic)

16+ deriving (Typeable, Generic)

1617

1718instance Exception ServerEqualityFailure where

1819

@@ -22,7 +23,7 @@ instance Show PredicateFailure where

2223

2324data ServerEqualityFailure

2425 = ServerEqualityFailure C.Request (C.Response LBS.ByteString) (C.Response LBS.ByteString)

25− deriving (Generic)

26+ deriving (Typeable, Generic)

2627

2728instance Show ServerEqualityFailure where

2829 show = render . prettyServerEqualityFailure

src/Servant/QuickCheck/Internal/Predicates.hs+1−1

@@ -1,7 +1,7 @@

11module Servant.QuickCheck.Internal.Predicates where

33import Control.Exception (catch, throw)

4−import Control.Monad.Reader

4+import Control.Monad (when, unless, liftM2)

55import Data.Aeson (Object, decode)

66import qualified Data.ByteString as SBS

77import qualified Data.ByteString.Char8 as SBSC