aeson compat

Author: chris-martin

bugsnag/bugsnag.cabal

@@ -40,7 +40,7 @@ library
       Network.Bugsnag.Notify
       Network.Bugsnag.StackFrame
   other-modules:
-      Paths_bugsnag
+      Data.Aeson.Compat
   hs-source-dirs:
       src
   default-extensions:

bugsnag/package.yaml

@@ -46,6 +46,8 @@ default-extensions:
 
 library:
   source-dirs: src
+  other-modules:
+    - Data.Aeson.Compat
   dependencies:
     - Glob >= 0.9.0
     - aeson

bugsnag/src/Data/Aeson/Compat.hs

@@ -0,0 +1,47 @@
+{-# LANGUAGE CPP #-}
+
+module Data.Aeson.Compat
+  (
+    -- * Key
+    Key
+  , fromText
+  , toText
+
+    -- * KeyMap
+  , KeyMap
+  , empty
+  , null
+  , singleton
+  , fromList
+  , toList
+  , unionWith
+
+    -- * Etc.
+  , Pair
+  , Value(Object)
+  , Object
+  , object
+  , (.=)
+  ) where
+
+import Data.Aeson.Types (Pair, Value(Object), Object, object, (.=))
+#if MIN_VERSION_aeson(2, 0, 0)
+import Data.Aeson.Key (Key, fromText, toText)
+import Data.Aeson.KeyMap (KeyMap, empty, fromList, null, singleton, toList, unionWith)
+-- Avoid unused-packages (unordered-containers) warning for this path
+import Data.HashMap.Strict ()
+#else
+import Prelude (id)
+
+import Data.HashMap.Strict (HashMap, empty, fromList, null, singleton, toList, unionWith)
+import Data.Text (Text)
+
+type Key = Text
+type KeyMap = HashMap Text
+
+fromText :: Text -> Key
+fromText = id
+
+toText :: Key -> Text
+toText = id
+#endif

bugsnag/src/Network/Bugsnag/MetaData.hs

@@ -6,10 +6,8 @@ module Network.Bugsnag.MetaData
 
 import Prelude
 
-import Data.Aeson (KeyValue ((.=)), Object, Value (..), object)
-import qualified Data.Aeson as Aeson
-import qualified Data.Aeson.Types as Aeson
-import qualified Data.Aeson.KeyMap
+import Data.Aeson.Compat ((.=), Value(Object), Object, object)
+import qualified Data.Aeson.Compat as Aeson
 
 newtype MetaData = MetaData
   { unMetaData :: Object
@@ -24,7 +22,7 @@ instance Semigroup MetaData where
   MetaData x <> MetaData y = MetaData $ unionObjects y x
    where
     unionObjects :: Object -> Object -> Object
-    unionObjects = Data.Aeson.KeyMap.unionWith unionValues
+    unionObjects = Aeson.unionWith unionValues
 
     unionValues (Object a) (Object b) = Object $ unionObjects a b
     unionValues a _ = a
@@ -39,7 +37,7 @@ metaData
   -> [Aeson.Pair]
   -- ^ The Key-Values themselves
   -> MetaData
-metaData key = MetaData . Data.Aeson.KeyMap.fromList . pure . (key .=) . object
+metaData key = MetaData . Aeson.fromList . pure . (key .=) . object
 
 -- $details
 --