Merge pull request #585 from bos/qc

Remove support for old QuickCheck versions

Author: bergmark

.travis.yml

@@ -25,7 +25,7 @@ matrix:
     - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml
       compiler: ": #GHC 8.0.2"
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
-    - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-pure-unescape.yaml
+    - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-ffi-unescape.yaml
       compiler: ": #GHC 8.0.2"
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
     - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2

aeson.cabal

@@ -199,7 +199,7 @@ test-suite tests
 
   build-depends:
     HUnit,
-    QuickCheck >= 2.8 && <2.11,
+    QuickCheck >= 2.10.0.1 && < 2.11,
     aeson,
     integer-logarithms >= 1 && <1.1,
     attoparsec,
@@ -226,7 +226,7 @@ test-suite tests
     unordered-containers,
     uuid-types,
     vector,
-    quickcheck-instances >=0.3.14
+    quickcheck-instances >= 0.3.16
 
   if flag(bytestring-builder)
     build-depends: bytestring >= 0.9 && < 0.10.4,

stack-ffi-unescape.yaml

@@ -0,0 +1,7 @@
+resolver: nightly-2017-09-04
+packages:
+- '.'
+flags:
+  aeson:
+    fast: true
+    cffi: true

stack-pure-unescape.yaml

@@ -22,29 +22,12 @@ import Types
 import qualified Data.DList as DList
 import qualified Data.HashMap.Strict as HM
 
-#if !MIN_VERSION_QuickCheck(2,9,0)
-import Control.Applicative (Const(..))
-import Data.Functor.Identity (Identity (..))
-import Data.List.NonEmpty (NonEmpty(..))
-import Data.Version
-import Test.QuickCheck (getNonNegative, listOf1, resize)
-#endif
-
-#if !MIN_VERSION_QuickCheck(2,10,0)
-import Data.Functor.Compose (Compose (..))
-import Data.Proxy (Proxy(..))
-#endif
-
 import Data.Orphans ()
 import Test.QuickCheck.Instances ()
 #if MIN_VERSION_base(4,7,0)
 import Data.Hashable.Time ()
 #endif
 
-#if !MIN_VERSION_base(4,8,0) && !MIN_VERSION_QuickCheck(2,8,3)
-import Numeric.Natural
-#endif
-
 {-# ANN module ("HLint: ignore Use fewer imports"::String) #-}
 
 -- "System" types.
@@ -186,37 +169,5 @@ instance (ApproxEq a) => ApproxEq [a] where
 -- a definition is given below.
 
 
-#if !MIN_VERSION_base(4,8,0) && !MIN_VERSION_QuickCheck(2,8,3)
-instance Arbitrary Natural where
-  arbitrary = fromInteger . abs <$> arbitrary
-#endif
-
-#if !MIN_VERSION_QuickCheck(2,10,0)
-instance Arbitrary (Proxy a) where
-    arbitrary = pure Proxy
-
-instance Arbitrary (f (g a)) => Arbitrary (Compose f g a) where
-    arbitrary = Compose <$> arbitrary
-#endif
-
 instance Arbitrary a => Arbitrary (DList.DList a) where
     arbitrary = DList.fromList <$> arbitrary
-
-#if !MIN_VERSION_QuickCheck(2,9,0)
-instance Arbitrary a => Arbitrary (Const a b) where
-    arbitrary = Const <$> arbitrary
-
-instance Arbitrary a => Arbitrary (NonEmpty a) where
-    arbitrary = (:|) <$> arbitrary <*> arbitrary
-
-instance Arbitrary Version where
-    arbitrary = makeVersion . fmap getNonNegative <$> resize 4 (listOf1 arbitrary)
-
-#if !MIN_VERSION_base(4,8,0)
-makeVersion :: [Int] -> Version
-makeVersion b = Version b []
-#endif
-
-instance Arbitrary a => Arbitrary (Identity a) where
-    arbitrary = Identity <$> arbitrary
-#endif