hakyll-images 1.1.0 → 1.1.1

raw patch · 4 files changed

+19/−37 lines, 4 filesdep ~hakyllPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hakyll

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• hakyll-images.cabal +2/−3
• stack.yaml +0/−33
• tests/Hakyll/Images/Common/Tests.hs +13/−1

@@ -1,5 +1,9 @@ # Change log
 
+## Release 1.1.1
+
+* Updated the test suite to support `Hakyll.Core.Runtime.RunMode` (added in hakyll 4.15) (#10).
+
 ## Release 1.1.0
 
 * Added support for GIFs (#9).

@@ -1,7 +1,7 @@ cabal-version: 2.2
 
 name:           hakyll-images
-version:        1.1.0
+version:        1.1.1
 synopsis:       Hakyll utilities to work with images
 description:    hakyll-images is an add-on to the hakyll package. It adds utilities to work with images, including JPEG compression.
 category:       Web
@@ -16,7 +16,6 @@     CHANGELOG.md
     LICENSE.md
     README.md
-    stack.yaml
 data-files:
     tests/data/piccolo.jpg
     tests/data/donkey.gif
@@ -75,7 +74,7 @@     , bytestring        >= 0.9  && <1
     , directory         >= 1    && <2
     , filepath          >= 1    && <2
-    , hakyll            >  4    && <5
+    , hakyll            >= 4    && <5
     , hakyll-images
     , tasty             >= 0.11 && <2
     , tasty-hunit       >= 0.9  && <1

@@ -1,33 +0,0 @@-resolver: lts-17.9 # GHC 8.10.3
-compiler: ghc-9.0.1
-packages:
-- .
-
-
-# Dependency packages to be pulled from upstream that are not in the resolver
-# using the same syntax as the packages field.
-# (e.g., acme-missiles-0.3)
-extra-deps:
-- git: https://github.com/jaspervdj/hakyll.git
-  commit: 591fbe693d87b84c73b1839acdd424cbc12da3b3
-
-- parsec-3.1.14.0@sha256:72d5c57e6e126adaa781ab97b19dc76f68490c0a3d88f14038219994cabe94e1,4356      
-# For GHC 9+
-- text-1.2.4.1
-- directory-1.3.6.2@sha256:6e5f3e0adfe94483d5754d97d741b7d23a5e085d47176075b1955d4fa78f37aa,2811      
-- process-1.6.11.0@sha256:d69428130705782d1b61ec8eab2f1d899fd5722ed804c44e104d798dce43e9fb,2819       
-- time-1.11.1.2@sha256:a957467595420495c2dd440d9efa1f58c62277cf9438c7e7a515d7a4c65571ec,6287
-- unix-2.7.2.2@sha256:ddb8fc5d5eede81dfad7846eceb65267fe4cf8b4f324bc74542f694a32335ef2,3496
-- template-haskell-2.17.0.0
-- basement-0.0.12
-- memory-0.16.0
-- file-embed-0.0.14.0
-- cryptonite-0.29
-- network-uri-2.6.4.1
-
-# Override default flag values for local packages and extra-deps
-flags:
-  hakyll:
-    previewserver: false
-    watchserver: false
-    usepandoc: false

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP               #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 --------------------------------------------------------------------------------
@@ -11,14 +12,25 @@ --------------------------------------------------------------------------------
 import Hakyll
 import qualified Hakyll.Core.Logger as L
+import Hakyll.Core.Rules.Internal (RuleSet)
 import Hakyll.Core.Runtime
 import Hakyll.Images
 import System.Directory (doesFileExist)
+import System.Exit      (ExitCode)
 import System.FilePath ((</>))
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.HUnit (Assertion, assertBool, testCase)
 import Text.Printf (printf)
 
+-- RunMode was introduced in Hakyll 4.15
+runCompat :: Configuration -> L.Logger -> Rules a -> IO (ExitCode, RuleSet)
+runCompat = 
+#if MIN_VERSION_hakyll(4,15,0)
+  run RunModeNormal 
+#else
+  run
+#endif
+
 fromAssertions ::
   -- | Name
   String ->
@@ -47,7 +59,7 @@ case1 :: Assertion
 case1 = do
   logger <- L.new L.Error
-  _ <- run testConfiguration logger $ do
+  _ <- runCompat testConfiguration logger $ do
     match "*.jpg" $ do
       route idRoute
       compile $