884988e · typeable/yaml

git.iko.soy/typeable/yaml

Merge pull request #220 from jgm/issue219

Allow compilation with aeson 2.2.0.0.

commit884988e564af8f9bfdf92edab8a90b6e609295e2 authorMichael Snoyman <michael@snoyman.com> dateSat 1 Jul 2023, 20:41 (3 years ago) parent5a039de c41822b

2 files changed+10−1

compare with master

unifiedsplit

yaml/src/Data/Yaml/Internal.hs+5−1 yaml/test/Data/Yaml/IncludeSpec.hs+5

yaml/src/Data/Yaml/Internal.hs+5−1

@@ -46,8 +46,12 @@ import Data.Aeson.KeyMap (KeyMap)

4646#else

4747import qualified Data.HashMap.Strict as M

4848#endif

49−import Data.Aeson.Internal (JSONPath, JSONPathElement(..), formatError)

49+#if MIN_VERSION_aeson(2,2,0)

50+import Data.Aeson.Types hiding (AesonException, parse)

51+#else

5052import Data.Aeson.Types hiding (parse)

53+import Data.Aeson.Internal (JSONPath, JSONPathElement(..), formatError)

54+#endif

5155import qualified Data.Attoparsec.Text as Atto

5256import Data.Bits (shiftL, (.|.))

5357import Data.ByteString (ByteString)

yaml/test/Data/Yaml/IncludeSpec.hs+5

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE QuasiQuotes #-}

23{-# LANGUAGE OverloadedStrings #-}

34module Data.Yaml.IncludeSpec (main, spec) where

@@ -6,7 +7,11 @@ import Test.Hspec

67import Data.List (isPrefixOf)

78import qualified Data.ByteString.Lazy as LB

89import Data.Aeson

10+#if MIN_VERSION_aeson(2,2,0)

11+import Data.Aeson.Types (JSONPathElement(..))

12+#else

913import Data.Aeson.Internal (JSONPathElement(..))

14+#endif

1015import Data.Yaml (ParseException(InvalidYaml))

1116import Data.Yaml.Include

1217import Data.Yaml.Internal