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

Add support for aeson 2.2 #61

Merged
merged 5 commits into from
Sep 14, 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
5 changes: 5 additions & 0 deletions authenticate/Web/Authenticate/BrowserId.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ module Web.Authenticate.BrowserId

import Data.Text (Text)
import Network.HTTP.Conduit (parseUrlThrow, responseBody, httpLbs, Manager, method, urlEncodedBody)
#if MIN_VERSION_aeson(2,2,0)
import Data.Aeson (Value (Object, String))
import Data.Aeson.Parser (json)
#else
import Data.Aeson (json, Value (Object, String))
#endif
import Data.Attoparsec.Lazy (parse, maybeResult)
#if MIN_VERSION_aeson(2,0,0)
import qualified Data.Aeson.KeyMap as Map
Expand Down
3 changes: 3 additions & 0 deletions authenticate/Web/Authenticate/Rpxnow.hs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ module Web.Authenticate.Rpxnow
) where

import Data.Aeson
#if MIN_VERSION_aeson(2,2,0)
import Data.Aeson.Parser (json)
#endif
import Network.HTTP.Conduit
import Control.Monad.IO.Class
import Data.Maybe
Expand Down
1 change: 1 addition & 0 deletions authenticate/authenticate.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ library
default-language: Haskell2010
build-depends: base >= 4.10 && < 5
, aeson >= 0.5
, attoparsec-aeson >= 2.1
, http-conduit >= 1.5
, transformers >= 0.1
, bytestring >= 0.9
Expand Down
3 changes: 2 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ packages:
- authenticate-oauth/

extra-deps:
- base64-bytestring-1.2.0.0
- base64-bytestring-1.2.1.0
- attoparsec-aeson-2.1.0.0