Merge pull request #630 from phadej/base-compat-0.10

Allow base-compat-0.10.0

Author: bergmark

Data/Aeson/Encoding/Builder.hs

@@ -44,7 +44,7 @@ import Data.ByteString.Builder as B
 import Data.ByteString.Builder.Prim as BP
 import Data.ByteString.Builder.Scientific (scientificBuilder)
 import Data.Char (chr, ord)
-import Data.Monoid ((<>))
+import Data.Semigroup ((<>))
 import Data.Scientific (Scientific, base10Exponent, coefficient)
 import Data.Text.Encoding (encodeUtf8BuilderEscaped)
 import Data.Time (UTCTime(..))

Data/Aeson/Text.hs

@@ -25,7 +25,7 @@ import Prelude.Compat
 
 import Data.Aeson.Types (Value(..), ToJSON(..))
 import Data.Aeson.Encoding (encodingToLazyByteString)
-import Data.Monoid ((<>))
+import Data.Semigroup ((<>))
 import Data.Scientific (FPFormat(..), Scientific, base10Exponent)
 import Data.Text.Lazy.Builder
 import Data.Text.Lazy.Builder.Scientific (formatScientificBuilder)

Data/Aeson/Types/FromJSON.hs

@@ -97,7 +97,7 @@ import Data.Hashable (Hashable(..))
 import Data.Int (Int16, Int32, Int64, Int8)
 import Data.List.NonEmpty (NonEmpty(..))
 import Data.Maybe (fromMaybe)
-import Data.Monoid ((<>))
+import Data.Semigroup ((<>))
 import Data.Proxy (Proxy(..))
 import Data.Ratio ((%), Ratio)
 import Data.Scientific (Scientific)

Data/Aeson/Types/ToJSON.hs

@@ -80,7 +80,7 @@ import Data.Functor.Sum (Sum(..))
 import Data.Int (Int16, Int32, Int64, Int8)
 import Data.List (intersperse)
 import Data.List.NonEmpty (NonEmpty(..))
-import Data.Monoid ((<>))
+import Data.Semigroup ((<>))
 import Data.Proxy (Proxy(..))
 import Data.Ratio (Ratio, denominator, numerator)
 import Data.Scientific (Scientific)
@@ -860,7 +860,7 @@ instance ( IsRecord                      a isRecord
          ) => TaggedObject enc arity (C1 c a)
   where
     taggedObject opts targs tagFieldName contentsFieldName =
-      fromPairs . (tag <>) . contents
+      fromPairs . mappend tag . contents
       where
         tag = tagFieldName `pair`
           (fromString (constructorTagModifier opts (conName (undefined :: t c a p)))
@@ -1003,7 +1003,7 @@ instance ( Monoid pairs
          ) => RecordToPairs enc pairs arity (a :*: b)
   where
     recordToPairs opts (targs :: ToArgs enc arity p) (a :*: b) =
-        pairsOf a <> pairsOf b
+        pairsOf a `mappend` pairsOf b
       where
         pairsOf :: (RecordToPairs enc pairs arity f) => f p -> pairs
         pairsOf = recordToPairs opts targs

aeson.cabal

@@ -102,7 +102,7 @@ library
   build-depends:
     attoparsec >= 0.13.0.1,
     base >= 4.5 && < 5,
-    base-compat >= 0.9.1 && < 0.10,
+    base-compat >= 0.9.1 && < 0.11,
     containers >= 0.4.2,
     deepseq >= 1.3 && < 1.5,
     dlist >= 0.6,

attoparsec-iso8601/attoparsec-iso8601.cabal

@@ -37,7 +37,7 @@ library
   build-depends:
     attoparsec >= 0.13.0.1,
     base >= 4.5 && < 5,
-    base-compat >= 0.9.1 && < 0.10,
+    base-compat >= 0.9.1 && < 0.11,
     text >= 1.1.1.0,
     time >= 1.1.1.4
 

benchmarks/aeson-benchmarks.cabal

@@ -30,7 +30,7 @@ library
     build-depends:
       attoparsec >= 0.13.0.1,
       base == 4.*,
-      base-compat >= 0.9.1 && <0.10,
+      base-compat >= 0.9.1 && <0.11,
       time-locale-compat >=0.1.1 && <0.2,
       containers,
       deepseq,