Skip to content

Commit c305777

Browse files
committed
Support ghc-8.8.4
- Do not use ImportQualifiedPost so GHC-8.8.4 is supported as well.
1 parent b6b66ff commit c305777

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

.github/workflows/haskell.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@ jobs:
1111

1212
runs-on: ubuntu-latest
1313

14+
strategy:
15+
matrix:
16+
cabal: ["3.2"]
17+
ghc:
18+
- "8.10.2"
19+
- "8.8.4"
20+
1421
steps:
1522
- uses: actions/checkout@v2
1623
- uses: actions/setup-haskell@v1
1724
with:
18-
ghc-version: '8.10.2'
19-
cabal-version: '3.2'
25+
ghc-version: ${{ matrics.ghc }}
26+
cabal-version: ${{ matrix.cabal }}
2027

2128
- name: Cache
2229
uses: actions/cache@v1

cheops-logger/cheops-logger.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ library
5252
exposed-modules:
5353
Cheops.Logger
5454
default-extensions:
55-
ImportQualifiedPost
5655
RecordWildCards
5756
OverloadedStrings
5857
hs-source-dirs:

co-log-json/co-log-json.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ library
6666
DerivingStrategies
6767
FlexibleContexts
6868
GeneralizedNewtypeDeriving
69-
ImportQualifiedPost
7069
LambdaCase
7170
OverloadedStrings
7271
RecordWildCards

co-log-json/src/Colog/Json.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ import Colog.Core hiding (Severity)
6666
import Colog.Json.Internal.Structured
6767
import Control.Concurrent
6868
import Control.Monad.IO.Class
69-
import Data.Sequence qualified as Seq
70-
import Data.Text qualified as T
69+
import qualified Data.Sequence as Seq
70+
import qualified Data.Text as T
7171

7272
-- $logger-env
7373
--

co-log-json/src/Colog/Json/Action.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import Colog.Core
1010
import Colog.Json.Internal.Structured
1111
import Control.Exception
1212
import Data.Aeson.Encoding as Aeson
13-
import Data.ByteString.Builder qualified as Builder
13+
import qualified Data.ByteString.Builder as Builder
1414
import Data.Coerce
1515
import Data.Foldable
16-
import Data.List.NonEmpty qualified as NE
17-
import Data.Text.Lazy qualified as TL
18-
import Data.Text.Lazy.Builder qualified as TLB
16+
import qualified Data.List.NonEmpty as NE
17+
import qualified Data.Text.Lazy as TL
18+
import qualified Data.Text.Lazy.Builder as TLB
1919
import System.IO
2020

2121
-- | Dump logs to the output. On the contrary to the usual co-log functions this one

co-log-json/src/Colog/Json/Internal/Structured.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ import Data.Aeson.Encoding as Aeson
4646
import Data.Sequence
4747
import Data.String
4848
import Data.String.Conv
49-
import Data.Text qualified as T
50-
import Data.Text.Lazy.Builder qualified as TLB
49+
import qualified Data.Text as T
50+
import qualified Data.Text.Lazy.Builder as TLB
5151
import Foreign.C
5252
import GHC.Conc
5353
import GHC.Exts hiding (toList)

0 commit comments

Comments
 (0)