Updates

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
       -
         name: Generate coverage data
         run: |
-          HPC_LCOV_VERSION=1.1.1
+          HPC_LCOV_VERSION=1.2.0
           curl -fsSL \
             "https://github.com/brandonchinn178/hpc-lcov/releases/download/v${HPC_LCOV_VERSION}/hpc-lcov-${HPC_LCOV_VERSION}-linux-x86_64" \
             -o /usr/local/bin/hpc-lcov
@@ -57,13 +57,13 @@ jobs:
     strategy:
       matrix:
         ghc_version:
-          - '9.4'
-          - '9.6'
           - '9.8'
+          - '9.10'
+          # - '9.12'  # persistent + http-api-data do not support 9.12 yet
         persistent_version:
           - '2.14'
         include:
-          - ghc_version: '9.4.4'
+          - ghc_version: '9.8.1'
             persistent_version: '2.14'
             oldest: true
 
@@ -84,30 +84,16 @@ jobs:
         run:
           cabal configure
             --enable-test
-            --test-options='--color=always'
             --test-show-details=streaming
             --constraint='persistent ^>= ${{ matrix.persistent_version }}'
             --constraint='persistent >= 2.14.0.2'
-      -
-        # https://github.com/bitemyapp/esqueleto/pull/381
-        if: ${{ matrix.ghc_version == '9.8' }}
-        name: Patch esqueleto
-        run: |
-          cabal configure --enable-append --allow-newer esqueleto:text
-          cat >> cabal.project.local <<EOF
-          source-repository-package
-            type: git
-            location: https://github.com/MercuryTechnologies/esqueleto.git
-            tag: 94d27de57072a823d97bd9868b33c45545c067c4
-          EOF
       -
         if: ${{ matrix.oldest }}
         name: Use oldest dependencies
         run:
           cabal configure
             --enable-append --prefer-oldest
-            --constraint 'array installed'
-            --constraint 'time installed'
+            --constraint 'fast-logger > 3.1.2'
             --constraint 'persistent-sqlite > 2.13.0.3'
             --constraint 'silently >= 0.0.3'
             --constraint 'string-conversions >= 0.4'
@@ -173,7 +159,7 @@ jobs:
         name: Create sdist bundle
         run: stack sdist --test-tarball --tar-dir .
       -
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: persistent-mtl-sdist
           path: persistent-mtl-*.tar.gz

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       -
         uses: actions/checkout@v3
       -
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: persistent-mtl-sdist
           path: ./sdist/

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# v0.5.2
+
+* Add GHC 9.10 support
+* Drop support for GHC < 9.8
+
 # v0.5.1
 
 * Add GHC 9.8 support

package.yaml

@@ -1,5 +1,5 @@
 name: persistent-mtl
-version: 0.5.1
+version: 0.5.2
 maintainer: Brandon Chinn <[email protected]>
 synopsis: Monad transformer for the persistent API
 description: |
@@ -10,7 +10,7 @@ license: BSD3
 extra-source-files:
   - CHANGELOG.md
   - README.md
-  - test/goldens/**/*.golden
+  - test/**/*.snap.md
 
 ghc-options: -Wall -Wcompat -Wunused-packages
 
@@ -19,20 +19,20 @@ github: brandonchinn178/persistent-mtl
 library:
   source-dirs: src
   dependencies:
-    - base >= 4.14 && < 5
-    - conduit < 1.4
-    - containers < 0.8
-    - exceptions < 0.11
-    - monad-logger < 0.4
-    - mtl < 2.4
-    - persistent >= 2.13 && < 2.15
-    - resource-pool < 1
-    - resourcet < 1.4
-    - text < 2.2
-    - transformers < 0.7
-    - unliftio < 0.3
-    - unliftio-core < 0.3
-    - unliftio-pool < 1
+    - base < 5
+    - conduit
+    - containers
+    - exceptions
+    - monad-logger
+    - mtl
+    - persistent
+    - resource-pool
+    - resourcet
+    - text
+    - transformers
+    - unliftio
+    - unliftio-core
+    - unliftio-pool
 
   when:
     # https://gitlab.haskell.org/ghc/ghc/-/issues/20836
@@ -44,26 +44,22 @@ tests:
   persistent-mtl-test:
     source-dirs: test
     main: Main.hs
-    ghc-options: -F -pgmF=tasty-autocollect
+    ghc-options: -F -pgmF=skeletest-preprocessor
     build-tools:
-      - tasty-autocollect:tasty-autocollect
+      - skeletest:skeletest-preprocessor
     dependencies:
       - base
       - bytestring
       - conduit
       - containers
-      - esqueleto >= 3.5.4.1
-      - explainable-predicates >= 0.1.2.0
+      - esqueleto >= 3.5.14.0
       - monad-logger
       - persistent
       - persistent-mtl
       - persistent-postgresql >= 2.13.0.0
       - persistent-sqlite >= 2.13.0.3
       - resource-pool
       - resourcet
-      - tasty
-      - tasty-autocollect >= 0.2.0.0
-      - tasty-golden
-      - tasty-hunit
+      - skeletest >= 0.2.1
       - text
       - unliftio

persistent-mtl.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           persistent-mtl
-version:        0.5.1
+version:        0.5.2
 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.
@@ -19,8 +19,7 @@ build-type:     Simple
 extra-source-files:
     CHANGELOG.md
     README.md
-    test/goldens/persistent-2.13/sqlqueryrep_show_representation.golden
-    test/goldens/persistent-2.14/sqlqueryrep_show_representation.golden
+    test/__snapshots__/SqlQueryRepSpec.snap.md
 
 source-repository head
   type: git
@@ -44,20 +43,20 @@ library
       src
   ghc-options: -Wall -Wcompat -Wunused-packages
   build-depends:
-      base >=4.14 && <5
-    , conduit <1.4
-    , containers <0.8
-    , exceptions <0.11
-    , monad-logger <0.4
-    , mtl <2.4
-    , persistent >=2.13 && <2.15
-    , resource-pool <1
-    , resourcet <1.4
-    , text <2.2
-    , transformers <0.7
-    , unliftio <0.3
-    , unliftio-core <0.3
-    , unliftio-pool <1
+      base <5
+    , conduit
+    , containers
+    , exceptions
+    , monad-logger
+    , mtl
+    , persistent
+    , resource-pool
+    , resourcet
+    , text
+    , transformers
+    , unliftio
+    , unliftio-core
+    , unliftio-pool
   default-language: Haskell2010
   if impl(ghc >= 9.4.0) && impl(ghc < 9.4.3)
 
@@ -69,36 +68,32 @@ test-suite persistent-mtl-test
   other-modules:
       Example
       Generated
-      IntegrationTest
-      MockedTest
-      READMETest
-      SqlQueryRepTest
+      IntegrationSpec
+      MockedSpec
+      READMESpec
+      SqlQueryRepSpec
       TestUtils.DB
       TestUtils.Esqueleto
       Paths_persistent_mtl
   hs-source-dirs:
       test
-  ghc-options: -Wall -Wcompat -Wunused-packages -F -pgmF=tasty-autocollect
+  ghc-options: -Wall -Wcompat -Wunused-packages -F -pgmF=skeletest-preprocessor
   build-tool-depends:
-      tasty-autocollect:tasty-autocollect
+      skeletest:skeletest-preprocessor
   build-depends:
       base
     , bytestring
     , conduit
     , containers
-    , esqueleto >=3.5.4.1
-    , explainable-predicates >=0.1.2.0
+    , esqueleto >=3.5.14.0
     , monad-logger
     , persistent
     , persistent-mtl
     , persistent-postgresql >=2.13.0.0
     , persistent-sqlite >=2.13.0.3
     , resource-pool
     , resourcet
-    , tasty
-    , tasty-autocollect >=0.2.0.0
-    , tasty-golden
-    , tasty-hunit
+    , skeletest >=0.2.1
     , text
     , unliftio
   default-language: Haskell2010

stack.yaml

@@ -1,4 +1,7 @@
-resolver: lts-22.39
+resolver: nightly-2025-02-28
+
+extra-deps:
+  - skeletest-0.2.1
 
 ghc-options:
   '$locals': -Werror

stack.yaml.lock

@@ -1,12 +1,19 @@
 # This file was autogenerated by Stack.
 # You should not edit this file by hand.
 # For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
 
-packages: []
+packages:
+- completed:
+    hackage: skeletest-0.2.1@sha256:9b7452da1e4ce15890ec2e0a2281cea907015632b0428247e367b82df0ce2e78,3797
+    pantry-tree:
+      sha256: 7abf90cdf28bc734c0376bbb7340f70ec15c00e9a7df4aa6d567e467109f3bbd
+      size: 4320
+  original:
+    hackage: skeletest-0.2.1
 snapshots:
 - completed:
-    sha256: 6c5aeace2ca5ecde793a9e0acfaa730ec8f384aa2f6183a2a252f5f9ec55d623
-    size: 720039
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/39.yaml
-  original: lts-22.39
+    sha256: 3bb3bbc6f68f86bbaed30c8f5644f9f39baf255f2723620172098bb64550100d
+    size: 656187
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/2/28.yaml
+  original: nightly-2025-02-28