Skip to content

Commit 3d08e36

Browse files
committed
Drop support for GHC 7
1 parent 2dad76d commit 3d08e36

File tree

8 files changed

+27
-51
lines changed

8 files changed

+27
-51
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20241223
11+
# version: 0.19.20250506
1212
#
13-
# REGENDATA ("0.19.20241223",["github","tasty-silver.cabal"])
13+
# REGENDATA ("0.19.20250506",["github","tasty-silver.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -32,14 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.12.1
35+
- compiler: ghc-9.12.2
3636
compilerKind: ghc
37-
compilerVersion: 9.12.1
37+
compilerVersion: 9.12.2
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.10.1
40+
- compiler: ghc-9.10.2
4141
compilerKind: ghc
42-
compilerVersion: 9.10.1
42+
compilerVersion: 9.10.2
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.8.4
@@ -106,12 +106,12 @@ jobs:
106106
- name: Install GHCup
107107
run: |
108108
mkdir -p "$HOME/.ghcup/bin"
109-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
109+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
110110
chmod a+x "$HOME/.ghcup/bin/ghcup"
111111
- name: Install cabal-install
112112
run: |
113-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
113+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115115
- name: Install GHC (GHCup)
116116
if: matrix.setup-method == 'ghcup'
117117
run: |

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changes
22
=======
33

4+
* Drop support for GHC 7.
5+
6+
* Tested with GHC 8.0 - 9.12.2.
7+
48
Version 3.3.2 (18 Jul 2024)
59
-------------
610

Test/Tasty/Silver.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ module Test.Tasty.Silver
5858
where
5959

6060
import Control.Monad
61-
#if !(MIN_VERSION_base(4,8,0))
62-
import Data.Functor ( (<$>) )
63-
#endif
6461
import qualified Data.ByteString as BS
6562
import qualified Data.Set as Set
6663
import qualified Data.Text as T

Test/Tasty/Silver/Advanced.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ module Test.Tasty.Silver.Advanced
1717
)
1818
where
1919

20-
#if !(MIN_VERSION_base(4,8,0))
21-
import Data.Functor ( (<$>) )
22-
#endif
23-
2420
import Test.Tasty.Providers
2521
import Test.Tasty.Silver.Internal
2622
import qualified Data.Text as T

Test/Tasty/Silver/Interactive.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ import Control.Monad.State
4141
import Data.Char
4242
import Data.Maybe
4343
import Data.Monoid ( Any(..) )
44-
#if !(MIN_VERSION_base(4,8,0))
45-
import Data.Monoid ( Monoid(..) )
46-
#endif
4744
import Data.Proxy
4845
#if !(MIN_VERSION_base(4,11,0))
4946
import Data.Semigroup ( Semigroup(..) )

Test/Tasty/Silver/Internal.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import Control.Exception
1111
import Control.Monad.Identity
1212

1313
import Data.ByteString as SB
14-
#if !(MIN_VERSION_base(4,8,0))
15-
import Data.Functor ( (<$>) )
16-
#endif
1714
import Data.Maybe
1815
import Data.Proxy
1916
import Data.Typeable (Typeable)

tasty-silver.cabal

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ extra-source-files:
2929
README.md
3030

3131
tested-with:
32-
GHC == 9.12.1
33-
GHC == 9.10.1
32+
GHC == 9.12.2
33+
GHC == 9.10.2
3434
GHC == 9.8.4
3535
GHC == 9.6.6
3636
GHC == 9.4.8
@@ -42,11 +42,6 @@ tested-with:
4242
GHC == 8.4.4
4343
GHC == 8.2.2
4444
GHC == 8.0.2
45-
-- Drop testing with GHC 7
46-
-- GHC == 7.10.3
47-
-- GHC == 7.8.4
48-
-- GHC == 7.6.3
49-
5045

5146
Source-repository head
5247
type: git
@@ -64,15 +59,9 @@ library
6459
Test.Tasty.Silver.Interactive.Run
6560
Test.Tasty.Silver.Internal
6661

67-
if impl(ghc >= 8.0)
68-
ghc-options:
69-
-Wall
70-
-Wno-name-shadowing
71-
-Wcompat
72-
7362
build-depends:
74-
base >= 4.6 && < 5
75-
-- LambdaCase supported since GHC 7.6 (base-4.6)
63+
base >= 4.9 && < 5
64+
-- Drop support for GHC 7
7665
, ansi-terminal >= 0.6.2.1
7766
, async
7867
, bytestring >= 0.10.0.0
@@ -96,8 +85,11 @@ library
9685
, temporary
9786
, text >= 0.11.0.0
9887
, transformers >= 0.3
99-
if impl(ghc < 8.0)
100-
build-depends: semigroups >= 0.18.3
88+
89+
ghc-options:
90+
-Wall
91+
-Wno-name-shadowing
92+
-Wcompat
10193

10294
Test-suite test
10395
Default-language:
@@ -119,11 +111,8 @@ Test-suite test
119111
, silently
120112
, temporary
121113
, transformers
122-
if impl(ghc < 8.0)
123-
build-depends: semigroups
124114

125-
if impl(ghc >= 8.0)
126-
ghc-options:
127-
-Wall
128-
-Wno-name-shadowing
129-
-Wcompat
115+
ghc-options:
116+
-Wall
117+
-Wno-name-shadowing
118+
-Wcompat

tests/test.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ import Control.Monad ( unless )
99
import Control.Monad.IO.Class ( liftIO )
1010

1111
import Data.List (sort)
12-
#if !(MIN_VERSION_base(4,8,0))
13-
import Data.Functor ( (<$) )
14-
import Data.Monoid ( mempty )
15-
#endif
1612

1713
import System.Directory ( createDirectory, withCurrentDirectory )
1814
import System.FilePath

0 commit comments

Comments
 (0)