summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrkkrp <>2018-11-08 16:28:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2018-11-08 16:28:00 (GMT)
commit0d1c2a88d7adaec3711f90602c9554f1939c394e (patch)
treeb98550990322666ce95b517898735ed6844f7c4f
parentb9b050083acfd66c2987e8a5e3121d2ef0982490 (diff)
version 0.2.1.1HEAD0.2.1.1master
-rw-r--r--CHANGELOG.md4
-rw-r--r--mmark-ext.cabal7
-rw-r--r--tests/Text/MMark/Extension/SkylightingSpec.hs5
3 files changed, 13 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab171ff..4778b86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## MMark Ext 0.2.1.1
+
+* Made the tests pass with `skylighting-0.7.4`.
+
## MMark Ext 0.2.1.0
* Added the module `Text.MMark.Extension.GhcSyntaxHighlighter` with
diff --git a/mmark-ext.cabal b/mmark-ext.cabal
index 4780116..4a7fcc5 100644
--- a/mmark-ext.cabal
+++ b/mmark-ext.cabal
@@ -1,7 +1,7 @@
name: mmark-ext
-version: 0.2.1.0
+version: 0.2.1.1
cabal-version: 1.18
-tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.2
+tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.2
license: BSD3
license-file: LICENSE.md
author: Mark Karpov <markkarpov92@gmail.com>
@@ -36,7 +36,7 @@ library
, lucid >= 2.6 && < 3.0
, microlens >= 0.4 && < 0.5
, mmark >= 0.0.4 && <= 0.1
- , modern-uri >= 0.2 && < 0.3
+ , modern-uri >= 0.2 && < 0.4
, skylighting >= 0.5 && < 0.8
, text >= 0.2 && < 1.3
if impl(ghc >= 8.4)
@@ -74,6 +74,7 @@ test-suite tests
, lucid >= 2.6 && < 3.0
, mmark >= 0.0.4 && <= 0.1
, mmark-ext
+ , skylighting >= 0.5 && < 0.8
, text >= 0.2 && < 1.3
build-tools: hspec-discover >= 2.0 && < 3.0
if flag(dev)
diff --git a/tests/Text/MMark/Extension/SkylightingSpec.hs b/tests/Text/MMark/Extension/SkylightingSpec.hs
index f36ce00..106c39f 100644
--- a/tests/Text/MMark/Extension/SkylightingSpec.hs
+++ b/tests/Text/MMark/Extension/SkylightingSpec.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
module Text.MMark.Extension.SkylightingSpec (spec) where
@@ -17,4 +18,8 @@ spec =
context "with info string results in a successful lookup" $
it "renders it correctly" $
"```haskell\nmain :: IO ()\nmain = return ()\n```\n" `to`
+#if MIN_VERSION_skylighting(0,7,4)
+ "<div class=\"source-code\"><pre><code class=\"language-haskell\"><span class=\"ot\">main ::</span><span> </span><span class=\"dt\">IO</span><span> ()</span>\n<span>main </span><span class=\"fu\">=</span><span> </span><span class=\"fu\">return</span><span> ()</span>\n</code></pre></div>\n"
+#else
"<div class=\"source-code\"><pre><code class=\"language-haskell\"><span class=\"ot\">main ::</span><span> </span><span class=\"dt\">IO</span><span> ()</span>\n<span>main </span><span class=\"fu\">=</span><span> return ()</span>\n</code></pre></div>\n"
+#endif