diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc7e3e3..1ef6357 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ jobs: stack_yaml: - stack-ghc-8.10.yaml - stack-ghc-9.0.yaml + # - stack-ghc-9.2.yaml + - stack-ghc-9.4.yaml - stack-persistent-2.13.yaml - stack-persistent-2.14.yaml include: @@ -20,7 +22,7 @@ jobs: latest: true name: build_and_test (${{ matrix.stack_yaml }}) - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 services: postgres: image: postgres:13.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e7dd09..832b9e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Unreleased +# v0.5.0.1 + +* Add GHC 9.4 support + # v0.5.0.0 * Export `SqlQueryT` constructor ([#46](https://github.com/brandonchinn178/persistent-mtl/pull/46)) diff --git a/package.yaml b/package.yaml index f57e0a2..8408f14 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: persistent-mtl -version: 0.5.0.0 +version: 0.5.0.1 maintainer: Brandon Chinn synopsis: Monad transformer for the persistent API description: | @@ -19,21 +19,28 @@ github: brandonchinn178/persistent-mtl library: source-dirs: src dependencies: - - base >= 4.14 && < 4.16 + - base >= 4.14 && < 5 - conduit >= 1.3.4 && < 1.4 - containers >= 0.6 && < 0.7 - exceptions >= 0.10 && < 0.11 - monad-logger >= 0.3 && < 0.4 - mtl >= 2.2.2 && < 2.3 - persistent >= 2.13 && < 2.15 - - resource-pool >= 0.2.3.2 && < 0.3 + - resource-pool >= 0.2.3.2 && < 0.4 - resourcet >= 1.2.4 && < 1.3 - - text >= 1.2.4 && < 1.3 + - text >= 1.2.4 && < 2.1 - transformers >= 0.5.6 && < 0.6 - unliftio >= 0.2 && < 0.3 - unliftio-core >= 0.2 && < 0.3 - unliftio-pool >= 0.2 && < 0.3 + when: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20836 + - condition: > + impl(ghc >= 9.2.0) && impl(ghc < 9.3) || + impl(ghc >= 9.4.0) && impl(ghc < 9.4.3) + buildable: false + tests: persistent-mtl-test: source-dirs: test diff --git a/persistent-mtl.cabal b/persistent-mtl.cabal index 57821ae..4e728d7 100644 --- a/persistent-mtl.cabal +++ b/persistent-mtl.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: persistent-mtl -version: 0.5.0.0 +version: 0.5.0.1 synopsis: Monad transformer for the persistent API description: A monad transformer and mtl-style type class for using the persistent API directly in your monad transformer stack. @@ -44,21 +44,24 @@ library src ghc-options: -Wall build-depends: - base >=4.14 && <4.16 + base >=4.14 && <5 , conduit >=1.3.4 && <1.4 , containers ==0.6.* , exceptions ==0.10.* , monad-logger ==0.3.* , mtl >=2.2.2 && <2.3 , persistent >=2.13 && <2.15 - , resource-pool >=0.2.3.2 && <0.3 + , resource-pool >=0.2.3.2 && <0.4 , resourcet >=1.2.4 && <1.3 - , text >=1.2.4 && <1.3 + , text >=1.2.4 && <2.1 , transformers >=0.5.6 && <0.6 , unliftio ==0.2.* , unliftio-core ==0.2.* , unliftio-pool ==0.2.* default-language: Haskell2010 + if impl(ghc >= 9.2.0) && impl(ghc < 9.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.4.3) + + buildable: False test-suite persistent-mtl-test type: exitcode-stdio-1.0 diff --git a/stack-ghc-9.0.yaml b/stack-ghc-9.0.yaml index 891a385..2639d08 100644 --- a/stack-ghc-9.0.yaml +++ b/stack-ghc-9.0.yaml @@ -1,4 +1,4 @@ -resolver: lts-19.20 +resolver: lts-19.33 extra-deps: - tasty-autocollect-0.3.0.0 diff --git a/stack-ghc-9.2.yaml b/stack-ghc-9.2.yaml new file mode 100644 index 0000000..f634972 --- /dev/null +++ b/stack-ghc-9.2.yaml @@ -0,0 +1,12 @@ +resolver: lts-20.0 + +extra-deps: + # https://github.com/yesodweb/persistent/issues/1406#issuecomment-1226741099 + - persistent-2.13.3.3 + +flags: + explainable-predicates: + regex: false + +ghc-options: + "$locals": -Werror diff --git a/stack-ghc-9.4.yaml b/stack-ghc-9.4.yaml new file mode 100644 index 0000000..f11aa8c --- /dev/null +++ b/stack-ghc-9.4.yaml @@ -0,0 +1,11 @@ +resolver: nightly-2022-11-19 + +extra-deps: + - tasty-autocollect-0.3.2.0 + +flags: + explainable-predicates: + regex: false + +ghc-options: + "$locals": -Werror diff --git a/stack.yaml.lock b/stack.yaml.lock index d079b18..b51eb48 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -7,20 +7,20 @@ packages: - completed: hackage: tasty-autocollect-0.3.0.0@sha256:9026c5a96bb871513a4213ae3c9105538f12bb5ad6400fe05a56c69e6fc85424,4734 pantry-tree: - size: 3903 sha256: e796c1754a91aec1953da308cf5d9751a6b2bd219666fb2fe89672a244d7ba13 + size: 3903 original: hackage: tasty-autocollect-0.3.0.0 - completed: hackage: persistent-2.13.3.3@sha256:4161988646638cfeb9e5fbd6020c25bc32718d3916b200b3b7861bb236e674d4,6839 pantry-tree: - size: 6052 sha256: dedf843319b92d1f00b61ecdf1d99c550860fe01360a00dbd5c90313267b43c7 + size: 6052 original: hackage: persistent-2.13.3.3 snapshots: - completed: - size: 619173 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/20.yaml - sha256: be747117bed6d462806c883352c3206325b23480825103f5c87884e97e52819a - original: lts-19.20 + sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4 + size: 619204 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml + original: lts-19.33 diff --git a/test/Example.hs b/test/Example.hs index 5f87d9f..cbe96b1 100644 --- a/test/Example.hs +++ b/test/Example.hs @@ -9,6 +9,7 @@ {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} {-# OPTIONS_GHC -Wno-missing-methods #-} {-# OPTIONS_GHC -Wno-unused-top-binds #-}