4185877 · typeable/pagerduty

.travis.yml+2−2

compare with develop

unifiedsplit

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

24matrix:

25 fast_finish: true

26 include:

27+ - env: GHCVER=8.0.1

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

27 - env: GHCVER=7.10.3

29 - env: GHCVER=7.10.3

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

30 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

72

73 build-depends:

74 aeson >= 0.8

75− , base >= 4.7 && < 5

75+ , base >= 4.7 && < 5

76 , bifunctors >= 4.1

77 , bytestring >= 0.9

78 , bytestring-conversion >= 0.2.1

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

80 , data-default-class >= 0.0.1

81 , exceptions >= 0.6

82 , generics-sop >= 0.2.0.0

83− , http-client >= 0.4.3

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

84 , http-types >= 0.8

85 , lens >= 4.4

86 , lens-aeson >= 1

script/travis-lifecycle-before_install+3−8

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

2

3set -e

4

5−dir=~/.local/bin

5+mkdir -p ~/.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

8

6

9−mkdir -p $dir

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

10−

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

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

12−

13−chmod a+x $local

14

9

15ghc --version

10ghc --version

16stack --version

11stack --version

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

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

44import Control.Applicative

45import Control.Monad.Base

46import Control.Monad.Catch

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

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

48import Control.Monad.Morph

49import Control.Monad.Reader

50import Control.Monad.Trans.Control

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

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

81import Control.Lens

82import Control.Monad.IO.Class

83import Data.Aeson

84−import Data.Default.Class

85import qualified Data.HashMap.Strict as Map

84import qualified Data.HashMap.Strict as Map

86import Data.Text (Text)

85import Data.Text (Text)

87import Network.HTTP.Client (Manager)

86import Network.HTTP.Client (Manager)

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

292 -> Event

291 -> Event

293 -> m (Either Error Response)

292 -> m (Either Error Response)

294submitWith m l e = request m l e $

293submitWith m l e = request m l e $

294+ Client.defaultRequest

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

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

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

297 , Client.method = "POST"

298 }

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

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

29import Control.Monad.Trans

30import Data.Aeson (FromJSON)

31import Data.Conduit

32−import Data.Default.Class

33import Data.Monoid

32import Data.Monoid

34import Network.HTTP.Client (Manager)

33import Network.HTTP.Client (Manager)

35import qualified Network.HTTP.Client as Client

34import qualified Network.HTTP.Client as Client

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

90 }

89 }

91 where

90 where

92 raw = case e ^. envAuth of

91 raw = case e ^. envAuth of

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

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

94− AuthToken t -> def

93+ AuthToken t -> Client.defaultRequest

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

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

96 }

95 }

stack-7.10.3.yaml+6−2

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

1+compiler: ghc-7.10.3

1−resolver: lts-5.8

2+resolver: lts-6.9

2flags: {}

3flags: {}

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

4packages:

8packages:

5 - '.'

9 - '.'

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