4185877 · typeable/pagerduty

git.iko.soy/typeable/pagerduty

Updating to use http-client >= 0.5 and http-conduit >= 2.2

Fixes #8

commit4185877e1af5008e967f71fa4dc9b823ad459ba3 authorBrendan Hay <brendan.g.hay@gmail.com> dateSun 18 Sep 2016, 11:16 (10 years ago) parent40b020a

10 files changed+25−27

compare with develop

unifiedsplit

.travis.yml+2−2 pagerduty.cabal+2−2 script/travis-lifecycle-before_install+3−8 src/Control/Monad/Trans/PagerDuty.hs+1−1 src/Network/PagerDuty/Integration.hs+2−2 src/Network/PagerDuty/REST.hs+2−3 stack-7.10.3.yaml+6−2 stack-7.8.4.yaml−6 stack-8.0.1.yaml+6 stack.yaml+1−1

.travis.yml+2−2

@@ -24,7 +24,7 @@ script:

2424matrix:

2525 fast_finish: true

2626 include:

27+ - env: GHCVER=8.0.1

28+ addons: { apt: { packages: [ghc-8.0.1], sources: [hvr-ghc] } }

2729 - env: GHCVER=7.10.3

2830 addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }

29− - env: GHCVER=7.8.4

30− addons: { apt: { packages: [ghc-7.8.4], sources: [hvr-ghc] } }

pagerduty.cabal+2−2

@@ -72,7 +72,7 @@ library

7272

7373 build-depends:

7474 aeson >= 0.8

75− , base >= 4.7 && < 5

75+ , base >= 4.7 && < 5

7676 , bifunctors >= 4.1

7777 , bytestring >= 0.9

7878 , bytestring-conversion >= 0.2.1

@@ -80,7 +80,7 @@ library

8080 , data-default-class >= 0.0.1

8181 , exceptions >= 0.6

8282 , generics-sop >= 0.2.0.0

83− , http-client >= 0.4.3

83+ , http-client >= 0.5 && < 1

8484 , http-types >= 0.8

8585 , lens >= 4.4

8686 , lens-aeson >= 1

script/travis-lifecycle-before_install+3−8

@@ -2,15 +2,10 @@

33set -e

5−dir=~/.local/bin

6−remote=https://github.com/commercialhaskell/stack/releases/download/v0.1.3.1/stack-0.1.3.1-x86_64-linux.gz

7−local=$dir/stack

5+mkdir -p ~/.local/bin

9−mkdir -p $dir

10−

11−curl -L $remote | gunzip > $local

12−

13−chmod a+x $local

7+curl -L https://www.stackage.org/stack/linux-x86_64 | \

8+ tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

149

1510ghc --version

1611stack --version

src/Control/Monad/Trans/PagerDuty.hs+1−1

@@ -44,7 +44,7 @@ module Control.Monad.Trans.PagerDuty

4444import Control.Applicative

4545import Control.Monad.Base

4646import Control.Monad.Catch

47−import Control.Monad.Error (MonadError (..))

47+import Control.Monad.Except (MonadError (..))

4848import Control.Monad.Morph

4949import Control.Monad.Reader

5050import Control.Monad.Trans.Control

src/Network/PagerDuty/Integration.hs+2−2

@@ -81,7 +81,6 @@ module Network.PagerDuty.Integration

8181import Control.Lens

8282import Control.Monad.IO.Class

8383import Data.Aeson

84−import Data.Default.Class

8584import qualified Data.HashMap.Strict as Map

8685import Data.Text (Text)

8786import Network.HTTP.Client (Manager)

@@ -292,7 +291,8 @@ submitWith :: MonadIO m

292291 -> Event

293292 -> m (Either Error Response)

294293submitWith m l e = request m l e $

295− def { Client.host = "events.pagerduty.com"

294+ Client.defaultRequest

295+ { Client.host = "events.pagerduty.com"

296296 , Client.path = "/generic/2010-04-15/create_event.json"

297297 , Client.method = "POST"

298298 }

src/Network/PagerDuty/REST.hs+2−3

@@ -29,7 +29,6 @@ import Control.Monad.IO.Class

2929import Control.Monad.Trans

3030import Data.Aeson (FromJSON)

3131import Data.Conduit

32−import Data.Default.Class

3332import Data.Monoid

3433import Network.HTTP.Client (Manager)

3534import qualified Network.HTTP.Client as Client

@@ -90,7 +89,7 @@ http e rq = request (e ^. envManager) (e ^. envLogger) rq $ raw

9089 }

9190 where

9291 raw = case e ^. envAuth of

93− AuthBasic u p -> Client.applyBasicAuth u p def

94− AuthToken t -> def

92+ AuthBasic u p -> Client.applyBasicAuth u p Client.defaultRequest

93+ AuthToken t -> Client.defaultRequest

9594 { Client.requestHeaders = [("Authorization", "Token token=" <> t)]

9695 }

stack-7.10.3.yaml+6−2

@@ -1,5 +1,9 @@

1−resolver: lts-5.8

1+compiler: ghc-7.10.3

2+resolver: lts-6.9

23flags: {}

3−extra-deps: []

4+extra-deps:

5+ - http-conduit-2.2.0

6+ - http-client-0.5.0.1

7+ - http-client-tls-0.3.0

48packages:

59 - '.'

stack-7.8.4.yamldeleted−6

@@ -1,6 +0,0 @@

1−resolver: lts-2.21

2−flags: {}

3−extra-deps:

4− - generics-sop-0.2.0.0

5−packages:

6− - '.'

stack-8.0.1.yamlnew file+6

@@ -0,0 +1,6 @@

1+compiler: ghc-8.0.1

2+resolver: nightly-2016-09-18

3+flags: {}

4+extra-deps: []

5+packages:

6+ - '.'

stack.yaml+1−1

@@ -1 +1 @@

1−stack-7.10.3.yaml

1+stack-8.0.1.yaml