Compatibility with newer ghc versions

* Add `cabal.project`

* Add ghc-9.10, ghc-9.12 and disable ghc-8.0 on CI

* Make test suite compatible with ghc-9.12

Author: lehins

Diff for: .github/workflows/haskell.yml

@@ -28,10 +28,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-13, windows-latest]
-        resolver: [lts-11, lts-12, lts-14, lts-16, lts-18, lts-19, lts-20, lts-21, lts-22, nightly]
+        resolver: [lts-11, lts-12, lts-14, lts-16, lts-18, lts-19, lts-20, lts-21, lts-22, lts-23, nightly]
         include:
           - resolver: lts-11
             ghc: '8.2.2'
+            stack-version: '2.15.5'
           - resolver: lts-12
             ghc: '8.4.4'
           - resolver: lts-14
@@ -47,9 +48,11 @@ jobs:
           - resolver: lts-21
             ghc: '9.4.8'
           - resolver: lts-22
-            ghc: '9.6.5'
+            ghc: '9.6.6'
+          - resolver: lts-23
+            ghc: '9.8.4'
           - resolver: nightly
-            ghc: '9.8.2'
+            ghc: '9.10.1'
         # exclude:
         #   - resolver: lts-12
         #     os: windows-latest
@@ -73,7 +76,7 @@ jobs:
       with:
         ghc-version: ${{ matrix.ghc }}
         enable-stack: true
-        stack-version: '2.15.5'
+        stack-version: ${{ matrix.stack-version || 'latest' }}
 
     - name: Cache
       id: cache
@@ -134,7 +137,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { os: ubuntu-latest, ghc: "8.0.2" }
+          # - { os: ubuntu-latest, ghc: "8.0.2" }
           - { os: ubuntu-latest, ghc: "8.2.2" }
           - { os: ubuntu-latest, ghc: "8.4.4" }
           - { os: ubuntu-latest, ghc: "8.6.5" }
@@ -144,8 +147,9 @@ jobs:
           - { os: ubuntu-latest, ghc: "9.2.8" }
           - { os: ubuntu-latest, ghc: "9.4.8" }
           - { os: ubuntu-latest, ghc: "9.6.5" }
-          - { os: ubuntu-latest, ghc: "9.8.2" }
+          - { os: ubuntu-latest, ghc: "9.8.4" }
           - { os: ubuntu-latest, ghc: "9.10.1" }
+          - { os: ubuntu-latest, ghc: "9.12.1" }
           # - { os: windows-latest, ghc: "8.0.2" } # Linker errors
           # - { os: windows-latest, ghc: "8.2.2" } # Linker errors
           - { os: windows-latest, ghc: "8.4.4" }
@@ -156,9 +160,10 @@ jobs:
           - { os: windows-latest, ghc: "9.2.8" }
           - { os: windows-latest, ghc: "9.4.8" }
           - { os: windows-latest, ghc: "9.6.5" }
-          - { os: windows-latest, ghc: "9.8.2" }
+          - { os: windows-latest, ghc: "9.8.4" }
           - { os: windows-latest, ghc: "9.10.1" }
-          - { os: macOS-13, ghc: "8.0.2" }
+          - { os: windows-latest, ghc: "9.12.1" }
+          # - { os: macOS-13, ghc: "8.0.2" }
           - { os: macOS-13, ghc: "8.2.2" }
           - { os: macOS-13, ghc: "8.4.4" }
           - { os: macOS-13, ghc: "8.6.5" }
@@ -168,8 +173,9 @@ jobs:
           - { os: macOS-latest, ghc: "9.2.8" }
           - { os: macOS-latest, ghc: "9.4.8" }
           - { os: macOS-latest, ghc: "9.6.5" }
-          - { os: macOS-latest, ghc: "9.8.2" }
+          - { os: macOS-latest, ghc: "9.8.4" }
           - { os: macOS-latest, ghc: "9.10.1" }
+          - { os: macOS-latest, ghc: "9.12.1" }
 
     env:
       cache-version: v3 # bump up this version to invalidate currently stored cache
@@ -220,7 +226,7 @@ jobs:
         resolver: [lts-22]
         include:
           - resolver: lts-22
-            ghc: 9.6.5
+            ghc: 9.6.6
 
     env:
       STACK_ARGS: '--resolver ${{ matrix.resolver }} --system-ghc'
@@ -267,7 +273,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ghc: [9.6.5]
+        ghc: [9.6.6]
 
     env:
       STACK_ARGS: '--system-ghc'

Diff for: cabal.project

@@ -0,0 +1,11 @@
+packages:
+  massiv
+  --massiv-bench
+  massiv-test
+
+write-ghc-environment-files: always
+-- Always build tests and benchmarks.
+tests: true
+benchmarks: true
+-- The only sensible test display option
+test-show-details: streaming

Diff for: massiv-test/src/Test/Massiv/Core/Index.hs

@@ -46,7 +46,7 @@ import Data.Massiv.Array.Unsafe (Sz (SafeSz))
 import Data.Massiv.Core.Index
 import Data.Proxy
 import Data.Typeable
-import GHC.Exception (ErrorCall (ErrorCallWithLocation))
+import GHC.Exception (ErrorCall (ErrorCall))
 import Test.Massiv.Utils
 
 -- | Dimension that is always within bounds of an index
@@ -517,7 +517,7 @@ szNumSpec = do
       sz
         /= zeroSz
         ==> assertDeepException
-          (\(ErrorCallWithLocation err loc) -> err `deepseq` loc `deepseq` True)
+          (\(ErrorCall err) -> err `deepseq` True)
           (negate sz :: Sz ix)
 
     prop "abs" $ prop_UnaryNumSz @ix abs

Diff for: massiv-test/src/Test/Massiv/Utils.hs

@@ -38,11 +38,17 @@ import Data.Maybe as X (fromMaybe, isJust, isNothing)
 import Data.Typeable as X
 import Test.Hspec as X
 import Test.Hspec.QuickCheck as X
-import Test.QuickCheck as X hiding ((.&.))
 import Test.QuickCheck.Classes.Base as X
+import Test.QuickCheck as X hiding ((.&.))
 import Test.QuickCheck.Function as X
+import UnliftIO.Exception (Exception (..), SomeException, catchAny)
+#if !MIN_VERSION_QuickCheck(2,15,0)
 import Test.QuickCheck.Monadic as X
-import UnliftIO.Exception (Exception (..), SomeException, catch, catchAny)
+import UnliftIO.Exception (catch)
+#else
+import Test.QuickCheck.Monadic (assertDeepException, assertDeepExceptionIO)
+import Test.QuickCheck.Monadic as X hiding (assertDeepException, assertDeepExceptionIO)
+#endif
 #if !MIN_VERSION_base(4,11,0)
 import Data.Semigroup as X ((<>))
 #endif
@@ -108,8 +114,7 @@ toStringException :: Either SomeException a -> Either String a
 toStringException = either (Left . displayException) Right
 
 selectErrorCall :: ErrorCall -> Bool
-selectErrorCall = \case
-  ErrorCallWithLocation err loc -> err `deepseq` loc `deepseq` True
+selectErrorCall (ErrorCall err) = err `deepseq` True
 
 data ExpectedException = ExpectedException deriving (Show, Eq)
 

Diff for: massiv-test/tests/Test/Massiv/Array/Ops/TransformSpec.hs

@@ -9,7 +9,7 @@
 
 module Test.Massiv.Array.Ops.TransformSpec (spec) where
 
-import Data.Foldable as F (foldl', toList)
+import qualified Data.Foldable as F
 import Data.Massiv.Array as A
 import Data.Maybe
 import Data.Sequence as S
@@ -289,8 +289,8 @@ preJust m = isJust m ==> fromJust m
 
 prop_ConsSnoc :: Array D Ix1 Int -> [SeqOp Int] -> Property
 prop_ConsSnoc arr ops =
-  A.toList (computeAs U (foldl' applyArraySeqOp (toLoadArray arr) ops))
-    === F.toList (foldl' applySequenceSeqOp (S.fromList (A.toList arr)) ops)
+  A.toList (computeAs U (F.foldl' applyArraySeqOp (toLoadArray arr) ops))
+    === F.toList (F.foldl' applySequenceSeqOp (S.fromList (A.toList arr)) ops)
 
 data SeqOp e = Cons e | Snoc e deriving (Eq, Show)
 

Diff for: massiv/massiv.cabal

@@ -22,8 +22,10 @@ tested-with:         GHC == 8.0.2
                    , GHC == 9.0.2
                    , GHC == 9.2.8
                    , GHC == 9.4.8
-                   , GHC == 9.6.5
-                   , GHC == 9.8.2
+                   , GHC == 9.6.6
+                   , GHC == 9.8.4
+                   , GHC == 9.10.1
+                   , GHC == 9.12.1
 
 flag unsafe-checks
   description: Enable all the bounds checks for unsafe functions at the cost of

Diff for: stack.ghc-9.8.2.yaml renamed to stack.ghc-9.10.1.yaml

@@ -1,5 +1,5 @@
 work-dir: ".stack-work-root"
-resolver: nightly-2024-06-28
+resolver: nightly-2025-01-10
 packages:
 - 'massiv/'
 - 'massiv-test/'

Diff for: stack.ghc-9.6.5.yaml renamed to stack.ghc-9.6.6.yaml

@@ -0,0 +1,12 @@
+work-dir: ".stack-work-root"
+resolver: lts-23.3
+packages:
+- 'massiv/'
+- 'massiv-test/'
+flags: {}
+extra-deps:
+- random-1.3.0
+- github: haskell/mwc-random
+  commit: 2cce257158befe52417433d1e7717f11ce718aec
+ghc-options:
+  '$everything': -haddock