58babfc · typeable/mandrill

git.iko.soy/typeable/mandrill

Using CPP to make time-1.5 compile. Added GHC 7.10.1 to Travis

commit58babfce81c90c5d8d1bedccae0113f6e3ac8101 authorAlfredo Di Napoli <alfredo.dinapoli@gmail.com> dateThu 30 Apr 2015, 15:26 (11 years ago) parenteb0e465

4 files changed+11−5

compare with master

unifiedsplit

.hub+1−1 .travis.yml+2−1 mandrill.cabal+1−1 src/Network/API/Mandrill/Types.hs+7−2

.hub+1−1

@@ -1 +1 @@

1−mandrill

1+mandrill-7.10.1

.travis.yml+2−1

@@ -9,6 +9,7 @@ env:

99 - GHCVER=7.6.3 CABALVER=1.16

1010 - GHCVER=7.8.2 CABALVER=1.18

1111 - GHCVER=7.8.3 CABALVER=1.18

12+ - GHCVER=7.10.1 CABALVER=1.22

1213 - GHCVER=head CABALVER=1.20

1314

1415matrix:

@@ -46,4 +47,4 @@ script:

4647after_script:

4748 - cabal install hpc-coveralls

4849 - export PATH=/opt/ghc/$GHCVER/bin:$HOME/.cabal/bin:$PATH

49− - hpc-coveralls --coverage-mode=StrictlyFullLines mandrill-tests

50+ - hpc-coveralls --coverage-mode=StrictlyFullLines mandrill-tests

mandrill.cabal+1−1

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

11name: mandrill

2−version: 0.2.1.0

2+version: 0.2.2.0

33synopsis: Library for interfacing with the Mandrill JSON API

44description: Pure Haskell client for the Mandrill JSON API

55license: MIT

src/Network/API/Mandrill/Types.hs+7−2

@@ -1,4 +1,5 @@

11{-# LANGUAGE TemplateHaskell #-}

2+{-# LANGUAGE CPP #-}

23{-# LANGUAGE RankNTypes #-}

34{-# LANGUAGE ScopedTypeVariables #-}

45{-# LANGUAGE OverloadedStrings #-}

@@ -12,7 +13,11 @@ import Data.Char

1213import Data.Maybe

1314import Data.Time

1415import Control.Applicative

15−import System.Locale (defaultTimeLocale)

16+#if MIN_VERSION_time(1,5,0)

17+import Data.Time.Format (defaultTimeLocale)

18+#else

19+import System.Locale (defaultTimeLocale)

20+#endif

1621import qualified Data.ByteString as B

1722import qualified Data.ByteString.Base64 as Base64

1823import qualified Data.Text as T

@@ -329,6 +334,6 @@ instance ToJSON MandrillDate where

329334

330335instance FromJSON MandrillDate where

331336 parseJSON = withText "MandrillDate" $ \t ->

332− case parseTime defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of

337+ case parseTimeM True defaultTimeLocale "%Y-%m-%d %I:%M:%S%Q" (T.unpack t) of

333338 Just d -> pure $ MandrillDate d

334339 _ -> fail "could not parse Mandrill date"