From b0febe7c58e37ab36238e99cfc734ee4eab19d29 Mon Sep 17 00:00:00 2001 From: Alfredo Di Napoli Date: Wed, 18 Oct 2017 14:36:45 +0200 Subject: [PATCH 1/2] Tentatively support Servant 0.11 --- servant-quickcheck.cabal | 6 +++--- src/Servant/QuickCheck/Internal/HasGenRequest.hs | 4 ++++ stack-lts-9.yaml | 6 ++++++ test/Servant/QuickCheck/InternalSpec.hs | 1 - 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 stack-lts-9.yaml diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal index 41fbd33..945d2f9 100644 --- a/servant-quickcheck.cabal +++ b/servant-quickcheck.cabal @@ -46,9 +46,9 @@ library , pretty == 1.1.* , process >= 1.2 && < 1.5 , QuickCheck > 2.7 && < 2.11 - , servant > 0.6 && < 0.10 - , servant-client > 0.6 && < 0.10 - , servant-server > 0.6 && < 0.10 + , servant > 0.6 && < 0.12 + , servant-client > 0.6 && < 0.12 + , servant-server > 0.6 && < 0.12 , split == 0.2.* , string-conversions > 0.3 && < 0.5 , temporary == 1.2.* diff --git a/src/Servant/QuickCheck/Internal/HasGenRequest.hs b/src/Servant/QuickCheck/Internal/HasGenRequest.hs index 192a694..3da08a2 100644 --- a/src/Servant/QuickCheck/Internal/HasGenRequest.hs +++ b/src/Servant/QuickCheck/Internal/HasGenRequest.hs @@ -64,6 +64,10 @@ instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where (oldf, old) = genRequest (Proxy :: Proxy b) new = cs $ symbolVal (Proxy :: Proxy path) +#if MIN_VERSION_servant(0,11,0) +instance HasGenRequest EmptyAPI where + genRequest _ = (0, error "EmptyAPIs cannot be queried.") +#endif instance (Arbitrary c, HasGenRequest b, ToHttpApiData c ) => HasGenRequest (Capture x c :> b) where diff --git a/stack-lts-9.yaml b/stack-lts-9.yaml new file mode 100644 index 0000000..7e860d7 --- /dev/null +++ b/stack-lts-9.yaml @@ -0,0 +1,6 @@ +resolver: lts-9.1 +packages: +- '.' +extra-deps: [] +flags: {} +extra-package-dbs: [] diff --git a/test/Servant/QuickCheck/InternalSpec.hs b/test/Servant/QuickCheck/InternalSpec.hs index 9892f41..8c2197b 100644 --- a/test/Servant/QuickCheck/InternalSpec.hs +++ b/test/Servant/QuickCheck/InternalSpec.hs @@ -38,7 +38,6 @@ import Servant.QuickCheck import Servant.QuickCheck.Internal (genRequest, runGenRequest, serverDoesntSatisfy) - spec :: Spec spec = do serversEqualSpec From 199f6cc51e6363f5049106f3592fb6c52c0b6df6 Mon Sep 17 00:00:00 2001 From: Alfredo Di Napoli Date: Thu, 19 Oct 2017 09:20:49 +0200 Subject: [PATCH 2/2] Code review changes --- .travis.yml | 1 + CHANGELOG.yaml | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3374614..6036471 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ env: - STACK_YAML=stack.yaml - STACK_YAML=stack-lts-7.yaml - STACK_YAML=stack-lts-6.yaml + - STACK_YAML=stack-lts-9.yaml addons: diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml index 53d0648..26881b7 100644 --- a/CHANGELOG.yaml +++ b/CHANGELOG.yaml @@ -2,6 +2,15 @@ upcoming: releases: + - version: "0.0.3.1" + changes: + + - description: Support for Servant 0.11 + issue: none + pr: 32 + authors: adinapoli-iohk + date: 2017-10-18 + - version: "0.0.3.0" changes: