From ce9b98f20981c4eeaa4ee127ad14175f28e912ad Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Thu, 28 Dec 2023 11:50:19 +0100 Subject: [PATCH] MAke it build with 2.2 --- aeson-combinators.cabal | 5 +++-- lib/Data/Aeson/Combinators/Decode.hs | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aeson-combinators.cabal b/aeson-combinators.cabal index 0cdf051..695787a 100644 --- a/aeson-combinators.cabal +++ b/aeson-combinators.cabal @@ -18,10 +18,10 @@ build-type: Simple extra-source-files: README.md , CHANGELOG.md homepage: https://github.com/turboMaCk/aeson-combinators -tested-with: GHC == 8.8.4 - , GHC == 8.10.7 +tested-with: GHC == 8.10.7 , GHC == 9.0.2 , GHC == 9.2.5 + , GHC == 9.8.1 , GHCJS == 8.6.0.1 Flag doctest @@ -37,6 +37,7 @@ library , bytestring , text , aeson + , attoparsec-aeson , scientific , vector , unordered-containers diff --git a/lib/Data/Aeson/Combinators/Decode.hs b/lib/Data/Aeson/Combinators/Decode.hs index 7426802..5392e9f 100644 --- a/lib/Data/Aeson/Combinators/Decode.hs +++ b/lib/Data/Aeson/Combinators/Decode.hs @@ -109,11 +109,10 @@ import Data.Aeson.Internal (formatError, iparse) #endif #if MIN_VERSION_aeson(2,2,0) import Data.Aeson.Types (JSONPath, JSONPathElement (..)) -import Data.Aeson.Types (formatError, iparse) -#if !(MIN_VERSION_aeson(2,2,0)) +import Data.Aeson.Types (formatError, iparse) +#endif import qualified Data.Aeson.Parser as Parser import qualified Data.Aeson.Parser.Internal as ParserI -#endif import Data.Aeson.Types hiding (parseEither, parseMaybe) import qualified Data.Aeson.Types as ATypes