diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 5d520a13..0f851fcd 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -25,8 +25,8 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.6", "9.8", "9.10", "9.12"] - cabal: ["3.14"] + ghc: ["9.6", "9.8", "9.10", "9.12", "9.14"] + cabal: ["3.16"] sys: - { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' } - { os: ubuntu-latest, shell: bash } diff --git a/cabal.project b/cabal.project index d18bdf50..13ba7680 100644 --- a/cabal.project +++ b/cabal.project @@ -9,3 +9,27 @@ program-options jobs: $ncpus semaphore: True +if impl (ghc >= 9.14) + allow-newer: + , aeson:containers + , aeson:indexed-traversable + , aeson:template-haskell + , aeson:these + , binary:containers + , boring:base + , cborg:base + , cborg:bytestring + , cborg:containers + , indexed-traversable:base + , indexed-traversable:containers + , indexed-traversable-instances:base + , semialign:base + , semialign:containers + , serialise:base + , serialise:bytestring + , serialise:cborg + , serialise:containers + , text:bytestring + , these:base + , transformers:base + , uuid-types:template-haskell diff --git a/hedgehog-extras.cabal b/hedgehog-extras.cabal index 74b84ebd..870b6888 100644 --- a/hedgehog-extras.cabal +++ b/hedgehog-extras.cabal @@ -20,7 +20,7 @@ source-repository head common aeson { build-depends: aeson >= 2.0.0.0 && < 2.3 } common aeson-pretty { build-depends: aeson-pretty >= 0.8.5 && < 0.9 } common async { build-depends: async < 2.3 } -common base { build-depends: base >= 4.12 && < 4.22 } +common base { build-depends: base >= 4.12 && < 4.23 } common bytestring { build-depends: bytestring < 0.13 } common containers { build-depends: containers < 0.9 } common deepseq { build-depends: deepseq < 1.6 }