From 2508cbed63e2bfbe944dbbec8b4d9be2c23e6453 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 20 Dec 2024 10:11:54 +1100 Subject: [PATCH 1/2] Support ghc 9.12 --- cabal.project | 7 +++++++ hedgehog-example/hedgehog-example.cabal | 4 ++-- hedgehog/hedgehog.cabal | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index e25a1cd2..835891f1 100644 --- a/cabal.project +++ b/cabal.project @@ -28,3 +28,10 @@ package hedgehog-quickcheck ghc-options: -Wall -Werror package hedgehog-test-laws ghc-options: -Wall -Werror + +if impl(ghc >= 9.12) + allow-newer: + , assoc:base + , boring:base + , indexed-traversable:base + , unordered-containers:template-haskell diff --git a/hedgehog-example/hedgehog-example.cabal b/hedgehog-example/hedgehog-example.cabal index 426e6ff6..9df1de05 100644 --- a/hedgehog-example/hedgehog-example.cabal +++ b/hedgehog-example/hedgehog-example.cabal @@ -57,7 +57,7 @@ library , containers >= 0.4 && < 0.8 , directory >= 1.0 && < 1.4 , filepath >= 1.3 && < 1.6 - , hashtables >= 1.2 && < 1.4 + , hashtables >= 1.2 && < 1.5 , lifted-base >= 0.2 && < 0.3 , mmorph >= 1.0 && < 1.3 , mtl >= 2.1 && < 2.4 @@ -66,7 +66,7 @@ library , process >= 1.2 && < 1.7 , QuickCheck >= 2.7 && < 2.16 , resourcet >= 1.1 && < 1.4 - , template-haskell >= 2.10 && < 2.23 + , template-haskell >= 2.10 && < 2.24 , temporary >= 1.3 && < 1.4 , temporary-resourcet >= 0.1 && < 0.2 , text >= 1.1 && < 2.2 diff --git a/hedgehog/hedgehog.cabal b/hedgehog/hedgehog.cabal index 942bc1cd..ea9a6d36 100644 --- a/hedgehog/hedgehog.cabal +++ b/hedgehog/hedgehog.cabal @@ -71,7 +71,7 @@ library , resourcet >= 1.1 && < 1.4 , safe-exceptions >= 0.1 && < 0.2 , stm >= 2.4 && < 2.6 - , template-haskell >= 2.10 && < 2.23 + , template-haskell >= 2.10 && < 2.24 , text >= 1.1 && < 2.2 , time >= 1.4 && < 1.15 , transformers >= 0.5 && < 0.7 From 6223149fc90c5763efe08b3990c10f09196f01e9 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 20 Dec 2024 10:11:59 +1100 Subject: [PATCH 2/2] CI: Add ghc 9.12 to the build matrix --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b3f1374d..c3fe8ffc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ jobs: matrix: os: [macos-latest, ubuntu-latest, windows-latest] cabal: ["3.10.1.0"] - ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.2.7", "9.4.4", "9.8.2", "9.10.1"] + ghc: ["8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.2", "9.4", "9.8", "9.10", "9.12"] exclude: # https://github.com/haskell/text/pull/404 - os: windows-latest