Upgrade to GHC 9.8: bump dependencies, fix testsuite, CHANGELOG

Closes #35.
Closes #36.

Author: andreasabel

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ["8.10", "9.0", "9.2", "9.4", "9.6"]
+        ghc: ["8.10", "9.0", "9.2", "9.4", "9.6", "9.8"]
     steps:
       - uses: actions/checkout@v4
       - name: "Setup haskell"

CHANGELOG.md

@@ -2,7 +2,10 @@
 
 ## next version
 
-* `NoThunks ThreadId` instance
+* `NoThunks ThreadId` instance.
+* Fix tests on ghc 9.8.
+  Andreas Abel <[email protected]>
+* Tested with ghc 8.10 to 9.8.
 
 ## 0.1.4 -- 2023-03-27
 

cabal.project

@@ -4,7 +4,3 @@ package nothunks
   tests: True
 
 test-show-details: direct
-
--- TODO: remove once hedgehog is compatible with ghc-9.6
-if impl(ghc >= 9.6)
-  allow-newer: hedgehog:template-haskell

nothunks.cabal

@@ -49,9 +49,9 @@ library
                     , ghc-heap
 
     if flag(bytestring)
-      build-depends:  bytestring >= 0.10 && < 0.12
+      build-depends:  bytestring >= 0.10 && < 0.13
     if flag(text)
-      build-depends:  text       >= 1.2  && < 1.3 || >= 2 && < 2.1
+      build-depends:  text       >= 1.2  && < 1.3 || >= 2 && < 2.2
     if flag(vector)
       build-depends:  vector     >= 0.12 && < 0.14
 
@@ -77,9 +77,9 @@ test-suite nothunks-test
                     , ghc-prim
 
                       -- Additional dependencies
-                    , hedgehog       >= 1.1 && < 1.3
+                    , hedgehog       >= 1.1 && < 1.5
                     , random         >= 1.1 && < 1.3
-                    , tasty          >= 1.3 && < 1.5
+                    , tasty          >= 1.3 && < 1.6
                     , tasty-hedgehog >= 1.1 && < 1.5
 
     hs-source-dirs:   test

test/Test/NoThunks/Class.hs

@@ -213,7 +213,11 @@ instance (FromModel a, FromModel b) => FromModel (a, b) where
       PairThunk _     -> NotWHNF ctxt'
       PairDefined a b -> constrNF [modelIsNF ctxt' a, modelIsNF ctxt' b]
     where
+#if MIN_VERSION_GLASGOW_HASKELL(9,8,0,0)
+      ctxt' = "Tuple2" : ctxt
+#else
       ctxt' = "(,)" : ctxt
+#endif
 
   fromModel (PairThunk p)     k = fromModel p $ \p' -> k (if ack 3 3 > 0 then p' else p')
   fromModel (PairDefined a b) k = fromModel a $ \a' ->