Increase minimum QuickCheck version.

CHANGELOG

@@ -1,3 +1,9 @@
+git-annex (7.20181032) UNRELEASED; urgency=medium
+
+  * Increase minimum QuickCheck version.
+
+ -- Joey Hess <id@joeyh.name>  Wed, 31 Oct 2018 15:53:03 -0400
+
 git-annex (7.20181031) upstream; urgency=medium
 
   * Added v7 repository mode. v6 upgrades automatically to v7, but

Utility/QuickCheck.hs

@@ -6,7 +6,7 @@
  -}
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE TypeSynonymInstances, CPP #-}
+{-# LANGUAGE TypeSynonymInstances #-}
 
 module Utility.QuickCheck
 	( module X
@@ -16,21 +16,9 @@ module Utility.QuickCheck
 import Test.QuickCheck as X
 import Data.Time.Clock.POSIX
 import System.Posix.Types
-#if ! MIN_VERSION_QuickCheck(2,8,2)
-import qualified Data.Map as M
-import qualified Data.Set as S
-#endif
 import Control.Applicative
 import Prelude
 
-#if ! MIN_VERSION_QuickCheck(2,8,2)
-instance (Arbitrary k, Arbitrary v, Ord k) => Arbitrary (M.Map k v) where
-	arbitrary = M.fromList <$> arbitrary
-
-instance (Arbitrary v, Ord v) => Arbitrary (S.Set v) where
-	arbitrary = S.fromList <$> arbitrary
-#endif
-
 {- Times before the epoch are excluded, and no fraction is included. -}
 instance Arbitrary POSIXTime where
 	arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral

git-annex.cabal

@@ -356,7 +356,7 @@ Executable git-annex
    split,
    attoparsec,
    concurrent-output (>= 1.6),
-   QuickCheck (>= 2.1),
+   QuickCheck (>= 2.8.2),
    tasty (>= 0.7),
    tasty-hunit,
    tasty-quickcheck,