diff --git a/src/Network/OAuth/OAuth2/Compat.hs b/src/Network/OAuth/OAuth2/Compat.hs index 5919d57..05af0da 100644 --- a/src/Network/OAuth/OAuth2/Compat.hs +++ b/src/Network/OAuth/OAuth2/Compat.hs @@ -134,7 +134,9 @@ fetchAccessTokenBasic -> IO (OAuth2Result Errors OAuth2Token) fetchAccessTokenBasic m o e = runOAuth2 $ f m (getOAuth2 o) e where -#if MIN_VERSION_hoauth2(2,3,0) +#if MIN_VERSION_hoauth2(2,6,0) + f = OAuth2.fetchAccessTokenWithAuthMethod OAuth2.ClientSecretBasic +#elif MIN_VERSION_hoauth2(2,3,0) f = OAuth2.fetchAccessTokenInternal OAuth2.ClientSecretBasic #else f = OAuth2.fetchAccessToken @@ -147,7 +149,9 @@ fetchAccessTokenPost -> IO (OAuth2Result Errors OAuth2Token) fetchAccessTokenPost m o e = runOAuth2 $ f m (getOAuth2 o) e where -#if MIN_VERSION_hoauth2(2,3,0) +#if MIN_VERSION_hoauth2(2, 6, 0) + f = OAuth2.fetchAccessTokenWithAuthMethod OAuth2.ClientSecretPost +#elif MIN_VERSION_hoauth2(2,3,0) f = OAuth2.fetchAccessTokenInternal OAuth2.ClientSecretPost #else f = OAuth2.fetchAccessToken2 diff --git a/stack-nightly.yaml b/stack-nightly.yaml index a686e7a..b3bc7fd 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1,8 +1,11 @@ -resolver: nightly-2022-03-25 +resolver: nightly-2022-12-09 extra-deps: - - hoauth2-2.4.0 - - yesod-auth-1.6.11 - - yesod-core-1.6.22.0 - - yesod-form-1.7.0 - - yesod-persistent-1.6.0.7 + - hoauth2-2.6.0 + +# hoauth2 needs upper-bounds relaxed for +# +# - memory-0.18.0 +# - text-2.0.1 +# +allow-newer: true diff --git a/yesod-auth-oauth2.cabal b/yesod-auth-oauth2.cabal index 2456f48..1c42526 100644 --- a/yesod-auth-oauth2.cabal +++ b/yesod-auth-oauth2.cabal @@ -1,10 +1,10 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.35.0. -- -- see: https://github.com/sol/hpack -- --- hash: d8816664cb0b39ecb9a3775f44bcd9b4787d0af5d0d3f8565786479461e5ae99 +-- hash: 6ff32214308580349bea075f2eb01f97fc72598ea3e9a23f77a3e678d9c2c23a name: yesod-auth-oauth2 version: 0.7.0.2 @@ -108,9 +108,9 @@ executable yesod-auth-oauth2-example , yesod , yesod-auth >=1.6.0 , yesod-auth-oauth2 + default-language: Haskell2010 if !(flag(example)) buildable: False - default-language: Haskell2010 test-suite test type: exitcode-stdio-1.0