slack-web 0.2.0.2 → 0.2.0.3

raw patch · 4 files changed

+20/−8 lines, 4 filesdep ~servantdep ~servant-clientdep ~servant-client-coresetup-changedPVP: minor bump suggested

API additions: PVP suggests at least a minor version bump

Dependency ranges changed: servant, servant-client, servant-client-core

API changes (from Hackage documentation)

Files

• Setup.hs +2/−0
• slack-web.cabal +4/−4
• src/Web/Slack.hs +9/−3
• src/Web/Slack/Common.hs +5/−1

@@ -0,0 +1,2 @@+import           Distribution.Simple+main = defaultMain

@@ -1,5 +1,5 @@ name: slack-web-version: 0.2.0.2+version: 0.2.0.3  build-type: Simple cabal-version: >= 1.21@@ -50,9 +50,9 @@     , http-api-data >= 0.3 && < 0.4     , http-client >= 0.5 && < 0.6     , http-client-tls >= 0.3 && < 0.4-    , servant >= 0.12 && < 0.13-    , servant-client >= 0.12 && < 0.13-    , servant-client-core >= 0.12 && < 0.13+    , servant >= 0.12 && < 0.14+    , servant-client >= 0.12 && < 0.14+    , servant-client-core >= 0.12 && < 0.14     , text >= 1.2 && < 1.3     , transformers     , mtl

@@ -2,6 +2,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-}+{-# LANGUAGE CPP #-}  ---------------------------------------------------------------------- -- |@@ -32,8 +33,8 @@   , usersList   , authenticateReq   , Response-  , HasManager-  , HasToken+  , HasManager(..)+  , HasToken(..)   )   where @@ -81,6 +82,11 @@ -- text import Data.Text (Text) +#if !MIN_VERSION_servant(0,13,0)+mkClientEnv :: Manager -> BaseUrl -> ClientEnv+mkClientEnv = ClientEnv+#endif+ class HasManager a where     getManager :: a -> Manager @@ -543,7 +549,7 @@ run clientAction = do   env <- ask   let baseUrl = BaseUrl Https "slack.com" 443 "/api"-  unnestErrors <$> liftIO (runClientM clientAction $ ClientEnv (getManager env) baseUrl)+  unnestErrors <$> liftIO (runClientM clientAction $ mkClientEnv (getManager env) baseUrl)  mkSlackAuthenticateReq :: (MonadReader env m, HasToken env)   => m (AuthenticatedRequest (AuthProtect "token"))

@@ -34,6 +34,8 @@ import Data.Aeson.TH  -- base+import Control.Exception+import Data.Typeable import GHC.Generics (Generic)  -- http-api-data@@ -140,4 +142,6 @@     -- ^ errors from the network connection     | SlackError Text     -- ^ errors returned by the slack API-  deriving (Eq, Generic, Show)+  deriving (Eq, Generic, Show, Typeable)++instance Exception SlackClientError