9.8 support

mpickering · Dec 21, 2023 · f998bc6 · f998bc6
1 parent 8c1a2d8
commit f998bc6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ["9.6.1", "9.4.5", "9.2.7"]
+        ghc: ["9.8.1", "9.6.3", "9.4.6", "9.2.8"]
     env:
       CONFIG: "--enable-tests --enable-benchmarks"
     steps:

diff --git a/apply-refact.cabal b/apply-refact.cabal
@@ -18,7 +18,7 @@ extra-source-files:  CHANGELOG
                    , tests/examples/*.hs
                    , tests/examples/*.hs.refact
                    , tests/examples/*.hs.expected
-tested-with:         GHC==9.6.1, GHC==9.4.5, GHC==9.2.7
+tested-with:         GHC==9.8.1, GHC==9.6.3, GHC==9.4.6, GHC==9.2.8
 
 
 source-repository head
@@ -35,7 +35,7 @@ library
   build-depends: base >=4.16 && < 5
                , refact >= 0.2
                , ghc-boot-th
-               , ghc-exactprint ^>= 1.5.0 || ^>= 1.6.0 || ^>= 1.7.0
+               , ghc-exactprint ^>= 1.5.0 || ^>= 1.6.0 || ^>= 1.7.0 || ^>= 1.8.0
                , containers >= 0.6.0.1 && < 0.7
                , extra >= 1.7.3
                , syb >= 0.7.1
@@ -45,6 +45,8 @@ library
                , uniplate >= 1.6.13
                , unix-compat >= 0.5.2
                , directory >= 1.3
+  if (impl(ghc >= 9.8) && impl(ghc < 9.9))
+    build-depends: ghc ^>= 9.8
   if (impl(ghc >= 9.6) && impl(ghc < 9.7))
     build-depends: ghc ^>= 9.6
   if (impl(ghc >= 9.4) && impl(ghc < 9.5))

diff --git a/src/Refact/Compat.hs b/src/Refact/Compat.hs
@@ -120,7 +120,9 @@ import GHC.Hs hiding (Pat, Stmt, parseModuleName)
 import GHC.Hs hiding (Pat, Stmt)
 #endif
 import GHC.Parser.Header (getOptions)
-#if MIN_VERSION_ghc(9,4,0)
+#if MIN_VERSION_ghc(9,8,0)
+import GHC.Types.Error (defaultDiagnosticOpts, getMessages)
+#elif MIN_VERSION_ghc(9,4,0)
 import GHC.Types.Error (getMessages)
 #endif
 import GHC.Types.Fixity  ( Fixity(..) )

diff --git a/src/Refact/Fixity.hs b/src/Refact/Fixity.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ViewPatterns #-}
 
 module Refact.Fixity (applyFixities) where