Drop support for GHC 8.4.*, update and fix dependencies (#405)

* Drop support for GHC 8.4.*, update and fix dependencies

* Remove 8.4.4 from CI

* Remove references to loopbreaker
This commit is contained in:
TheMatten 2021-03-20 22:46:57 +01:00 committed by GitHub
parent 2dfcd30ad6
commit dc16f081f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 20 deletions

View File

@ -12,7 +12,6 @@ matrix:
- ghc: "8.10.1"
- ghc: "8.8.1"
- ghc: "8.6.5"
- ghc: "8.4.4"
install:
- cabal --version
@ -36,4 +35,3 @@ script:
- cabal v2-build polysemy-plugin
- cabal v2-test --enable-test polysemy-plugin

View File

@ -9,7 +9,6 @@ let
polysemy-plugin = c2n "polysemy-plugin" ../polysemy-plugin;
first-class-families =
hackage "first-class-families" "0.8.0.1" "0h1rxbc7zsxrlhx5xcl58wjx3qi2wny8wb3sk7c1qnydf4ckcckz";
ghc-lib = hackage "ghc-lib" "0.20190204" "1i2zjlr30bxpabsm8f995x455v847gbpzczm2w4089fqmsnzpzfd";
dump-core = hackage "dump-core" "0.1.3.2" "1mi8p736yn00z549pwnjv4ydwbs8mwg6dla3ly447c027nq8py6g";
monadLib = hackage "monadLib" "3.10" "1v4ynjcb963s3lfw3v71qdzvld1mmz1faf8swhvicma5jbvwchy2";
};

View File

@ -59,10 +59,6 @@ when:
- MonadFailDesugaring
- TypeInType
# - condition: impl(ghc >= 8.7)
# dependencies:
# - loopbreaker >= 0.1 && < 0.2
flags:
dump-core:
description: Dump HTML for the core generated by GHC during compilation
@ -92,13 +88,6 @@ library:
dependencies:
- unsupported-ghc-version > 1 && < 1
# We use this plugin to get to more agressive inlining without need for
# explicit "loopbreakers" in function definitions all over ther codebase
# --- sadly it can only work on newer versions of GHC currently
# - condition: impl(ghc >= 8.7)
# ghc-options:
# - -fplugin=Loopbreaker
- condition: flag(error-messages)
then:
# dummy value because cabal is stupid

View File

@ -18,7 +18,7 @@ description: Please see the README on GitHub at <https://github.com/isov
dependencies:
- base >= 4.9 && < 5
- ghc >= 8.4.4 && < 9
- ghc >= 8.6.5 && < 9
- ghc-tcplugins-extra >= 0.3 && < 0.5
- polysemy >= 1.3
- syb >= 0.7 && < 0.8

View File

@ -66,7 +66,7 @@ library
build-depends:
base >=4.9 && <5
, containers >=0.5 && <0.7
, ghc >=8.4.4 && <9
, ghc >=8.6.5 && <9
, ghc-tcplugins-extra >=0.3 && <0.5
, polysemy >=1.3
, syb ==0.7.*
@ -112,7 +112,7 @@ test-suite polysemy-plugin-test
base >=4.9 && <5
, containers >=0.5 && <0.7
, doctest >=0.16.0.1 && <0.17
, ghc >=8.4.4 && <9
, ghc >=8.6.5 && <9
, ghc-tcplugins-extra >=0.3 && <0.5
, hspec >=2.6.0 && <3
, inspection-testing >=0.4.2 && <0.5

View File

@ -1,11 +1,10 @@
resolver: lts-16.1
resolver: lts-16.31
packages:
- .
- polysemy-plugin
extra-deps:
- first-class-families-0.8.0.0
- ghc-lib-0.20190204
- dump-core-0.1.3.2 # used when the dump-core flag is toggled
- monadLib-3.10 # used by the dump-core library when the dump-core flag is toggled