diff --git a/.travis.yml b/.travis.yml index 2bef546d3..a5131aecd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ env: - CABALVER=1.22 GHCVER=7.10.2 - CABALVER=1.22 GHCVER=7.10.3 - CABALVER=1.24 GHCVER=8.0.1 - - CABALVER=2.0 GHCVER=8.2.1 - CABALVER=2.0 GHCVER=8.2.2 + - CABALVER=2.2 GHCVER=8.4.1 # Note: the distinction between `before_install` and `install` is not # important. diff --git a/README.md b/README.md index 7e13d6c88..370b777ad 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,8 @@ Supports: * GHC 7.10.3 * GHC 8.0.1 * GHC 8.0.2 + * GHC 8.2.1 + * GHC 8.4.1 * GHC HEAD Usage @@ -90,22 +92,22 @@ libraries that are universally common across most real-world projects. Lower and upper bounds are fully specified and compatible with both vanilla Cabal and tracks Stack LTS resolver. -| Dependencies | Lower | Upper | -| ----------- | -------- | -------- | -| array | 0.4 | 0.6 | -| async | 2.0 | 2.2 | -| base | 4.6 | 4.11 | -| bytestring | 0.10 | 0.11 | -| containers | 0.5 | 0.6 | -| deepseq | 1.3 | 1.5 | -| ghc-prim | 0.3 | 0.6 | -| integer-gmp | 1.0 | 1.0 | -| mtl | 2.1 | 2.3 | -| safe | 0.3 | 0.4 | -| stm | 2.4 | 2.5 | -| text | 1.2 | 1.3 | -| hashable | 1.2 | 1.3 | -| transformers | 0.4 | 0.6 | +| Dependencies | Lower (>=) | Upper (<) | +| ----------- | -------- | -------- | +| array | 0.4 | 0.6 | +| async | 2.0 | 2.3 | +| base | 4.6 | 4.12 | +| bytestring | 0.10 | 0.11 | +| containers | 0.5 | 0.6 | +| deepseq | 1.3 | 1.5 | +| ghc-prim | 0.3 | 0.6 | +| hashable | 1.2 | 1.3 | +| mtl | 2.1 | 2.3 | +| safe | 0.3 | 0.4 | +| stm | 2.4 | 2.5 | +| text | 1.2 | 1.3 | +| transformers | 0.4 | 0.6 | +| | | | Structure --------- diff --git a/protolude.cabal b/protolude.cabal index 66853bcfb..8cee067c0 100644 --- a/protolude.cabal +++ b/protolude.cabal @@ -24,10 +24,9 @@ tested-with: GHC == 7.10.2, GHC == 7.10.3, GHC == 8.0.1, - GHC == 8.2.1 + GHC == 8.2.1, + GHC == 8.4.1 -description: - A sensible set of defaults for writing custom Preludes. Source-Repository head type: git location: git@github.com:sdiehl/protolude.git @@ -64,7 +63,7 @@ library -fwarn-implicit-prelude build-depends: - base >= 4.6 && <4.11, + base >= 4.6 && <4.12, array >= 0.4 && <0.6, ghc-prim >= 0.3 && <0.6, async >= 2.0 && <2.3, diff --git a/stack-11.0.yaml b/stack-11.0.yaml new file mode 100644 index 000000000..d487ddd51 --- /dev/null +++ b/stack-11.0.yaml @@ -0,0 +1,6 @@ +resolver: lts-11.0 +packages: +- '.' +extra-deps: +flags: {} +extra-package-dbs: [] diff --git a/test_stack_lts.sh b/test_stack_lts.sh index d6f40cabf..69be9fdf0 100755 --- a/test_stack_lts.sh +++ b/test_stack_lts.sh @@ -15,3 +15,6 @@ STACK_YAML=stack-9.0.yaml stack build --no-terminal echo -e "\e[92mLTS 10.0" STACK_YAML=stack-10.0.yaml stack build --no-terminal + +echo -e "\e[92mLTS 11.0" +STACK_YAML=stack-11.0.yaml stack build --no-terminal