Compare commits

...

4 Commits

Author SHA1 Message Date
parsonsmatt
be49dc9cbc no CPP? 2018-05-23 15:36:43 -06:00
parsonsmatt
962acbb845 Use CPP 2018-05-23 15:32:35 -06:00
parsonsmatt
5a1c4ca7c3 try with older base-compat 2018-05-23 14:44:55 -06:00
parsonsmatt
0633888d52 Remove base-compat-batteries dependency 2018-05-23 14:29:32 -06:00
5 changed files with 10 additions and 6 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ samples/
test-servers/ test-servers/
/doc/ /doc/
.stack-work/ .stack-work/
dist-newstyle/

View File

@ -37,7 +37,7 @@ library
, Servant.QuickCheck.Internal.Equality , Servant.QuickCheck.Internal.Equality
, Servant.QuickCheck.Internal.ErrorTypes , Servant.QuickCheck.Internal.ErrorTypes
build-depends: base >=4.8 && <4.12 build-depends: base >=4.8 && <4.12
, base-compat-batteries >= 0.10.1 && <0.11 , base-compat >= 0.9.3 && <0.11
, aeson > 0.8 && < 2 , aeson > 0.8 && < 2
, bytestring == 0.10.* , bytestring == 0.10.*
, case-insensitive == 1.2.* , case-insensitive == 1.2.*
@ -93,7 +93,7 @@ test-suite spec
other-modules: Servant.QuickCheck.InternalSpec other-modules: Servant.QuickCheck.InternalSpec
build-tool-depends: hspec-discover:hspec-discover build-tool-depends: hspec-discover:hspec-discover
build-depends: base build-depends: base
, base-compat-batteries , base-compat
, aeson , aeson
, servant-quickcheck , servant-quickcheck
, bytestring , bytestring
@ -106,7 +106,7 @@ test-suite spec
, servant-client , servant-client
, servant , servant
, servant-blaze , servant-blaze
, transformers -- , transformers
, QuickCheck , QuickCheck
, quickcheck-io , quickcheck-io
default-extensions: TypeOperators default-extensions: TypeOperators

View File

@ -15,6 +15,8 @@ import Servant.API.ContentTypes (AllMimeRender (..))
import Servant.Client (BaseUrl (..), Scheme (..)) import Servant.Client (BaseUrl (..), Scheme (..))
import Test.QuickCheck (Arbitrary (..), Gen, elements, frequency) import Test.QuickCheck (Arbitrary (..), Gen, elements, frequency)
import Data.Monoid ((<>))
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import qualified Data.ByteString.Internal as BS (c2w) import qualified Data.ByteString.Internal as BS (c2w)

View File

@ -19,6 +19,8 @@ import Test.QuickCheck.Monadic (assert, forAllM, monadicIO, monitor,
run) run)
import Test.QuickCheck.Property (counterexample) import Test.QuickCheck.Property (counterexample)
import Data.Monoid ((<>))
import Servant.QuickCheck.Internal.Equality import Servant.QuickCheck.Internal.Equality
import Servant.QuickCheck.Internal.ErrorTypes import Servant.QuickCheck.Internal.ErrorTypes
import Servant.QuickCheck.Internal.HasGenRequest import Servant.QuickCheck.Internal.HasGenRequest

View File

@ -2,13 +2,12 @@ resolver: lts-11.8
packages: packages:
- '.' - '.'
extra-deps: extra-deps:
- base-compat-batteries-0.10.1 # - base-compat-0.10.1
- base-compat-0.10.1
- hspec-discover-2.5.0 - hspec-discover-2.5.0
- hspec-core-2.5.0 - hspec-core-2.5.0
- hspec-2.5.0 - hspec-2.5.0
# aeson pre-1.3.1.0 has an upper bound on `base-compat-batteries` that preclude # aeson pre-1.3.1.0 has an upper bound on `base-compat-batteries` that preclude
# the 0.10.1 that we depend on # the 0.10.1 that we depend on
- aeson-1.3.1.0 # - aeson-1.3.1.0
flags: {} flags: {}
extra-package-dbs: [] extra-package-dbs: []