Build fixes

.github/workflows/haskell.yml

@@ -17,13 +17,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.6.5", "9.8.2"]
+        ghc: ["9.4.8", "9.6.6", "9.8.4", "9.10.1"]
         os:
           - ubuntu-latest
-          - windows-latest
-        # include:
-        #   - ghc: "9.8.2"
-        #     os: macOS-latest
+        include:
+          - ghc: "9.10.1"
+            os: macOS-latest
+          - ghc: "9.10.1"
+            os: windows-latest
 
     env:
       # Modify this value to "invalidate" the cabal cache.

cabal.project

@@ -3,6 +3,7 @@ packages: .
 allow-newer:
   base,
   bytestring,
+  containers,
 
 package testcontainers
   ghc-options: -XDuplicateRecordFields

core/HaskellWorks/Polysemy/Cabal.hs

@@ -10,7 +10,8 @@ import           HaskellWorks.Polysemy.Error.Types
 import           HaskellWorks.Polysemy.Prelude
 import           HaskellWorks.Polysemy.System.Directory
 import           HaskellWorks.Polysemy.System.Environment
-import           System.FilePath                            (takeDirectory)
+import           System.FilePath                            (takeDirectory,
+                                                             (</>))
 
 import           Data.Aeson
 import qualified Data.List                                  as L

core/HaskellWorks/Polysemy/Data/ByteString/Strict.hs

@@ -172,8 +172,7 @@ import qualified Control.Exception             as CE
 import qualified Data.ByteString               as BS
 import qualified Data.Text                     as Text
 import qualified Data.Text.Encoding            as Text
-import           GHC.Foreign                   (CString, CStringLen)
-import           GHC.IO.Handle                 (Handle)
+import           Foreign.C.String              (CString, CStringLen)
 import           HaskellWorks.Polysemy.Prelude
 
 import           Polysemy

hedgehog/HaskellWorks/Polysemy/Hedgehog/Workspace.hs

@@ -19,6 +19,7 @@ import           HaskellWorks.Polysemy.System.IO.Temp
 import           Polysemy
 import           Polysemy.Log
 import           Polysemy.Reader
+import           System.FilePath                                ((</>))
 import           System.Info
 
 import qualified HaskellWorks.Polysemy.System.IO                as PIO

hw-polysemy.cabal

@@ -10,6 +10,7 @@ maintainer:             [email protected]
 copyright:              2024 John Ky
 category:               Development
 build-type:             Simple
+tested-with:            GHC == 9.10.1, GHC == 9.8.4, GHC == 9.6.6, GHC == 9.4.8
 extra-doc-files:        CHANGELOG.md
 extra-source-files:     README.md
 
@@ -27,18 +28,18 @@ common amazonka-s3                { build-depends: amazonka-s3                >=
 common binary                     { build-depends: binary                     >= 0.8.9      && < 0.9    }
 common bytestring                 { build-depends: bytestring                                  < 0.13   }
 common contravariant              { build-depends: contravariant                               < 1.6    }
-common Diff                       { build-depends: Diff                                        < 0.6    }
+common Diff                       { build-depends: Diff                                        < 2      }
 common directory                  { build-depends: directory                                   < 1.4    }
 common exceptions                 { build-depends: exceptions                                  < 0.11   }
 common filepath                   { build-depends: filepath                                    < 1.6    }
 common generic-lens               { build-depends: generic-lens                                < 2.3    }
-common ghc-prim                   { build-depends: ghc-prim                                    < 0.12   }
+common ghc-prim                   { build-depends: ghc-prim                                    < 0.14   }
 common hedgehog                   { build-depends: hedgehog                                    < 1.6    }
 common http-conduit               { build-depends: http-conduit               >= 2.3        && < 2.4    }
 common hw-prelude                 { build-depends: hw-prelude                 >= 0.0.1.0    && < 0.1    }
 common microlens                  { build-depends: microlens                                   < 5      }
 common lens                       { build-depends: lens                                        < 5.4    }
-common mtl                        { build-depends: mtl                                         < 2.4    }
+common mtl                        { build-depends: mtl                                         < 2.6    }
 common network                    { build-depends: network                                     < 3.3    }
 common polysemy                   { build-depends: polysemy                                    < 2      }
 common polysemy-log               { build-depends: polysemy-log               >= 0.11       && < 1      }

test/HaskellWorks/Polysemy/HedgehogSpec.hs

@@ -9,6 +9,7 @@ import qualified Data.List                           as L
 import qualified HaskellWorks.Polysemy.Data.Text     as T
 import           HaskellWorks.Polysemy.Hedgehog
 import           HaskellWorks.Polysemy.Hedgehog.Test
+import           System.FilePath                     ((</>))
 
 default (String)
 

test/HaskellWorks/Polysemy/TestContainers/LocalStackSpec.hs

@@ -25,10 +25,13 @@ import qualified TestContainers.Tasty                      as TC
 isWindows :: Bool
 isWindows = OS.os == "mingw32"
 
+isMacos :: Bool
+isMacos = OS.os == "darwin"
+
 tasty_local_stack :: Tasty.TestTree
 tasty_local_stack =
-  if isWindows
-    then Tasty.testGroup "LocalStackSpec skipped on Windows" []
+  if isWindows || isMacos
+    then Tasty.testGroup "LocalStackSpec skipped on Windows and MacOS" []
     else
       TC.withContainers (setupContainers' "localstack/localstack-pro:3.7.2") $ \getContainer ->
         H.testProperty "Local stack test" $ propertyOnce $ runLocalTestEnv getContainer $ do