Fix prettyprinter import warnings, bump base bounds

haskell · Feb 27, 2024 · d0fc0bd · d0fc0bd
1 parent dc1ad66
commit d0fc0bd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/exe/Main.hs b/exe/Main.hs
@@ -6,7 +6,7 @@ module Main where
 import Control.Monad ( forM )
 import qualified Colog.Core as L
 import Data.Version (showVersion)
-import Data.Text.Prettyprint.Doc
+import Prettyprinter
 import Options.Applicative
 import System.Directory (getCurrentDirectory)
 import System.IO (stdout, hSetEncoding, utf8)

diff --git a/hie-bios.cabal b/hie-bios.cabal
@@ -12,8 +12,8 @@ Description: Set up a GHC API session and obtain flags required to co
 Category: Development
 Build-Type: Simple
 -- No glob syntax until GHC 8.6 because of stack
-Extra-Source-Files: ChangeLog.md
-  README.md
+extra-doc-files:  ChangeLog.md
+Extra-Source-Files: README.md
  wrappers/cabal
  wrappers/cabal.hs
  tests/configs/*.yaml
@@ -163,7 +163,7 @@ Library
  Other-Modules: Paths_hie_bios
  autogen-modules: Paths_hie_bios
  Build-Depends:
- base >= 4.14 && < 5,
+ base >= 4.16 && < 5,
  aeson >= 1.4.4 && < 2.3,
  base16-bytestring >= 0.1.1 && < 1.1,
  bytestring >= 0.10.8 && < 0.13,
@@ -195,7 +195,7 @@ Executable hie-bios
  Other-Modules: Paths_hie_bios
  GHC-Options: -Wall
  HS-Source-Dirs: exe
- Build-Depends: base >= 4.9 && < 5
+ Build-Depends: base >= 4.16 && < 5
  , co-log-core
  , directory
  , filepath

diff --git a/src/HIE/Bios/Ghc/Check.hs b/src/HIE/Bios/Ghc/Check.hs
@@ -14,7 +14,7 @@ import qualified GHC as G
 import Control.Exception
 import Control.Monad.IO.Class
 import Colog.Core (LogAction (..), WithSeverity (..), Severity (..), (<&), cmap)
-import Data.Text.Prettyprint.Doc
+import Prettyprinter
 
 import HIE.Bios.Ghc.Api
 import HIE.Bios.Ghc.Logger

diff --git a/src/HIE/Bios/Ghc/Load.hs b/src/HIE/Bios/Ghc/Load.hs
@@ -11,7 +11,7 @@ import Control.Monad.IO.Class
 
 import Data.List
 
-import Data.Text.Prettyprint.Doc
+import Prettyprinter
 import Data.IORef
 
 import GHC

diff --git a/src/HIE/Bios/Types.hs b/src/HIE/Bios/Types.hs
@@ -13,7 +13,7 @@ import Control.Monad.Trans.Class
 #if MIN_VERSION_base(4,9,0)
 import qualified Control.Monad.Fail as Fail
 #endif
-import Data.Text.Prettyprint.Doc
+import Prettyprinter
 import System.Process.Extra (CreateProcess (env, cmdspec), CmdSpec (..))
 import Data.Maybe (fromMaybe)