diff --git a/.travis.yml b/.travis.yml index 93ba150..92f1928 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,18 +3,10 @@ # See http://www.reddit.com/r/haskell/comments/1os3f6/how_to_use_travisci_with_multiple_ghc_versions/ env: - # - GHCVER=7.6.1 - # - GHCVER=7.6.2 - - GHCVER=7.6.3 - - GHCVER=7.8.4 - GHCVER=7.10.3 - GHCVER=8.0.1 - GHCVER=8.2.1 -matrix: - allow_failures: - - env: GHCVER=7.10.1 - before_install: - sudo add-apt-repository -y ppa:hvr/ghc - sudo apt-get update diff --git a/test/Test/Gen.hs b/test/Test/Gen.hs index 1917760..7462aa9 100644 --- a/test/Test/Gen.hs +++ b/test/Test/Gen.hs @@ -9,7 +9,6 @@ module Test.Gen ( genWaiRequest ) where -import Control.Applicative import Data.ByteString.Char8 (ByteString) import Data.CaseInsensitive (CI) import Data.List (intersperse) diff --git a/test/Test/Request.hs b/test/Test/Request.hs index a611578..a2ffc0e 100644 --- a/test/Test/Request.hs +++ b/test/Test/Request.hs @@ -1,4 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} ------------------------------------------------------------ -- Copyright (c) Erik de Castro Lopo -- License : BSD3 @@ -13,7 +14,6 @@ module Test.Request , mkPostRequestBody ) where -import Control.Applicative import Data.ByteString (ByteString) import Data.Char import Data.Maybe diff --git a/test/Test/TestServer.hs b/test/Test/TestServer.hs index bb346eb..2247e2f 100644 --- a/test/Test/TestServer.hs +++ b/test/Test/TestServer.hs @@ -9,7 +9,6 @@ module Test.TestServer , runTestServerTLS ) where -import Control.Applicative import Data.ByteString (ByteString) import Data.List (sort) import Data.Monoid diff --git a/test/Test/Util.hs b/test/Test/Util.hs index dd0093f..6ad9790 100644 --- a/test/Test/Util.hs +++ b/test/Test/Util.hs @@ -7,7 +7,6 @@ module Test.Util where import Blaze.ByteString.Builder -import Control.Applicative import Control.Concurrent.Async import Control.Exception hiding (assert) import Control.Monad (forM_, when, unless) diff --git a/test/test-io.hs b/test/test-io.hs index d846ad2..356d96a 100644 --- a/test/test-io.hs +++ b/test/test-io.hs @@ -5,7 +5,6 @@ -- License : BSD3 ------------------------------------------------------------ -import Control.Applicative import Control.Concurrent.Async import Control.Exception import Control.Monad @@ -35,11 +34,8 @@ proxyTestDebug = False main :: IO () main = do -#if __GLASGOW_HASKELL__ > 706 - -- Clear the `http_proxy` enviroment variable. We can't use `unsetEnv` if - -- we want to support ghc 7.6. + -- Clear the `http_proxy` enviroment variable. unsetEnv "http_proxy" -#endif bracket (mapM async [ runTestServer, runTestServerTLS ]) (mapM_ cancel)