Skip to content

support for aeson 2 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avieth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support for aeson 2 #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Web/UAParser/SuiteUtils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE OverloadedStrings, CPP #-}
module Web.UAParser.SuiteUtils
( UserAgentTestCase(..)
, OSTestCase(..)
Expand All @@ -12,6 +12,9 @@ import Control.Applicative
import Control.Monad (join)
import Data.Aeson hiding ((.:?))
import qualified Data.Aeson as A
#if MIN_VERSION_aeson(2,0,0)
import qualified Data.Aeson.Key as K
#endif
import Data.ByteString (ByteString)
import Data.Text (Text)
import qualified Data.Text.Encoding as T
Expand Down Expand Up @@ -98,4 +101,8 @@ instance FromJSON DevTestCase where
-- | Backport a more lenient version of .:? from newer versions of
-- aeson. It accepts an explicit null as well as an omitted field.
(.:?) :: (FromJSON a) => Object -> Text -> Parser (Maybe a)
#if MIN_VERSION_aeson(2,0,0)
o .:? k = join <$> (o A..:? K.fromText k)
#else
o .:? k = join <$> (o A..:? k)
#endif