Build fixes

haskell-works · Dec 27, 2024 · be404c9 · be404c9
1 parent 368ef25
commit be404c9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -17,13 +17,13 @@ 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
 
     env:
       # Modify this value to "invalidate" the cabal cache.

diff --git a/cabal.project b/cabal.project
@@ -3,6 +3,7 @@ packages: .
 allow-newer:
   base,
   bytestring,
+  containers,
 
 package testcontainers
   ghc-options: -XDuplicateRecordFields

diff --git a/core/HaskellWorks/Polysemy/Cabal.hs b/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

diff --git a/core/HaskellWorks/Polysemy/Data/ByteString/Strict.hs b/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

diff --git a/hedgehog/HaskellWorks/Polysemy/Hedgehog/Workspace.hs b/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

diff --git a/hw-polysemy.cabal b/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
 

diff --git a/test/HaskellWorks/Polysemy/HedgehogSpec.hs b/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)