From f26928441de33cc51813f8999e4d6af83efc5838 Mon Sep 17 00:00:00 2001 From: Veronika Romashkina Date: Thu, 21 May 2020 11:23:19 +0100 Subject: [PATCH] [#443] Test Summoner with GHC-8.10 (#463) * [#443] Test Summoner with GHC-8.10 Resolves #443 * Do not build test projects with 8.10.1 yet --- .github/workflows/ci.yml | 10 +++++++--- CHANGELOG.md | 4 ++++ summoner-cli/summoner.cabal | 8 +++++--- summoner-tui/summoner-tui.cabal | 8 +++++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12e99128..54751571 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ jobs: - "8.4.4" - "8.6.5" - "8.8.3" + - "8.10.1" steps: - uses: actions/checkout@v2 @@ -50,19 +51,22 @@ jobs: echo "packages: ." > cabal.project cabal v2-build all - - name: Build 'cabal-full' + - if: matrix.ghc != '8.10.1' + name: Build 'cabal-full' run: | cd "summoner-cli/examples/cabal-full/" echo "packages: ." > cabal.project cabal v2-build all - - name: Build 'stack-full' + - if: matrix.ghc != '8.10.1' + name: Build 'stack-full' run: | cd "summoner-cli/examples/stack-full/" echo "packages: ." > cabal.project cabal v2-build all - - name: Build 'full-batteries' + - if: matrix.ghc != '8.10.1' + name: Build 'full-batteries' run: | cd "summoner-cli/examples/full-batteries/" echo "packages: ." > cabal.project diff --git a/CHANGELOG.md b/CHANGELOG.md index a151d18f..45412837 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The changelog is available [on GitHub][2]. ## Unreleased +* [#443](https://github.com/kowainik/summoner/issues/443): + Support GHC-8.10.1 for `Summoner` project. * [#459](https://github.com/kowainik/summoner/issues/459): Bump up `tomland` version to `1.3.0.0`. * [#460](https://github.com/kowainik/summoner/issues/460): @@ -16,6 +18,8 @@ The changelog is available [on GitHub][2]. * [#452](https://github.com/kowainik/summoner/issues/452): Bump up `colourista` version to `0.1.0.0`. Remove the `Summoner.Ansi` module. +* __#TUI__ Bump up `brick` upper bound to allow `0.53`. +* __#CLI__ Bump up `time` upper bound to allow `1.10`. ## 2.0.0.0 – Mar 28, 2019 diff --git a/summoner-cli/summoner.cabal b/summoner-cli/summoner.cabal index 6731c786..ff57bd21 100644 --- a/summoner-cli/summoner.cabal +++ b/summoner-cli/summoner.cabal @@ -19,6 +19,7 @@ extra-doc-files: README.md tested-with: GHC == 8.4.4 GHC == 8.6.5 GHC == 8.8.3 + GHC == 8.10.1 extra-source-files: examples/summoner-default.toml @@ -71,7 +72,7 @@ source-repository head location: git@github.com:kowainik/summoner.git common common-options - build-depends: base >= 4.11 && < 4.14 + build-depends: base >= 4.11 && < 4.15 , relude ^>= 0.7.0.0 mixins: base hiding (Prelude) @@ -94,6 +95,8 @@ common common-options if impl(ghc >= 8.8) ghc-options: -Wmissing-deriving-strategies -Werror=missing-deriving-strategies + if impl(ghc >= 8.10) + ghc-options: -Wunused-packages default-extensions: DeriveGeneric DerivingStrategies @@ -137,7 +140,6 @@ library other-modules: Paths_summoner build-depends: aeson >= 1.2.4.0 && < 1.5 - , bytestring ^>= 0.10.8.2 , colourista ^>= 0.1 , containers ^>= 0.6 , directory ^>= 1.3.0.2 @@ -149,7 +151,7 @@ library , process ^>= 1.6.1.0 , shellmet ^>= 0.0.3.0 , text ^>= 1.2.3.0 - , time >= 1.8 && < 1.10 + , time >= 1.8 && < 1.11 , tomland ^>= 1.3.0.0 , validation-selective >= 0.0.0.0 && < 0.2 diff --git a/summoner-tui/summoner-tui.cabal b/summoner-tui/summoner-tui.cabal index 3adf220d..e8b07e14 100644 --- a/summoner-tui/summoner-tui.cabal +++ b/summoner-tui/summoner-tui.cabal @@ -19,13 +19,14 @@ extra-doc-files: README.md tested-with: GHC == 8.4.4 GHC == 8.6.5 GHC == 8.8.3 + GHC == 8.10.1 source-repository head type: git location: git@github.com:kowainik/summoner.git common common-options - build-depends: base >= 4.11 && < 4.14 + build-depends: base >= 4.11 && < 4.15 , relude ^>= 0.7.0.0 mixins: base hiding (Prelude) @@ -47,6 +48,8 @@ common common-options if impl(ghc >= 8.8) ghc-options: -Wmissing-deriving-strategies -Werror=missing-deriving-strategies + if impl(ghc >= 8.10) + ghc-options: -Wunused-packages default-extensions: DeriveGeneric DerivingStrategies @@ -76,10 +79,9 @@ library autogen-modules: Paths_summoner_tui other-modules: Paths_summoner_tui - build-depends: brick >= 0.47 && < 0.53 + build-depends: brick >= 0.47 && < 0.54 , colourista ^>= 0.1 , directory ^>= 1.3.0.2 - , filepath ^>= 1.4.1.2 , microlens ^>= 0.4 , microlens-th ^>= 0.4 , summoner ^>= 2.0.0.0