From c56bfe6978f14b77a8a4d13238cf739eb9da7db0 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 20 May 2024 10:16:24 +1000 Subject: [PATCH 1/2] Make it build with ghc 9.10 --- hedgehog-example/hedgehog-example.cabal | 2 +- hedgehog-test-laws/hedgehog-test-laws.cabal | 7 +++---- hedgehog-test-laws/test/test.hs | 3 +++ hedgehog/hedgehog.cabal | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hedgehog-example/hedgehog-example.cabal b/hedgehog-example/hedgehog-example.cabal index 7c340df3..38ffbf44 100644 --- a/hedgehog-example/hedgehog-example.cabal +++ b/hedgehog-example/hedgehog-example.cabal @@ -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.22 + , template-haskell >= 2.10 && < 2.23 , temporary >= 1.3 && < 1.4 , temporary-resourcet >= 0.1 && < 0.2 , text >= 1.1 && < 2.2 diff --git a/hedgehog-test-laws/hedgehog-test-laws.cabal b/hedgehog-test-laws/hedgehog-test-laws.cabal index 0dab070b..ab6bd392 100644 --- a/hedgehog-test-laws/hedgehog-test-laws.cabal +++ b/hedgehog-test-laws/hedgehog-test-laws.cabal @@ -54,13 +54,12 @@ test-suite test build-depends: hedgehog , base >= 3 && < 5 - -- https://github.com/conal/checkers/issues/44 - , checkers >= 0.5 && < 0.5.5 + , checkers >= 0.5 && < 0.8 , QuickCheck >= 2.10 && < 2.16 - , tasty >= 1.2 && < 1.3 + , tasty >= 1.2 && < 1.6 , tasty-expected-failure >= 0.11 && < 0.12 , tasty-quickcheck >= 0.10 && < 0.11 - , transformers >= 0.5 && < 0.6 + , transformers >= 0.5 && < 0.7 if impl(ghc < 8.0) buildable: False diff --git a/hedgehog-test-laws/test/test.hs b/hedgehog-test-laws/test/test.hs index ca7a7a10..fe924d50 100644 --- a/hedgehog-test-laws/test/test.hs +++ b/hedgehog-test-laws/test/test.hs @@ -1,7 +1,10 @@ +{-# LANGUAGE CPP #-} {-# OPTIONS_GHC -fno-warn-orphans #-} module Main where +#if !MIN_VERSION_base(4,18,0) import Control.Applicative (liftA2) +#endif import Data.Functor.Classes (Eq1(..)) diff --git a/hedgehog/hedgehog.cabal b/hedgehog/hedgehog.cabal index 9387cda5..306ef5d4 100644 --- a/hedgehog/hedgehog.cabal +++ b/hedgehog/hedgehog.cabal @@ -72,7 +72,7 @@ library , resourcet >= 1.1 && < 1.4 , safe-exceptions >= 0.1 && < 0.2 , stm >= 2.4 && < 2.6 - , template-haskell >= 2.10 && < 2.22 + , template-haskell >= 2.10 && < 2.23 , text >= 1.1 && < 2.2 , time >= 1.4 && < 1.15 , transformers >= 0.5 && < 0.7 From 6f36655c014e2bceb0e917b8172d07fdc788cc34 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 20 May 2024 14:16:22 +1000 Subject: [PATCH 2/2] CI: Add ghc-9.10 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 5408ffd9..d5c433e1 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.0.2", "8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.2.7", "9.4.4", "9.8.1"] + ghc: ["8.0.2", "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"] exclude: # https://github.com/haskell/text/pull/404 - os: windows-latest