Fix deprecation warning for LTS 8
This commit is contained in:
parent
626719ce28
commit
4b34fe9c72
@ -74,7 +74,11 @@ import Control.Monad.IO.Class (MonadIO)
|
|||||||
import qualified Crypto.Nonce as Nonce
|
import qualified Crypto.Nonce as Nonce
|
||||||
import Data.Aeson ((.:?))
|
import Data.Aeson ((.:?))
|
||||||
import qualified Data.Aeson as A
|
import qualified Data.Aeson as A
|
||||||
|
#if MIN_VERSION_aeson(1,0,0)
|
||||||
|
import qualified Data.Aeson.Text as A
|
||||||
|
#else
|
||||||
import qualified Data.Aeson.Encode as A
|
import qualified Data.Aeson.Encode as A
|
||||||
|
#endif
|
||||||
import Data.Aeson.Parser (json')
|
import Data.Aeson.Parser (json')
|
||||||
import Data.Aeson.Types (FromJSON (parseJSON), parseEither,
|
import Data.Aeson.Types (FromJSON (parseJSON), parseEither,
|
||||||
parseMaybe, withObject, withText)
|
parseMaybe, withObject, withText)
|
||||||
|
|||||||
@ -66,7 +66,8 @@ import Data.Conduit.Internal (ResumableSource (ResumableSource))
|
|||||||
import qualified Data.Conduit.Internal as CI
|
import qualified Data.Conduit.Internal as CI
|
||||||
|
|
||||||
import qualified Data.Aeson as J
|
import qualified Data.Aeson as J
|
||||||
#if MIN_VERSION_aeson(0, 7, 0)
|
#if MIN_VERSION_aeson(1, 0, 0)
|
||||||
|
#elif MIN_VERSION_aeson(0, 7, 0)
|
||||||
import Data.Aeson.Encode (encodeToTextBuilder)
|
import Data.Aeson.Encode (encodeToTextBuilder)
|
||||||
#else
|
#else
|
||||||
import Data.Aeson.Encode (fromValue)
|
import Data.Aeson.Encode (fromValue)
|
||||||
@ -242,6 +243,11 @@ instance ToContent a => ToContent (DontFullyEvaluate a) where
|
|||||||
toContent (DontFullyEvaluate a) = ContentDontEvaluate $ toContent a
|
toContent (DontFullyEvaluate a) = ContentDontEvaluate $ toContent a
|
||||||
|
|
||||||
instance ToContent J.Value where
|
instance ToContent J.Value where
|
||||||
|
#if MIN_VERSION_aeson(1, 0, 0)
|
||||||
|
toContent = flip ContentBuilder Nothing
|
||||||
|
. J.fromEncoding
|
||||||
|
. J.toEncoding
|
||||||
|
#else
|
||||||
toContent = flip ContentBuilder Nothing
|
toContent = flip ContentBuilder Nothing
|
||||||
. Blaze.fromLazyText
|
. Blaze.fromLazyText
|
||||||
. toLazyText
|
. toLazyText
|
||||||
@ -251,6 +257,8 @@ instance ToContent J.Value where
|
|||||||
. fromValue
|
. fromValue
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
#if MIN_VERSION_aeson(0, 11, 0)
|
#if MIN_VERSION_aeson(0, 11, 0)
|
||||||
instance ToContent J.Encoding where
|
instance ToContent J.Encoding where
|
||||||
toContent = flip ContentBuilder Nothing . J.fromEncoding
|
toContent = flip ContentBuilder Nothing . J.fromEncoding
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user