Skip to content

Commit

Permalink
Support GHC 8.10 (#376)
Browse files Browse the repository at this point in the history
* Support GHC 8.10

* Update .appveyor.yml

* Use "haskell-ci regenerate --copy-fields=all"

* .travis.yml: Remove -Werror=missing-methods options

GHC 8.0 can't handle them:
haskell-CI/haskell-ci#377

* Regenerate .travis.yml with fixed missing-methods handling

* Make haskell-ci incantation replicable

* Remove now redundant regenerate-travis.sh
  • Loading branch information
sjakobi authored Apr 6, 2020
1 parent 6df5655 commit 3eaa0fa
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 77 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ environment:
matrix:
# We don't get many build bots with Appveyor so we only include the
# latest for each major version.
- GHC_VERSION: "8.0.2"
- GHC_VERSION: "8.2.2"
- GHC_VERSION: "8.4.4"
- GHC_VERSION: "8.6.5"
- GHC_VERSION: "8.8.1"
- GHC_VERSION: "8.8.3"
- GHC_VERSION: "8.10.1"

cache:
- "C:\\SR"
Expand Down
134 changes: 73 additions & 61 deletions .travis.yml

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions bin/regenerate-travis.sh

This file was deleted.

3 changes: 2 additions & 1 deletion hedgehog-corpus/hedgehog-corpus.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ tested-with:
, GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
, GHC == 8.8.1
, GHC == 8.8.3
, GHC == 8.10.1
extra-source-files:
README.md

Expand Down
3 changes: 2 additions & 1 deletion hedgehog-dieharder/hedgehog-dieharder.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ tested-with:
, GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
, GHC == 8.8.1
, GHC == 8.8.3
, GHC == 8.10.1

executable dieharder-input
main-is:
Expand Down
5 changes: 3 additions & 2 deletions hedgehog-example/hedgehog-example.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ tested-with:
, GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
, GHC == 8.8.1
, GHC == 8.8.3
, GHC == 8.10.1

library
hs-source-dirs:
Expand Down Expand Up @@ -63,7 +64,7 @@ library
, process >= 1.2 && < 1.7
, QuickCheck >= 2.7 && < 2.14
, resourcet >= 1.1 && < 1.3
, template-haskell >= 2.10 && < 2.16
, template-haskell >= 2.10 && < 2.17
, temporary >= 1.3 && < 1.4
, temporary-resourcet >= 0.1 && < 0.2
, text >= 1.1 && < 1.3
Expand Down
3 changes: 2 additions & 1 deletion hedgehog-quickcheck/hedgehog-quickcheck.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ tested-with:
, GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
, GHC == 8.8.1
, GHC == 8.8.3
, GHC == 8.10.1
extra-source-files:
README.md
CHANGELOG.md
Expand Down
6 changes: 4 additions & 2 deletions hedgehog-test-laws/hedgehog-test-laws.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ tested-with:
, GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
, GHC == 8.8.1
, GHC == 8.8.3
, GHC == 8.10.1

source-repository head
type: git
Expand All @@ -53,7 +54,8 @@ test-suite test
build-depends:
hedgehog
, base >= 3 && < 5
, checkers >= 0.5 && < 0.6
-- https://github.com/conal/checkers/issues/44
, checkers >= 0.5 && < 0.5.5
, QuickCheck >= 2.7 && < 2.14
, tasty >= 1.2 && < 1.3
, tasty-expected-failure >= 0.11 && < 0.12
Expand Down
5 changes: 3 additions & 2 deletions hedgehog/hedgehog.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ tested-with:
, GHC == 8.2.2
, GHC == 8.4.4
, GHC == 8.6.5
, GHC == 8.8.1
, GHC == 8.8.3
, GHC == 8.10.1
extra-source-files:
README.md
CHANGELOG.md
Expand Down Expand Up @@ -69,7 +70,7 @@ library
, resourcet >= 1.1 && < 1.3
, semigroups >= 0.16 && < 0.20
, stm >= 2.4 && < 2.6
, template-haskell >= 2.10 && < 2.16
, template-haskell >= 2.10 && < 2.17
, text >= 1.1 && < 1.3
, time >= 1.4 && < 1.10
, transformers >= 0.5 && < 0.6
Expand Down

0 comments on commit 3eaa0fa

Please sign in to comment.