diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 1d6d0b6..b9b0415 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -23,8 +23,8 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.6.7", "9.8.4", "9.10.2", "9.12.2"] - cabal: ["3.14"] + ghc: ["9.6.7", "9.8.4", "9.10.2", "9.12.2", "9.14.1"] + cabal: ["3.16"] os: [ubuntu-latest, windows-latest, macOS-latest] steps: diff --git a/cabal.project b/cabal.project index aac0f4d..4114548 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ -index-state: hackage.haskell.org 2025-05-21T15:48:46Z +index-state: hackage.haskell.org 2026-03-03T01:46:20Z packages: rawlock @@ -9,3 +9,25 @@ package strict-checked-vars flags: +checktvarinvariants +checkmvarinvariants tests: True + +-- cabal-allow-newer +if impl (ghc >= 9.14) + allow-newer: + , aeson:containers + , aeson:template-haskell + , binary:containers + , indexed-traversable:base + , indexed-traversable:containers + , indexed-traversable-instances:base + , semialign:base + , semialign:containers + , semialign:indexed-traversable + , these:base + , tree-diff:base + , tree-diff:aeson + , tree-diff:base + , tree-diff:containers + , tree-diff:semialign + , tree-diff:these + , tree-diff:uuid-types + , uuid-types:template-haskell diff --git a/rawlock/rawlock.cabal b/rawlock/rawlock.cabal index a0db0a1..fe0ace1 100644 --- a/rawlock/rawlock.cabal +++ b/rawlock/rawlock.cabal @@ -59,9 +59,9 @@ library exposed-modules: Control.RAWLock default-extensions: ImportQualifiedPost build-depends: - base >=4.18 && <4.22, - io-classes:{io-classes, strict-mvar, strict-stm} ^>=1.8, - nothunks ^>=0.2, + base >=4.18 && <4.23, + io-classes:{io-classes, strict-mvar, strict-stm} ^>=1.8 || ^>=1.9, + nothunks ^>=0.2 || ^>=0.3, test-suite rawlock-test import: warnings diff --git a/resource-registry/resource-registry.cabal b/resource-registry/resource-registry.cabal index 39ce585..b760157 100644 --- a/resource-registry/resource-registry.cabal +++ b/resource-registry/resource-registry.cabal @@ -54,12 +54,12 @@ library import: warnings exposed-modules: Control.ResourceRegistry build-depends: - base >=4.14 && <4.22, + base >=4.14 && <4.23, bimap ^>=0.5, - containers >=0.6.7 && <0.8, - io-classes:{io-classes, strict-stm} ^>=1.8, + containers >=0.6.7 && <0.9, + io-classes:{io-classes, strict-stm} ^>=1.8 || ^>=1.9, mtl ^>=2.3, - nothunks ^>=0.2, + nothunks ^>=0.2 || ^>=0.3, hs-source-dirs: src default-language: Haskell2010 diff --git a/strict-checked-vars/strict-checked-vars.cabal b/strict-checked-vars/strict-checked-vars.cabal index 0cfec54..4becff7 100644 --- a/strict-checked-vars/strict-checked-vars.cabal +++ b/strict-checked-vars/strict-checked-vars.cabal @@ -57,7 +57,7 @@ library default-extensions: ImportQualifiedPost build-depends: base >=4.9 && <5, - io-classes:{io-classes, strict-mvar, strict-stm} ^>=1.8, + io-classes:{io-classes, strict-mvar, strict-stm} ^>=1.8 || ^>=1.9, ghc-options: -Wall @@ -91,7 +91,7 @@ test-suite test QuickCheck, base, io-classes, - io-sim, + io-sim <1.10, nothunks, strict-checked-vars, tasty,