depend on hie-bios ^>=0.20

Author: Saizan

cabal.project

@@ -20,7 +20,6 @@ if !os(windows)
 if impl(ghc >10.0)
     constraints:
         hashable==1.4.7.0
-        , hie-bios>=0.20
 
     allow-newer:
         ghc-boot-th,

haskell-debugger.cabal

@@ -185,7 +185,7 @@ library dap-server
         unordered-containers >= 0.2.19 && < 0.3,
 
         haskell-debugger,
-        hie-bios,
+        hie-bios ^>= 0.20,
         prettyprinter ^>= 1.7.0,
         co-log-core >= 0.3.2.5 && < 0.4,
         implicit-hie ^>=0.1.4.0,

hdb-dap/Development/Debug/Session/Setup.hs

@@ -186,13 +186,7 @@ hieBiosFlags cradle root relTarget = runExceptT $ do
   -- because hie.yaml may invoke programs relative to the root (e.g. GHC's hie.yaml does)
   -- (HIE.getCompilerOptions depends on CWD being the proper root dir)
   let compilerOpts = liftIO $ withCurrentDirectory root $
-#if MIN_VERSION_hie_bios(0,20,0)
                           HIE.getCompilerOptions (HIE.TargetWithContext target [target]) HIE.LoadUnitsFromCradle cradle
-#elif MIN_VERSION_hie_bios(0,14,0)
-                          HIE.getCompilerOptions target (HIE.LoadWithContext [target]) cradle
-#else
-                          HIE.getCompilerOptions target [] cradle
-#endif
   componentOpts <- compilerOpts >>= unwrapCradleResult "Failed to get compiler options using hie-bios cradle"
 #if __GLASGOW_HASKELL__ >= 913
   -- fwrite-if-simplified-core requires a recent bug fix regarding GHCi loading
@@ -311,18 +305,12 @@ stackCradle fp = do
   pkgsWithComps <- liftIO $ catMaybes <$> mapM (Implicit.nestedPkg fp) pkgs
   let yaml = fp </> "stack.yaml"
   pure $ (,fp) $ case pkgsWithComps of
-    [] -> Config.Stack (mkStackType Nothing (Just yaml))
+    [] -> Config.Stack (Config.StackType Nothing (Just yaml) Nothing)
     ps -> Config.StackMulti mempty $ do
       Implicit.Package n cs <- ps
       c <- cs
       let (prefix, comp) = Implicit.stackComponent n c
-      pure (prefix, mkStackType (Just comp) (Just yaml))
-  where
-#if MIN_VERSION_hie_bios(0,20,0)
-    mkStackType a b = Config.StackType a b Nothing
-#else
-    mkStackType a b = Config.StackType a b
-#endif
+      pure (prefix, Config.StackType (Just comp) (Just yaml) Nothing)
 
 -- | By default, we generate a simple cabal cradle which is equivalent to the
 -- following hie.yaml:
@@ -334,11 +322,7 @@ stackCradle fp = do
 --
 -- Note, this only works reliable for reasonably modern cabal versions >= 3.2.
 simpleCabalCradle :: FilePath -> (Config.CradleTree a, FilePath)
-#if MIN_VERSION_hie_bios(0,20,0)
 simpleCabalCradle fp = (Config.Cabal $ Config.CabalType Nothing Nothing Nothing, fp)
-#else
-simpleCabalCradle fp = (Config.Cabal $ Config.CabalType Nothing Nothing, fp)
-#endif
 
 cabalExecutable :: MaybeT IO FilePath
 cabalExecutable = MaybeT $ findExecutable "cabal"