git.iko.soy/typeable/req
on master help sign in
Test with GHC 8.8.1
commitefbe3260c4c29b895c0bb80c42e55041b9e3e92b authormrkkrp <markkarpov92@gmail.com> dateWed 25 Sep 2019, 21:47 (7 years ago) parentceba7dd
6 files changed+23−18
compare with master
unifiedsplit
.travis.yml+7−7 CHANGELOG.md+1−1 Network/HTTP/Req.hs+2−2 httpbin-tests/Network/HTTP/ReqSpec.hs+4−1 pure-tests/Network/HTTP/ReqSpec.hs+4−1 req.cabal+5−6
.travis.yml+7−7
@@ -9,12 +9,12 @@ cache:
99
1010matrix:
1111 include:
12− - env: CABALVER=2.4 GHCVER=8.2.2
13− addons: {apt: {packages: [cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
14− - env: CABALVER=2.4 GHCVER=8.4.4
15− addons: {apt: {packages: [cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
16− - env: CABALVER=2.4 GHCVER=8.6.5
17− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
12+ - env: CABALVER=3.0 GHCVER=8.4.4
13+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.4.4], sources: [hvr-ghc]}}
14+ - env: CABALVER=3.0 GHCVER=8.6.5
15+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.6.5], sources: [hvr-ghc]}}
16+ - env: CABALVER=3.0 GHCVER=8.8.1
17+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
1818
1919before_install:
2020 - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
@@ -28,7 +28,7 @@ script:
2828 - cabal new-build --enable-tests --enable-benchmarks --flags=dev
2929 - cabal new-test --enable-tests --enable-benchmarks --flags=dev
3030 - cabal new-haddock
31− - cabal sdist
31+ - cabal new-sdist
3232
3333notifications:
3434 email: false
CHANGELOG.md+1−1
@@ -1,6 +1,6 @@
11## Unreleased
22
3−* Dropped support for GHC 8.0.
3+* Dropped support for GHC 8.2 and older.
44
55## Req 2.1.0
66
Network/HTTP/Req.hs+2−2
@@ -220,7 +220,7 @@ import Data.ByteString (ByteString)
220220import Data.Data (Data)
221221import Data.Function (on)
222222import Data.IORef
223−import Data.Kind (Constraint)
223+import Data.Kind (Constraint, Type)
224224import Data.List (nubBy)
225225import Data.List.NonEmpty (NonEmpty (..))
226226import Data.Maybe (fromMaybe)
@@ -1616,7 +1616,7 @@ class HttpResponse response where
16161616 -- | The associated type is the type of body that can be extracted from an
16171617 -- instance of 'HttpResponse'.
16181618
1619− type HttpResponseBody response :: *
1619+ type HttpResponseBody response :: Type
16201620
16211621 -- | The method describes how to get the underlying 'L.Response' record.
16221622
httpbin-tests/Network/HTTP/ReqSpec.hs+4−1
@@ -13,7 +13,6 @@ import Control.Exception
1313import Control.Monad.Reader
1414import Control.Monad.Trans.Control
1515import Data.Aeson (Value (..), ToJSON (..), object, (.=))
16−import Data.Monoid ((<>))
1716import Data.Proxy
1817import Data.Text (Text)
1918import Network.HTTP.Req
@@ -30,6 +29,10 @@ import qualified Network.HTTP.Client as L
3029import qualified Network.HTTP.Client.MultipartFormData as LM
3130import qualified Network.HTTP.Types as Y
3231
32+#if !MIN_VERSION_base(4,13,0)
33+import Data.Semigroup ((<>))
34+#endif
35+
3336spec :: Spec
3437spec = do
3538
pure-tests/Network/HTTP/ReqSpec.hs+4−1
@@ -18,7 +18,6 @@ import Control.Retry
1818import Data.Aeson (ToJSON (..))
1919import Data.ByteString (ByteString)
2020import Data.Maybe (isNothing, fromJust)
21−import Data.Monoid ((<>))
2221import Data.Proxy
2322import Data.Text (Text)
2423import Data.Time
@@ -39,6 +38,10 @@ import qualified Network.HTTP.Client as L
3938import qualified Network.HTTP.Types as Y
4039import qualified Network.HTTP.Types.Header as Y
4140
41+#if !MIN_VERSION_base(4,13,0)
42+import Data.Semigroup ((<>))
43+#endif
44+
4245spec :: Spec
4346spec = do
4447
req.cabal+5−6
@@ -1,7 +1,7 @@
11name: req
22version: 2.1.0
33cabal-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
55license: BSD3
66license-file: LICENSE.md
77author: Mark Karpov <markkarpov92@gmail.com>
@@ -29,7 +29,7 @@ flag dev
2929library
3030 build-depends: aeson >= 0.9 && < 1.5
3131 , authenticate-oauth >= 1.5 && < 1.7
32− , base >= 4.10 && < 5.0
32+ , base >= 4.11 && < 5.0
3333 , blaze-builder >= 0.3 && < 0.5
3434 , bytestring >= 0.10.8 && < 0.11
3535 , case-insensitive >= 0.2 && < 1.3
@@ -55,7 +55,6 @@ library
5555 -Wincomplete-record-updates
5656 -Wincomplete-uni-patterns
5757 -Wnoncanonical-monad-instances
58− -Wnoncanonical-monadfail-instances
5958 default-language: Haskell2010
6059
6160test-suite pure-tests
@@ -65,7 +64,7 @@ test-suite pure-tests
6564 type: exitcode-stdio-1.0
6665 build-depends: QuickCheck >= 2.7 && < 3.0
6766 , aeson >= 0.9 && < 1.5
68− , base >= 4.10 && < 5.0
67+ , base >= 4.11 && < 5.0
6968 , blaze-builder >= 0.3 && < 0.5
7069 , bytestring >= 0.10.8 && < 0.11
7170 , case-insensitive >= 0.2 && < 1.3
@@ -77,7 +76,7 @@ test-suite pure-tests
7776 , req
7877 , retry >= 0.8 && < 0.9
7978 , text >= 0.2 && < 1.3
80− , time >= 1.2 && < 1.9
79+ , time >= 1.2 && < 1.10
8180 build-tools: hspec-discover >= 2.0 && < 3.0
8281 if flag(dev)
8382 ghc-options: -O0 -Wall -Werror
@@ -92,7 +91,7 @@ test-suite httpbin-tests
9291 type: exitcode-stdio-1.0
9392 build-depends: QuickCheck >= 2.7 && < 3.0
9493 , aeson >= 0.9 && < 1.5
95− , base >= 4.10 && < 5.0
94+ , base >= 4.11 && < 5.0
9695 , bytestring >= 0.10.8 && < 0.11
9796 , hspec >= 2.0 && < 3.0
9897 , http-client >= 0.5 && < 0.7