Merge pull request #555 from bos/qc-210

Allow QuickCheck 2.10.*

Author: bergmark

aeson.cabal

@@ -199,7 +199,7 @@ test-suite tests
 
   build-depends:
     HUnit,
-    QuickCheck >= 2.8 && <2.9.3,
+    QuickCheck >= 2.8 && <2.11,
     aeson,
     integer-logarithms >= 1 && <1.1,
     attoparsec,

tests/Instances.hs

@@ -14,8 +14,6 @@ import Control.Applicative (empty)
 import Control.Monad
 import Data.Aeson.Types
 import Data.Function (on)
-import Data.Functor.Compose (Compose (..))
-import Data.Proxy (Proxy(..))
 import Data.Time (ZonedTime(..), TimeZone(..))
 import Data.Time.Clock (UTCTime(..))
 import Functions
@@ -32,6 +30,11 @@ 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)
@@ -188,14 +191,16 @@ 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 a => Arbitrary (DList.DList a) where
-    arbitrary = DList.fromList <$> arbitrary
-
 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