From ac1c58a6e7692ab5205c6c2ef9fe9dd404961d0e Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Fri, 3 Nov 2023 10:49:25 +0700 Subject: [PATCH] Support for GHC 9.8.1 --- .ghci | 2 +- .github/workflows/build.yml | 1 + package.yaml | 2 +- sensei.cabal | 4 ++-- src/Imports.hs | 2 +- src/Session.hs | 3 +-- test/TriggerSpec.hs | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.ghci b/.ghci index 300e5da..94149e2 100644 --- a/.ghci +++ b/.ghci @@ -6,4 +6,4 @@ :set -XRecordWildCards :set -XViewPatterns -:set -DTEST -isrc -itest -hide-packagebase-compat-batteries +:set -DTEST -isrc -itest diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de479dc..7c7b7d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,7 @@ jobs: - '9.2' - '9.4' - '9.6' + - '9.8' include: - os: macos-latest ghc: system diff --git a/package.yaml b/package.yaml index 17acf3b..67a9110 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: sensei -version: 0.7.0 +version: 0.8.0 synopsis: Automatically run Hspec tests on file modifications maintainer: Simon Hengel license: MIT diff --git a/sensei.cabal b/sensei.cabal index a890e19..4cca4b5 100644 --- a/sensei.cabal +++ b/sensei.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.4. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack name: sensei -version: 0.7.0 +version: 0.8.0 synopsis: Automatically run Hspec tests on file modifications category: Development homepage: https://github.com/hspec/sensei#readme diff --git a/src/Imports.hs b/src/Imports.hs index 9f496b9..5431d1e 100644 --- a/src/Imports.hs +++ b/src/Imports.hs @@ -7,7 +7,7 @@ import Control.Exception as Imports hiding (handle) import Control.Monad as Imports import Data.Function as Imports (fix) import Control.Applicative as Imports -import Data.Functor as Imports +import Data.Functor as Imports ((<&>)) import Data.Bifunctor as Imports import Data.Char as Imports import Data.Either as Imports diff --git a/src/Session.hs b/src/Session.hs index 19f83b5..a256d6b 100644 --- a/src/Session.hs +++ b/src/Session.hs @@ -26,8 +26,7 @@ import Imports import Data.IORef -import Language.Haskell.GhciWrapper hiding (echo) -import qualified Language.Haskell.GhciWrapper as Interpreter +import Language.Haskell.GhciWrapper import Util import Options diff --git a/test/TriggerSpec.hs b/test/TriggerSpec.hs index c7d806a..f81be9c 100644 --- a/test/TriggerSpec.hs +++ b/test/TriggerSpec.hs @@ -122,7 +122,7 @@ spec = do , " Spec.hs:8:3: " , " 1) bar" , "" - , " To rerun use: --match \"/bar/\"" + , " To rerun use: --match \"/bar/\" --seed 0" , "" , "Randomized with seed 0" , "" @@ -221,7 +221,7 @@ spec = do , " Spec.hs:8:3: " , " 1) bar" , "" - , " To rerun use: --match \"/bar/\"" + , " To rerun use: --match \"/bar/\" --seed 0" , "" , "Randomized with seed 0" , ""