Add support for Cabal-2.4

killy971 · Dec 24, 2018 · a2d5003 · a2d5003
1 parent 9e131f1
commit a2d5003
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/hpc-coveralls.cabal b/hpc-coveralls.cabal
@@ -59,7 +59,7 @@ library
     aeson          >= 0.7.1   && <1.5,
     base           >= 4       && < 5,
     bytestring     >= 0.10    && <0.11,
-    Cabal                        <2.4,
+    Cabal          >= 2.4     && <2.6,
     containers     >= 0.5     && <0.7,
     cmdargs        >= 0.10    && <0.11,
     curl           >= 1.3.8   && <1.4,
@@ -80,7 +80,7 @@ executable hpc-coveralls
     aeson          >= 0.7.1   && <1.5,
     base           >= 4       && < 5,
     bytestring     >= 0.10    && <0.11,
-    Cabal,
+    Cabal          >= 2.4     && <2.6,
     containers     >= 0.5     && <0.7,
     cmdargs        >= 0.10    && <0.11,
     curl           >= 1.3.8   && <1.4,

diff --git a/src/Trace/Hpc/Coveralls/Cabal.hs b/src/Trace/Hpc/Coveralls/Cabal.hs
@@ -17,7 +17,12 @@ import Control.Monad.Trans.Maybe
 import Data.List (intercalate, isSuffixOf)
 import Distribution.Package
 import Distribution.PackageDescription
+#if MIN_VERSION_Cabal(2,4,0)
+import Distribution.PackageDescription.Parsec
+import qualified Data.ByteString as BS
+#else
 import Distribution.PackageDescription.Parse
+#endif
 import Distribution.Version
 import System.Directory
 
@@ -30,6 +35,17 @@ getCabalFile dir = do
     where isCabal filename = ".cabal" `isSuffixOf` filename && length filename > 6
 
 getPackageNameVersion :: FilePath -> IO (Maybe String)
+#if MIN_VERSION_Cabal(2,4,0)
+getPackageNameVersion file = do
+    orig <- BS.readFile file
+    case runParseResult $ parseGenericPackageDescription orig of
+        (_warnings, Left _) -> return Nothing
+        (_warnings, Right gpd) -> return $ Just $ name ++ "-" ++ version
+            where pkg = package . packageDescription $ gpd
+                  name = unPackageName $ pkgName pkg
+                  version = showVersion (pkgVersion pkg)
+                  showVersion = intercalate "." . map show . versionNumbers
+#else
 getPackageNameVersion file = do
     orig <- readFile file
     case parsePackageDescription orig of
@@ -39,6 +55,7 @@ getPackageNameVersion file = do
                   name = unPackageName $ pkgName pkg
                   version = showVersion (pkgVersion pkg)
                   showVersion = intercalate "." . map show . versionNumbers
+#endif
 
 currDirPkgNameVer :: IO (Maybe String)
 currDirPkgNameVer = runMaybeT $ pkgNameVersion currentDir