6537409 · servant-quickcheck

git.iko.soy/servant-quickcheck

support ghc 8

commit653740996829bd58d3bf98b74c69a370d1c91ffb authorJulian K. Arni <jkarni@gmail.com> dateWed 14 Sep 2016, 09:37 (10 years ago) parent84ebc6e

5 files changed+21−50

compare with master

unifiedsplit

.travis.yml+6−13 servant-quickcheck.cabal+4−4 src/Servant/QuickCheck/Internal/Predicates.hs+2−2 stack-ghc-8.0.1.yaml+7 stack.yaml+2−31

.travis.yml+6−13

@@ -2,18 +2,12 @@ sudo: false

33language: c

5−env:

6− - GHCVER=7.10.2

7−

8−addons:

9− apt:

10− sources:

11− - hvr-ghc

12− packages:

13− - ghc-7.10.2

14− - cabal-install-1.22

15− - libgmp-dev

16− - wrk

5+matrix:

6+ include:

7+ - env: CABALVER=1.22 GHCVER=7.10.1

8+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1],sources: [hvr-ghc]}}

9+ - env: CABALVER=1.24 GHCVER=8.0.1

10+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}

1711

1812install:

1913 - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)

@@ -25,7 +19,6 @@ install:

2519

2620script:

2721 - tinc && cabal configure --enable-tests && cabal build && cabal test

28− #- (cd doc && tinc cabal configure --enable-tests && cabal build && cabal test)

2922

3023cache:

3124 directories:

servant-quickcheck.cabal+4−4

@@ -27,19 +27,19 @@ library

2727 , Servant.QuickCheck.Internal.QuickCheck

2828 , Servant.QuickCheck.Internal.Equality

2929 , Servant.QuickCheck.Internal.ErrorTypes

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

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

3131 , base-compat == 0.9.*

3232 , aeson > 0.8 && < 0.12

3333 , bytestring == 0.10.*

3434 , case-insensitive == 1.2.*

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

35+ , data-default-class >= 0.0 && < 0.2

3636 , hspec == 2.2.*

37− , http-client == 0.4.*

37+ , http-client >= 0.4.30 && < 0.5

3838 , http-media == 0.6.*

3939 , http-types > 0.8 && < 0.10

4040 , mtl > 2.1 && < 2.3

4141 , pretty == 1.1.*

42− , process == 1.2.*

42+ , process >= 1.2 && < 1.5

4343 , QuickCheck > 2.7 && < 2.9

4444 , servant > 0.6 && < 0.9

4545 , servant-client > 0.6 && < 0.9

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

@@ -14,7 +14,7 @@ import Data.Monoid ((<>))

1414import GHC.Generics (Generic)

1515import Network.HTTP.Client (Manager, Request, Response, httpLbs,

1616 method, requestHeaders, responseBody,

17− responseHeaders, parseUrl, responseStatus)

17+ responseHeaders, parseRequest, responseStatus)

1818import Network.HTTP.Media (matchAccept)

1919import Network.HTTP.Types (methodGet, methodHead, parseMethod,

2020 renderStdMethod, status100, status200,

@@ -92,7 +92,7 @@ createContainsValidLocation

9292 if responseStatus resp == status201

9393 then case lookup "Location" $ responseHeaders resp of

9494 Nothing -> fail n

95− Just l -> case parseUrl $ SBSC.unpack l of

95+ Just l -> case parseRequest $ SBSC.unpack l of

9696 Nothing -> fail n

9797 Just x -> do

9898 resp2 <- httpLbs x mgr

stack-ghc-8.0.1.yamlnew file+7

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

1+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)

2+resolver: nightly-2016-09-07

3+packages:

4+- '.'

5+extra-deps: []

6+flags: {}

7+extra-package-dbs: []

stack.yaml+2−31

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

11# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)

2−resolver: nightly-2016-04-20

3−

4−# Local packages, usually specified by relative directory name

2+resolver: lts-6.17

53packages:

64- '.'

7−

8−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)

9−extra-deps:

10−- servant-0.8

11−- servant-client-0.8

12−- servant-server-0.8

13−

14−# Override default flag values for local packages and extra-deps

5+extra-deps: []

156flags: {}

16−

17−# Extra package databases containing global packages

187extra-package-dbs: []

19−

20−# Control whether we use the GHC we find on the path

21−# system-ghc: true

22−

23−# Require a specific version of stack, using version ranges

24−# require-stack-version: -any # Default

25−# require-stack-version: >= 1.0.0

26−

27−# Override the architecture used by stack, especially useful on Windows

28−# arch: i386

29−# arch: x86_64

30−

31−# Extra directories used by stack for building

32−# extra-include-dirs: [/path/to/dir]

33−# extra-lib-dirs: [/path/to/dir]

34−

35−# Allow a newer minor version of GHC than the snapshot specifies

36−# compiler-check: newer-minor