efbe326 · typeable/req

git.iko.soy/typeable/req

on master help sign in

Test with GHC 8.8.1

efbe326mrkkrp7 years ago

.travis.yml+7−7

compare with master

unifiedsplit

@@ -9,12 +9,12 @@ cache:

10matrix:

11 include:

12− - env: CABALVER=2.4 GHCVER=8.2.2

12+ - env: CABALVER=3.0 GHCVER=8.4.4

13− addons: {apt: {packages: [cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}

13+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.4.4], sources: [hvr-ghc]}}

14− - env: CABALVER=2.4 GHCVER=8.4.4

14+ - env: CABALVER=3.0 GHCVER=8.6.5

15− addons: {apt: {packages: [cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}

15+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.6.5], sources: [hvr-ghc]}}

16− - env: CABALVER=2.4 GHCVER=8.6.5

16+ - env: CABALVER=3.0 GHCVER=8.8.1

17− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}

17+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}

19before_install:

20 - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH

@@ -28,7 +28,7 @@ script:

28 - cabal new-build --enable-tests --enable-benchmarks --flags=dev

29 - cabal new-test --enable-tests --enable-benchmarks --flags=dev

30 - cabal new-haddock

31− - cabal sdist

31+ - cabal new-sdist

33notifications:

34 email: false

CHANGELOG.md+1−1

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

1## Unreleased

3−* Dropped support for GHC 8.0.

3+* Dropped support for GHC 8.2 and older.

5## Req 2.1.0

Network/HTTP/Req.hs+2−2

@@ -220,7 +220,7 @@ import Data.ByteString (ByteString)

220import Data.Data (Data)

221import Data.Function (on)

222import Data.IORef

223−import Data.Kind (Constraint)

223+import Data.Kind (Constraint, Type)

224import Data.List (nubBy)

225import Data.List.NonEmpty (NonEmpty (..))

226import Data.Maybe (fromMaybe)

@@ -1616,7 +1616,7 @@ class HttpResponse response where

1616 -- | The associated type is the type of body that can be extracted from an

1617 -- instance of 'HttpResponse'.

1618

1619− type HttpResponseBody response :: *

1619+ type HttpResponseBody response :: Type

1620

1621 -- | The method describes how to get the underlying 'L.Response' record.

1622

httpbin-tests/Network/HTTP/ReqSpec.hs+4−1

@@ -13,7 +13,6 @@ import Control.Exception

13import Control.Monad.Reader

14import Control.Monad.Trans.Control

15import Data.Aeson (Value (..), ToJSON (..), object, (.=))

16−import Data.Monoid ((<>))

17import Data.Proxy

16import Data.Proxy

18import Data.Text (Text)

17import Data.Text (Text)

19import Network.HTTP.Req

18import Network.HTTP.Req

@@ -30,6 +29,10 @@ import qualified Network.HTTP.Client as L

30import qualified Network.HTTP.Client.MultipartFormData as LM

29import qualified Network.HTTP.Client.MultipartFormData as LM

31import qualified Network.HTTP.Types as Y

30import qualified Network.HTTP.Types as Y

32+#if !MIN_VERSION_base(4,13,0)

33+import Data.Semigroup ((<>))

34+#endif

35+

33spec :: Spec

36spec :: Spec

34spec = do

37spec = do

pure-tests/Network/HTTP/ReqSpec.hs+4−1

@@ -18,7 +18,6 @@ import Control.Retry

18import Data.Aeson (ToJSON (..))

19import Data.ByteString (ByteString)

20import Data.Maybe (isNothing, fromJust)

21−import Data.Monoid ((<>))

22import Data.Proxy

21import Data.Proxy

23import Data.Text (Text)

22import Data.Text (Text)

24import Data.Time

23import Data.Time

@@ -39,6 +38,10 @@ import qualified Network.HTTP.Client as L

39import qualified Network.HTTP.Types as Y

38import qualified Network.HTTP.Types as Y

40import qualified Network.HTTP.Types.Header as Y

39import qualified Network.HTTP.Types.Header as Y

41+#if !MIN_VERSION_base(4,13,0)

42+import Data.Semigroup ((<>))

43+#endif

44+

42spec :: Spec

45spec :: Spec

43spec = do

46spec = do

req.cabal+5−6

@@ -1,7 +1,7 @@

1name: req

2version: 2.1.0

3cabal-version: 1.18

4−tested-with: GHC==8.2.2, GHC==8.4.4, GHC==8.6.5

4+tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1

5license: BSD3

6license-file: LICENSE.md

7author: Mark Karpov <markkarpov92@gmail.com>

@@ -29,7 +29,7 @@ flag dev

29library

30 build-depends: aeson >= 0.9 && < 1.5

31 , authenticate-oauth >= 1.5 && < 1.7

32− , base >= 4.10 && < 5.0

32+ , base >= 4.11 && < 5.0

33 , blaze-builder >= 0.3 && < 0.5

34 , bytestring >= 0.10.8 && < 0.11

35 , case-insensitive >= 0.2 && < 1.3

@@ -55,7 +55,6 @@ library

55 -Wincomplete-record-updates

56 -Wincomplete-uni-patterns

57 -Wnoncanonical-monad-instances

58− -Wnoncanonical-monadfail-instances

59 default-language: Haskell2010

58 default-language: Haskell2010

61test-suite pure-tests

60test-suite pure-tests

@@ -65,7 +64,7 @@ test-suite pure-tests

65 type: exitcode-stdio-1.0

64 type: exitcode-stdio-1.0

66 build-depends: QuickCheck >= 2.7 && < 3.0

65 build-depends: QuickCheck >= 2.7 && < 3.0

67 , aeson >= 0.9 && < 1.5

66 , aeson >= 0.9 && < 1.5

68− , base >= 4.10 && < 5.0

67+ , base >= 4.11 && < 5.0

69 , blaze-builder >= 0.3 && < 0.5

68 , blaze-builder >= 0.3 && < 0.5

70 , bytestring >= 0.10.8 && < 0.11

69 , bytestring >= 0.10.8 && < 0.11

71 , case-insensitive >= 0.2 && < 1.3

70 , case-insensitive >= 0.2 && < 1.3

@@ -77,7 +76,7 @@ test-suite pure-tests

77 , req

76 , req

78 , retry >= 0.8 && < 0.9

77 , retry >= 0.8 && < 0.9

79 , text >= 0.2 && < 1.3

78 , text >= 0.2 && < 1.3

80− , time >= 1.2 && < 1.9

79+ , time >= 1.2 && < 1.10

81 build-tools: hspec-discover >= 2.0 && < 3.0

80 build-tools: hspec-discover >= 2.0 && < 3.0

82 if flag(dev)

81 if flag(dev)

83 ghc-options: -O0 -Wall -Werror

82 ghc-options: -O0 -Wall -Werror

@@ -92,7 +91,7 @@ test-suite httpbin-tests

92 type: exitcode-stdio-1.0

91 type: exitcode-stdio-1.0

93 build-depends: QuickCheck >= 2.7 && < 3.0

92 build-depends: QuickCheck >= 2.7 && < 3.0

94 , aeson >= 0.9 && < 1.5

93 , aeson >= 0.9 && < 1.5

95− , base >= 4.10 && < 5.0

94+ , base >= 4.11 && < 5.0

96 , bytestring >= 0.10.8 && < 0.11

95 , bytestring >= 0.10.8 && < 0.11

97 , hspec >= 2.0 && < 3.0

96 , hspec >= 2.0 && < 3.0

98 , http-client >= 0.5 && < 0.7

97 , http-client >= 0.5 && < 0.7