Merge pull request #57 from haskellari/aeson-2

Support aeson-2.0.0.0

Author: phadej

ChangeLog.md

@@ -1,3 +1,7 @@
+## 0.2.1
+
+- Support `aeson-2.0.0.0`
+
 ## 0.2
 
 - Change the pretty printing to use less horizontal space.

src/Data/TreeDiff/Class.hs

@@ -24,10 +24,10 @@ import Data.Foldable    (toList)
 import Data.List.Compat (uncons)
 import Data.Proxy       (Proxy (..))
 import GHC.Generics
-       ((:*:) (..), (:+:) (..), Constructor (..), Generic (..), K1 (..),
-       M1 (..), Selector (..), U1 (..), V1)
+       (Constructor (..), Generic (..), K1 (..), M1 (..), Selector (..),
+       U1 (..), V1, (:*:) (..), (:+:) (..))
 
-import qualified Data.Map as Map
+import qualified Data.Map           as Map
 import qualified Data.TreeDiff.OMap as OMap
 
 import Data.TreeDiff.Expr
@@ -94,6 +94,10 @@ import qualified Data.HashSet        as HS
 
 -- aeson
 import qualified Data.Aeson as Aeson
+#if MIN_VERSION_aeson(2,0,0)
+import qualified Data.Aeson.Key    as Key
+import qualified Data.Aeson.KeyMap as KM
+#endif
 
 -- strict
 import qualified Data.Strict as Strict
@@ -550,6 +554,14 @@ instance (ToExpr k) => ToExpr (HS.HashSet k) where
 
 instance ToExpr Aeson.Value
 
+#if MIN_VERSION_aeson(2,0,0)
+instance ToExpr Key.Key where
+    toExpr = stringToExpr "Key.concat" . unconcat T.uncons . Key.toText
+
+instance ToExpr a => ToExpr (KM.KeyMap a) where
+    toExpr x = App "KM.fromList" [ toExpr $ KM.toList x ]
+#endif
+
 -------------------------------------------------------------------------------
 -- strict
 -------------------------------------------------------------------------------

tree-diff.cabal

@@ -1,7 +1,6 @@
 cabal-version:      2.2
 name:               tree-diff
-version:            0.2
-x-revision:         1
+version:            0.2.1
 synopsis:           Diffing of (expression) trees.
 category:           Data, Testing
 description:
@@ -94,7 +93,7 @@ library
     , time        ^>=1.4 || ^>=1.5.0.1 || ^>=1.6.0.1 || ^>=1.8.0.2 || ^>=1.9.3
 
   build-depends:
-    , aeson                 ^>=1.4.6.0 || ^>=1.5.6.0
+    , aeson                 ^>=1.4.6.0 || ^>=1.5.6.0 || ^>=2.0.0.0
     , ansi-terminal         >=0.10       && <0.12
     , ansi-wl-pprint        ^>=0.6.8.2
     , base-compat           ^>=0.10.5 || ^>=0.11.0 || ^>=0.12