Skip to content
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.

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

Allow compilation with aeson 2.2.0.0. #220

Merged
merged 2 commits into from
Jul 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion yaml/src/Data/Yaml/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,12 @@ import Data.Aeson.KeyMap (KeyMap)
#else
import qualified Data.HashMap.Strict as M
#endif
import Data.Aeson.Internal (JSONPath, JSONPathElement(..), formatError)
#if MIN_VERSION_aeson(2,2,0)
import Data.Aeson.Types hiding (AesonException, parse)
#else
import Data.Aeson.Types hiding (parse)
import Data.Aeson.Internal (JSONPath, JSONPathElement(..), formatError)
#endif
import qualified Data.Attoparsec.Text as Atto
import Data.Bits (shiftL, (.|.))
import Data.ByteString (ByteString)
Expand Down
5 changes: 5 additions & 0 deletions yaml/test/Data/Yaml/IncludeSpec.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE OverloadedStrings #-}
module Data.Yaml.IncludeSpec (main, spec) where
Expand All @@ -6,7 +7,11 @@ import Test.Hspec
import Data.List (isPrefixOf)
import qualified Data.ByteString.Lazy as LB
import Data.Aeson
#if MIN_VERSION_aeson(2,2,0)
import Data.Aeson.Types (JSONPathElement(..))
#else
import Data.Aeson.Internal (JSONPathElement(..))
#endif
import Data.Yaml (ParseException(InvalidYaml))
import Data.Yaml.Include
import Data.Yaml.Internal
Expand Down