Support cabal-install-3.18

Author: Bodigrim

app/History.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE ApplicativeDo #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE RecordWildCards #-}
 
 module Main (
@@ -21,6 +22,7 @@ import Distribution.Client.GlobalFlags (globalCacheDir)
 import Distribution.Parsec (simpleParsec)
 import Distribution.Simple.Flag (fromFlag)
 import Distribution.Types.PackageName (PackageName, mkPackageName, unPackageName)
+import Distribution.Verbosity qualified as Verbosity
 import Granite (defPlot, lineGraph, widthChars, xFormatter, yBounds, yFormatter)
 import Hackage.RevDeps (ExtractDependenciesMode (..), getReverseDependencies, getTransitiveReverseDependencies)
 import Options.Applicative (Parser, argument, auto, execParser, fullDesc, help, helper, info, long, maybeReader, metavar, option, progDesc, showDefault, switch, value)
@@ -69,6 +71,13 @@ parseArgs today = do
         <> help "Count transitive (both direct and indirect) dependencies. This mode is imprecise when passing multiple package names at once. Also in this mode we follow only dependencies of the main library"
   pure Config {..}
 
+silentVerbosity :: Verbosity.Verbosity
+#if MIN_VERSION_Cabal(3,18,0)
+silentVerbosity = Verbosity.mkVerbosity Verbosity.defaultVerbosityHandles Verbosity.silent
+#else
+silentVerbosity = Verbosity.silent
+#endif
+
 main :: IO ()
 main = do
   let desc = "Count Hackage reverse dependencies for given dates, using local package index. Consider running 'cabal update' beforehand."
@@ -80,7 +89,7 @@ main = do
       dates = L.nub $ [cnfStart, addDays (fromIntegral cnfStep) cnfStart .. cnfFinish] ++ [cnfFinish]
   supportsAnsi <- hSupportsANSI stdout
 
-  cnf <- loadConfig minBound mempty
+  cnf <- loadConfig silentVerbosity mempty
   let cacheDir = fromFlag $ globalCacheDir $ savedGlobalFlags cnf
       idx = cacheDir </> hackageHaskellOrg </> "01-index.tar"
   putStrLn $ unwords $ "Date      " : map (showPackage supportsAnsi) args

app/Main.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE ApplicativeDo #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE RecordWildCards #-}
 
 module Main (
@@ -22,6 +23,7 @@ import Distribution.Types.Dependency (Dependency (..))
 import Distribution.Types.LibraryName (LibraryName (..))
 import Distribution.Types.PackageName (PackageName, mkPackageName, unPackageName)
 import Distribution.Types.VersionRange (VersionRange)
+import Distribution.Verbosity qualified as Verbosity
 import Hackage.RevDeps (ExtractDependenciesMode (..), getReverseDependencies, getTransitiveReverseDependencies)
 import Options.Applicative (Parser, ReadM, argument, auto, execParser, fullDesc, help, helper, info, long, maybeReader, metavar, option, optional, progDesc, switch)
 import Options.Applicative.NonEmpty (some1)
@@ -53,6 +55,13 @@ parseArgs = do
         <> help "Count transitive (both direct and indirect) dependencies. This mode is imprecise when passing multiple package names at once. Also in this mode we follow only dependencies of the main library"
   pure Config {..}
 
+silentVerbosity :: Verbosity.Verbosity
+#if MIN_VERSION_Cabal(3,18,0)
+silentVerbosity = Verbosity.mkVerbosity Verbosity.defaultVerbosityHandles Verbosity.silent
+#else
+silentVerbosity = Verbosity.silent
+#endif
+
 main :: IO ()
 main = do
   let desc = "List Hackage reverse dependencies, using local package index. Consider running 'cabal update' beforehand."
@@ -61,7 +70,7 @@ main = do
       info (helper <*> parseArgs) (fullDesc <> progDesc desc)
   let args = S.fromList $ NE.toList cnfPackageNames
 
-  cnf <- loadConfig minBound mempty
+  cnf <- loadConfig silentVerbosity mempty
   let cacheDir = fromFlag $ globalCacheDir $ savedGlobalFlags cnf
       idx = cacheDir </> hackageHaskellOrg </> "01-index.tar"
       func = if cnfTransitive then getTransitiveReverseDependencies OnlyMainLib else getReverseDependencies AllComponents

hackage-revdeps.cabal

@@ -37,8 +37,8 @@ library
         alfred-margaret >=2.0 && <2.2,
         base >=4.17 && <5,
         bytestring <0.13,
-        Cabal >=3.8 && <3.17,
-        Cabal-syntax >=3.8 && <3.17,
+        Cabal >=3.8 && <3.19,
+        Cabal-syntax >=3.8 && <3.19,
         containers >=0.5.8 && <0.9,
         filepath <1.6,
         tar <0.8,
@@ -54,9 +54,9 @@ executable hackage-revdeps
     build-depends:
         ansi-terminal >=0.11.3 && <1.2,
         base,
-        Cabal >=3.8 && <3.17,
-        cabal-install >=3.8 && <3.17,
-        Cabal-syntax >=3.8 && <3.17,
+        Cabal,
+        cabal-install >=3.8 && <3.19,
+        Cabal-syntax,
         containers,
         filepath,
         hackage-revdeps,
@@ -71,9 +71,9 @@ executable hackage-revdeps-history
     build-depends:
         ansi-terminal >=0.11.3 && <1.2,
         base,
-        Cabal >=3.8 && <3.17,
-        cabal-install >=3.8 && <3.17,
-        Cabal-syntax >=3.8 && <3.17,
+        Cabal,
+        cabal-install >=3.8 && <3.19,
+        Cabal-syntax,
         containers,
         filepath,
         granite >=0.7 && <0.8,