shake-ext 2.7.0.4 → 2.7.0.5

raw patch · 6 files changed

+20/−17 lines, 6 filesdep ~Cabaldep ~base

Dependency ranges changed: Cabal, base

Files

• shake-ext.cabal +3/−3
• src/Development/Shake/C.hs +0/−1
• src/Development/Shake/CCJS.hs +0/−1
• src/Development/Shake/Cabal.hs +10/−10
• src/Development/Shake/Elm.hs +0/−1
• src/Development/Shake/Version.hs +7/−1

@@ -1,6 +1,6 @@ cabal-version: 1.18 name: shake-ext-version: 2.7.0.4+version: 2.7.0.5 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018 Vanessa McHale@@ -42,11 +42,11 @@     default-language: Haskell2010     ghc-options: -Wall     build-depends:-        base >=4.10 && <5,+        base >=4.11 && <5,         shake -any,         composition-prelude -any,         directory -any,-        Cabal >=2.0,+        Cabal >=2.2,         template-haskell -any          if flag(development)

@@ -26,7 +26,6 @@  import           Control.Monad import           Data.List                  (isPrefixOf, isSuffixOf)-import           Data.Semigroup import           Development.Shake import           Development.Shake.FilePath import           System.Directory           (removeFile)

@@ -1,7 +1,6 @@ module Development.Shake.CCJS ( ccjs                               ) where -import           Data.Semigroup import           Development.Shake import           Development.Shake.FilePath import           System.Directory           (createDirectoryIfMissing)

@@ -8,26 +8,26 @@                                , platform                                , hsCompiler                                -- * Reëxports from "Distribution.Version"-                               , showVersion+                               , prettyShow                                ) where  import           Control.Arrow import           Control.Composition import           Control.Monad-import           Data.Foldable                         (toList)-import           Data.Maybe                            (catMaybes)-import           Data.Semigroup-import           Development.Shake                     hiding (doesFileExist)-import qualified Development.Shake                     as Shake+import           Data.Foldable                          (toList)+import           Data.Maybe                             (catMaybes)+import           Development.Shake                      hiding (doesFileExist)+import qualified Development.Shake                      as Shake import           Distribution.ModuleName import           Distribution.PackageDescription-import           Distribution.PackageDescription.Parse+import           Distribution.PackageDescription.Parsec+import           Distribution.Pretty import           Distribution.Types.CondTree import           Distribution.Types.PackageId-import           Distribution.Verbosity                as Distribution+import           Distribution.Verbosity                 as Distribution import           Distribution.Version-import           System.Directory                      (doesFileExist)-import           System.Info                           (arch, os)+import           System.Directory                       (doesFileExist)+import           System.Info                            (arch, os)  data HsCompiler = GHC { _suff :: Maybe String -- ^ Compiler version                       }

@@ -1,7 +1,6 @@ module Development.Shake.Elm ( elmMake                              ) where -import           Data.Semigroup import           Development.Shake  elmMake :: [FilePath] -- ^ Source files

@@ -6,6 +6,12 @@                                  , pandocVersion                                  ) where +import           Development.Shake import           Development.Shake.TH -$(mkVersions ["pandoc", "ghc", "cabal"])+ghcVersion :: Action String+ghcVersion = do+    ~(Stdout o) <- command mempty "ghc" ["--numeric-version"]+    pure o++$(mkVersions ["pandoc", "cabal"])