Merge pull request #1024 from haskell/bump-lower-bounds-b

Bump lower bounds b

Author: phadej

aeson.cabal

@@ -129,18 +129,18 @@ library
   build-depends:
       attoparsec            >=0.14.2   && <0.15
     , data-fix              >=0.3.2    && <0.4
-    , dlist                 >=0.8.0.4  && <1.1
+    , dlist                 >=1.0      && <1.1
     , hashable              >=1.3.5.0  && <1.5
     , indexed-traversable   >=0.1.2    && <0.2
-    , OneTuple              >=0.3.1    && <0.5
+    , OneTuple              >=0.4.1.1  && <0.5
     , primitive             >=0.7.3.0  && <0.9
     , QuickCheck            >=2.14.2   && <2.15
     , scientific            >=0.3.7.0  && <0.4
     , semialign             >=1.2      && <1.4
     , strict                >=0.4      && <0.6
     , tagged                >=0.8.6    && <0.9
     , text-short            >=0.1.5    && <0.2
-    , th-abstraction        >=0.3.0.0  && <0.6
+    , th-abstraction        >=0.5.0.0  && <0.6
     , these                 >=1.1.1.1  && <1.3
     , unordered-containers  >=0.2.10.0 && <0.3
     , uuid-types            >=1.0.5    && <1.1

src/Data/Aeson/TH.hs

@@ -138,7 +138,7 @@ import Data.Maybe (catMaybes, fromMaybe, mapMaybe)
 import qualified Data.Monoid as Monoid
 import Data.Set (Set)
 import Language.Haskell.TH hiding (Arity)
-import Language.Haskell.TH.Datatype as Datatype
+import Language.Haskell.TH.Datatype
 #if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))
 import Language.Haskell.TH.Syntax (mkNameG_tc)
 #endif
@@ -1257,11 +1257,7 @@ deriveJSONClass consFuns jc opts name = do
   case info of
     DatatypeInfo { datatypeContext   = ctxt
                  , datatypeName      = parentName
-#if MIN_VERSION_th_abstraction(0,3,0)
                  , datatypeInstTypes = instTys
-#else
-                 , datatypeVars      = instTys
-#endif
                  , datatypeVariant   = variant
                  , datatypeCons      = cons
                  } -> do
@@ -1293,11 +1289,7 @@ mkFunCommon consFun jc opts name = do
   case info of
     DatatypeInfo { datatypeContext   = ctxt
                  , datatypeName      = parentName
-#if MIN_VERSION_th_abstraction(0,3,0)
                  , datatypeInstTypes = instTys
-#else
-                 , datatypeVars      = instTys
-#endif
                  , datatypeVariant   = variant
                  , datatypeCons      = cons
                  } -> do
@@ -1456,9 +1448,7 @@ buildTypeInstance tyConName jc dataCxt varTysOrig variant = do
                          Newtype         -> False
                          DataInstance    -> True
                          NewtypeInstance -> True
-#if MIN_VERSION_th_abstraction(0,5,0)
-                         Datatype.TypeData -> False
-#endif
+                         Language.Haskell.TH.Datatype.TypeData -> False
 
         remainingTysOrigSubst' :: [Type]
         -- See Note [Kind signatures in derived instances] for an explanation

src/Data/Aeson/Types/FromJSON.hs

@@ -130,9 +130,7 @@ import qualified Data.Aeson.KeyMap as KM
 import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
 import qualified Data.ByteString.Lazy as L
 import qualified Data.DList as DList
-#if MIN_VERSION_dlist(1,0,0)
 import qualified Data.DList.DNonEmpty as DNE
-#endif
 import qualified Data.Fix as F
 import qualified Data.HashMap.Strict as H
 import qualified Data.HashSet as HashSet
@@ -1783,7 +1781,6 @@ instance FromJSON1 DList.DList where
 instance (FromJSON a) => FromJSON (DList.DList a) where
     parseJSON = parseJSON1
 
-#if MIN_VERSION_dlist(1,0,0)
 -- | @since 1.5.3.0
 instance FromJSON1 DNE.DNonEmpty where
     liftParseJSON p _ = withArray "DNonEmpty" $
@@ -1795,7 +1792,6 @@ instance FromJSON1 DNE.DNonEmpty where
 -- | @since 1.5.3.0
 instance (FromJSON a) => FromJSON (DNE.DNonEmpty a) where
     parseJSON = parseJSON1
-#endif
 
 -------------------------------------------------------------------------------
 -- OneTuple

src/Data/Aeson/Types/ToJSON.hs

@@ -112,9 +112,7 @@ import qualified Data.Aeson.Encoding as E
 import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding, key)
 import qualified Data.ByteString.Lazy as L
 import qualified Data.DList as DList
-#if MIN_VERSION_dlist(1,0,0)
 import qualified Data.DList.DNonEmpty as DNE
-#endif
 import qualified Data.Fix as F
 import qualified Data.HashMap.Strict as H
 import qualified Data.HashSet as HashSet
@@ -1553,7 +1551,6 @@ instance (ToJSON a) => ToJSON (DList.DList a) where
     toJSON = toJSON1
     toEncoding = toEncoding1
 
-#if MIN_VERSION_dlist(1,0,0)
 -- | @since 1.5.3.0
 instance ToJSON1 DNE.DNonEmpty where
     liftToJSON t _ = listValue t . DNE.toList
@@ -1563,7 +1560,6 @@ instance ToJSON1 DNE.DNonEmpty where
 instance (ToJSON a) => ToJSON (DNE.DNonEmpty a) where
     toJSON = toJSON1
     toEncoding = toEncoding1
-#endif
 
 -------------------------------------------------------------------------------
 -- OneTuple