44779be · typeable/yaml

git.iko.soy/typeable/yaml

on master help sign in

Add CPP blocks to deal with deprecations in aeson-1.0.0

44779beStijn van Drongelen9 years ago

Data/Yaml.hs+4

@@ -78,7 +78,11 @@ import Data.Aeson

78 , Object, Array

79 , withObject, withText, withArray, withScientific, withBool

80 )

81+#if MIN_VERSION_aeson(1,0,0)

82+import Data.Aeson.Text (encodeToTextBuilder)

83+#else

81import Data.Aeson.Encode (encodeToTextBuilder)

84import Data.Aeson.Encode (encodeToTextBuilder)

85+#endif

82import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)

86import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)

83import Data.ByteString (ByteString)

87import Data.ByteString (ByteString)

84import qualified Data.Conduit as C

88import qualified Data.Conduit as C

Data/Yaml/Builder.hs+4

@@ -22,7 +22,11 @@ import Prelude hiding (null)

23import Control.Arrow (second)

24import Control.Monad.Trans.Resource (runResourceT)

25+#if MIN_VERSION_aeson(1,0,0)

26+import Data.Aeson.Text (encodeToTextBuilder)

27+#else

25import Data.Aeson.Encode (encodeToTextBuilder)

28import Data.Aeson.Encode (encodeToTextBuilder)

29+#endif

26import Data.Aeson.Types (Value(..))

30import Data.Aeson.Types (Value(..))

27import Data.ByteString (ByteString)

31import Data.ByteString (ByteString)

28import qualified Data.ByteString.Char8 as S8

32import qualified Data.ByteString.Char8 as S8