From 9b51471deeb184571fb8d6964b91a16e9dd2bd1a Mon Sep 17 00:00:00 2001 From: Veronika Romashkina Date: Mon, 6 Apr 2020 20:04:26 +0100 Subject: [PATCH] [#22] Support GHC-8.10 Resolves #22 --- .github/workflows/ci.yml | 9 +++++++-- .travis.yml | 1 + CHANGELOG.md | 5 +++++ colourista.cabal | 8 ++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4ffe94..c01995c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,12 @@ jobs: runs-on: ubuntu-16.04 strategy: matrix: - ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.1"] + ghc: + - "8.2.2" + - "8.4.4" + - "8.6.5" + - "8.8.1" + - "8.10.1" cabal: ["3.0"] steps: @@ -40,4 +45,4 @@ jobs: - name: Test run: | - cabal test --enable-tests \ No newline at end of file + cabal test --enable-tests diff --git a/.travis.yml b/.travis.yml index 9124821..f15c0d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ matrix: - ghc: 8.4.4 - ghc: 8.6.5 - ghc: 8.8.2 + - ghc: 8.10.1 - ghc: 8.8.2 env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml" diff --git a/CHANGELOG.md b/CHANGELOG.md index f463eb5..1878d2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ `colourista` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## Unreleased + +* [#22](https://github.com/kowainik/colourista/issues/22): + Support GHC-8.10. + ## 0.0.0.0 — Feb 16, 2020 🌈 * Initially created. diff --git a/colourista.cabal b/colourista.cabal index e8d6b34..8e73dd1 100644 --- a/colourista.cabal +++ b/colourista.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: colourista -version: 0.0.0.0 +version: 0.0.0.1 synopsis: Convenient interface for printing colourful messages description: Convenient interface for printing colourful messages based on the @ansi-terminal@ library. homepage: https://github.com/kowainik/colourista @@ -18,6 +18,7 @@ tested-with: GHC == 8.2.2 GHC == 8.4.4 GHC == 8.6.5 GHC == 8.8.2 + GHC == 8.10.1 source-repository head type: git @@ -29,7 +30,7 @@ library Colourista.IO Colourista.Pure - build-depends: base >= 4.10.1.0 && < 4.14 + build-depends: base >= 4.10.1.0 && < 4.15 , ansi-terminal ^>= 0.10 , bytestring ^>= 0.10 , text ^>= 1.2.3.0 @@ -44,10 +45,13 @@ library if impl(ghc >= 8.8.1) ghc-options: -Wmissing-deriving-strategies -Werror=missing-deriving-strategies + if impl(ghc >= 8.10.1) + ghc-options: -Wunused-packages default-language: Haskell2010 default-extensions: ConstraintKinds DeriveGeneric + DerivingStrategies GeneralizedNewtypeDeriving InstanceSigs KindSignatures