export only the parts of aeson that are used

Rather than hiding things not wanted. This fixes a build warning with
aeson-2.2.3 which no longer has a json function.

diff --git a/Command/Info.hs b/Command/Info.hs
index 7bc79916cbc0fcbcf3876733d805ca16ee3a6577..1471a1832890e057f89ed10ac0b6f20f3310f14c 100644 (file)
--- a/Command/Info.hs
+++ b/Command/Info.hs
@@ -40,7 +40,7 @@ import Annex.NumCopies
 import Git.Config (boolConfig)
 import qualified Git.LsTree as LsTree
 import Utility.Percentage
-import Utility.Aeson hiding (json)
+import Utility.Aeson
 import Types.Transfer
 import Logs.Transfer
 import Types.Key

diff --git a/Utility/Aeson.hs b/Utility/Aeson.hs
index 0eacbf0daa5648691ec75dc5b03e790cde4e9157..e4a186979a949d48fbe8be59f0306ff302456860 100644 (file)
--- a/Utility/Aeson.hs
+++ b/Utility/Aeson.hs
@@ -18,11 +18,7 @@ module Utility.Aeson (
        textKey,
 ) where
 
-#if MIN_VERSION_aeson(2,0,0)
-import Data.Aeson as X hiding (ToJSON, toJSON, encode, Key)
-#else
-import Data.Aeson as X hiding (ToJSON, toJSON, encode)
-#endif
+import Data.Aeson as X (decode, eitherDecode, parseJSON, FromJSON, Object, object, Value(..), (.=), (.:), (.:?))
 import Data.Aeson hiding (encode)
 import qualified Data.Aeson
 #if MIN_VERSION_aeson(2,0,0)