arbtt 0.12.0.2 → 0.12.0.3

raw patch · 2 files changed

+15/−6 lines, 2 filesdep +attoparsec-aesondep ~aesondep ~containersdep ~tasty

Dependencies added: attoparsec-aeson

Dependency ranges changed: aeson, containers, tasty

Files

• arbtt.cabal +10/−6
• src/import-main.hs +5/−0

@@ -1,5 +1,5 @@ name:               arbtt-version:            0.12.0.2+version:            0.12.0.3 license:            GPL-2 license-file:       LICENSE category:           Desktop@@ -36,7 +36,8 @@                 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 @@         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 @@         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 @@         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,@@ -263,7 +267,7 @@     TimeLog   Build-depends:       base >= 4.7 && < 5-      , tasty >= 0.7 && < 1.5+      , tasty >= 0.7 && < 1.6       , tasty-golden >= 2.2.0.2  && < 2.4       , tasty-hunit >= 0.2  && < 0.11       , process-extras >= 0.2 && < 0.8

@@ -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)