Merge pull request #61 from Vekhir/patch-1

Add support for aeson 2.2

authenticate/Web/Authenticate/BrowserId.hs

@@ -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

authenticate/Web/Authenticate/Rpxnow.hs

@@ -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

authenticate/authenticate.cabal

@@ -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

stack.yaml

@@ -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