Add support for aeson 2.2

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,

src/import-main.hs

@@ -14,7 +14,12 @@
 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)
@@ -82,14 +87,14 @@
                "output format, one of Show (default) or JSON "
      ]
 
 parseConduit :: DumpFormat -> Conduit BS.ByteString IO [TimeLogEntry CaptureData]
 parseConduit DFHuman = error "Cannot read back human format"
 parseConduit DFShow = C.lines =$= C.map ( (:[]) . read . BS.unpack)
 parseConduit DFJSON =
         conduitParser (ignoreWhiteSpace json)
     =$= C.map snd
     =$= C.catMaybes
     =$= tlConduit
   where
     tlConduit = C.mapM $ \ v ->
         case parseEither oneOrMany v of
@@ -104,8 +109,8 @@
     ignoreWhiteSpace p = skipSpace *> option Nothing (Just <$> p)
 
 binaryConduit :: ListOfStringable a =>
     Conduit [(TimeLogEntry a, Maybe a)] IO (Flush BS.ByteString)
 binaryConduit = C.map (map go) =$= C.concatMap chunk
   where
     go (x,prev) = BSL.toStrict $ ls_encode strs x
         where strs = maybe [] listOfStrings prev
@@ -134,9 +139,9 @@
 
   h <- openBinaryFile (optLogFile flags) AppendMode
   runConduit $ C.sourceHandle stdin
     =$= parseConduit (optFormat flags)
     =$= stutterList
     =$= binaryConduit
     =$= C.sinkHandleFlush h
   hClose h