diff --git a/arbtt.cabal b/arbtt.cabal index b1072b8..95968c3 100644 --- a/arbtt.cabal +++ b/arbtt.cabal @@ -36,7 +36,8 @@ executable arbtt-capture base >= 4.7 && < 5, filepath, directory, transformers, utf8-string, strict, containers >= 0.5 && < 0.7, - aeson >= 0.10 && < 2.2, + aeson >= 0.10 && < 2.3, + attoparsec-aeson < 2.3, binary >= 0.6.4, bytestring, deepseq, time >= 1.5, tz @@ -96,7 +97,8 @@ executable arbtt-stats binary >= 0.6.4, deepseq, bytestring, utf8-string, strict, transformers, directory, filepath, - aeson >= 0.10 && < 2.2, + aeson >= 0.10 && < 2.3, + attoparsec-aeson < 2.3, array == 0.4.* || == 0.5.*, terminal-progress-bar >= 0.4 && < 0.5, bytestring-progress, @@ -137,7 +139,8 @@ executable arbtt-dump base >= 4.7 && < 5, parsec == 3.*, containers >= 0.5 && < 0.7, - aeson >= 0.10 && < 2.2, + aeson >= 0.10 && < 2.3, + attoparsec-aeson < 2.3, binary >= 0.6.4, deepseq, bytestring, utf8-string, strict, transformers, directory, filepath, @@ -172,7 +175,8 @@ executable arbtt-import parsec == 3.*, containers >= 0.5 && < 0.7, binary >= 0.6.4, - aeson >= 0.10 && < 2.2, + aeson >= 0.10 && < 2.3, + attoparsec-aeson < 2.3, conduit >= 1.2 && < 1.4, exceptions >= 0.8, attoparsec >= 0.13, diff --git a/src/import-main.hs b/src/import-main.hs index f09e5b2..4a444e5 100644 --- a/src/import-main.hs +++ b/src/import-main.hs @@ -14,7 +14,12 @@ import Control.Monad import Control.Applicative import Data.Conduit.Attoparsec import Data.Conduit +#if MIN_VERSION_aeson(2,2,0) +import Data.Aeson (parseJSON) +import Data.Aeson.Parser (json) +#else import Data.Aeson (parseJSON, json) +#endif import Data.Aeson.Types (parseEither) import Data.Binary.StringRef import Data.Attoparsec.ByteString.Char8 (skipSpace, option)