summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordomenkozar <>2018-06-18 15:46:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2018-06-18 15:46:00 (GMT)
commitf7d118b20eb72e295215e8e5b83a204e1b82b4ab (patch)
tree497b582790a80ff1dfe956dc932e71fcb23f34fa
parent564ca7b49f65b37aece649d9e5e253234d19d8c2 (diff)
version 0.3.3.00.3.3.0
-rw-r--r--CHANGELOG.md15
-rw-r--r--servant-auth-client.cabal12
-rw-r--r--src/Servant/Auth/Client/Internal.hs5
3 files changed, 27 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..e4b31a8
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,15 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.3.3.0] - 2018-06-18
+
+### Added
+- Support for GHC 8.4 by @phadej
+- Support for servant-0.14 by @phadej
+- Changelog by @domenkozar
diff --git a/servant-auth-client.cabal b/servant-auth-client.cabal
index b4b5d8f..f9c037a 100644
--- a/servant-auth-client.cabal
+++ b/servant-auth-client.cabal
@@ -1,5 +1,5 @@
name: servant-auth-client
-version: 0.3.2.0
+version: 0.3.3.0
synopsis: servant-client/servant-auth compatibility
description: This package provides instances that allow generating clients from
<https://hackage.haskell.org/package/servant servant>
@@ -15,9 +15,11 @@ maintainer: jkarni@gmail.com
copyright: (c) Julian K. Arni
license: BSD3
license-file: LICENSE
-tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2
+tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC==8.4.3
build-type: Simple
cabal-version: >= 1.10
+extra-source-files:
+ CHANGELOG.md
source-repository head
type: git
@@ -34,15 +36,15 @@ library
default-extensions: AutoDeriveTypeable ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
ghc-options: -Wall
build-depends:
- base >= 4.8 && < 4.11
+ base >= 4.8 && < 4.12
, text
, bytestring
, servant-auth == 0.3.*
- , servant >= 0.7 && < 0.14
+ , servant >= 0.7 && < 0.15
if flag(servant-client-core)
cpp-options: -DHAS_CLIENT_CORE=1
build-depends:
- servant-client-core >= 0.12 && < 0.14,
+ servant-client-core >= 0.12 && < 0.15,
containers
else
build-depends:
diff --git a/src/Servant/Auth/Client/Internal.hs b/src/Servant/Auth/Client/Internal.hs
index 313e98b..7d4d6d7 100644
--- a/src/Servant/Auth/Client/Internal.hs
+++ b/src/Servant/Auth/Client/Internal.hs
@@ -47,6 +47,11 @@ instance (HasJWT auths, HasClient m api) => HasClient m (Auth auths a :> api) wh
$ req { requestHeaders = ("Authorization", headerVal) <| requestHeaders req }
where
headerVal = "Bearer " <> token
+
+#if MIN_VERSION_servant_client_core(0,14,0)
+ hoistClientMonad pm _ nt cl = hoistClientMonad pm (Proxy :: Proxy api) nt . cl
+#endif
+
#else
instance (HasJWT auths, HasClient api) => HasClient (Auth auths a :> api) where
type Client (Auth auths a :> api) = Token -> Client api