Skip to content

Commit

Permalink
Drop support for GHC < 7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
erikd committed Mar 8, 2018
1 parent 3f2a7b8 commit 15f1d3b
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 17 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion test/Test/Gen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/Test/Request.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE OverloadedStrings #-}
------------------------------------------------------------
-- Copyright (c) Erik de Castro Lopo <[email protected]>
-- License : BSD3
Expand All @@ -13,7 +14,6 @@ module Test.Request
, mkPostRequestBody
) where

import Control.Applicative
import Data.ByteString (ByteString)
import Data.Char
import Data.Maybe
Expand Down
1 change: 0 additions & 1 deletion test/Test/TestServer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ module Test.TestServer
, runTestServerTLS
) where

import Control.Applicative
import Data.ByteString (ByteString)
import Data.List (sort)
import Data.Monoid
Expand Down
1 change: 0 additions & 1 deletion test/Test/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 1 addition & 5 deletions test/test-io.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
-- License : BSD3
------------------------------------------------------------

import Control.Applicative
import Control.Concurrent.Async
import Control.Exception
import Control.Monad
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 15f1d3b

Please sign in to comment.