diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## MMark 0.0.7.1 + +* Builds with `yaml-0.11.1.0`. + +* Dropped support for GHC 8.0 and older. + ## MMark 0.0.7.0 * Added GHCJS support by making `yaml` dependency optional. With GHCJS a diff --git a/LICENSE.md b/LICENSE.md --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright © 2017–2018 Mark Karpov +Copyright © 2017–present Mark Karpov All rights reserved. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -302,6 +302,6 @@ ## License -Copyright © 2017–2019 Mark Karpov +Copyright © 2017–present Mark Karpov Distributed under BSD 3 clause license. diff --git a/Text/MMark.hs b/Text/MMark.hs --- a/Text/MMark.hs +++ b/Text/MMark.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov diff --git a/Text/MMark/Extension.hs b/Text/MMark/Extension.hs --- a/Text/MMark/Extension.hs +++ b/Text/MMark/Extension.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark.Extension --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov diff --git a/Text/MMark/Parser.hs b/Text/MMark/Parser.hs --- a/Text/MMark/Parser.hs +++ b/Text/MMark/Parser.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark.Parser --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov @@ -1188,6 +1188,9 @@ ++ ", value: " ++ show value ) Yaml.CyclicIncludes -> (Nothing, "cyclic includes") +#if MIN_VERSION_yaml(0,11,1) + Yaml.LoadSettingsException _ _ -> (Nothing, "loading settings exception") +#endif #endif emptyIspSpan :: Isp diff --git a/Text/MMark/Parser/Internal.hs b/Text/MMark/Parser/Internal.hs --- a/Text/MMark/Parser/Internal.hs +++ b/Text/MMark/Parser/Internal.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark.Parser.Internal --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov diff --git a/Text/MMark/Parser/Internal/Type.hs b/Text/MMark/Parser/Internal/Type.hs --- a/Text/MMark/Parser/Internal/Type.hs +++ b/Text/MMark/Parser/Internal/Type.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark.Parser.Internal.Type --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov diff --git a/Text/MMark/Render.hs b/Text/MMark/Render.hs --- a/Text/MMark/Render.hs +++ b/Text/MMark/Render.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark.Render --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov diff --git a/Text/MMark/Trans.hs b/Text/MMark/Trans.hs --- a/Text/MMark/Trans.hs +++ b/Text/MMark/Trans.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark.Trans --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov diff --git a/Text/MMark/Type.hs b/Text/MMark/Type.hs --- a/Text/MMark/Type.hs +++ b/Text/MMark/Type.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark.Type --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov diff --git a/Text/MMark/Util.hs b/Text/MMark/Util.hs --- a/Text/MMark/Util.hs +++ b/Text/MMark/Util.hs @@ -1,6 +1,6 @@ -- | -- Module : Text.MMark.Util --- Copyright : © 2017–2019 Mark Karpov +-- Copyright : © 2017–present Mark Karpov -- License : BSD 3 clause -- -- Maintainer : Mark Karpov diff --git a/mmark.cabal b/mmark.cabal --- a/mmark.cabal +++ b/mmark.cabal @@ -1,7 +1,7 @@ name: mmark -version: 0.0.7.0 +version: 0.0.7.1 cabal-version: 1.18 -tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5 +tested-with: GHC==8.2.2, GHC==8.4.4, GHC==8.6.5 license: BSD3 license-file: LICENSE.md author: Mark Karpov @@ -28,14 +28,14 @@ library build-depends: aeson >= 0.11 && < 1.5 - , base >= 4.8 && < 5.0 + , base >= 4.10 && < 5.0 , case-insensitive >= 1.2 && < 1.3 , containers >= 0.5 && < 0.7 , deepseq >= 1.3 && < 1.5 , dlist >= 0.8 && < 0.9 , email-validate >= 2.2 && < 2.4 , foldl >= 1.2 && < 1.5 - , hashable >= 1.0.1.1 && < 1.3 + , hashable >= 1.0.1.1 && < 1.4 , html-entity-map >= 0.1 && < 0.2 , lucid >= 2.6 && < 3.0 , megaparsec >= 7.0 && < 8.0 @@ -49,13 +49,6 @@ , unordered-containers >= 0.2.5 && < 0.3 if !impl(ghcjs) build-depends: yaml >= 0.8.10 && < 0.12 - if !impl(ghc >= 8.0) - build-depends: semigroups == 0.18.* - if !impl(ghc >= 7.10) - build-depends: void == 0.7.* - if !impl(ghc >= 8.0) - build-depends: semigroups == 0.18.* - exposed-modules: Text.MMark , Text.MMark.Extension other-modules: Text.MMark.Parser @@ -69,7 +62,7 @@ ghc-options: -O0 -Wall -Werror else ghc-options: -O2 -Wall - if flag(dev) && impl(ghc >= 8.0) + if flag(dev) ghc-options: -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns @@ -86,7 +79,7 @@ type: exitcode-stdio-1.0 build-depends: QuickCheck >= 2.4 && < 3.0 , aeson >= 0.11 && < 1.5 - , base >= 4.8 && < 5.0 + , base >= 4.10 && < 5.0 , foldl >= 1.2 && < 1.5 , hspec >= 2.0 && < 3.0 , hspec-megaparsec >= 2.0 && < 3.0 @@ -95,8 +88,6 @@ , mmark , modern-uri >= 0.3 && < 0.4 , text >= 0.2 && < 1.3 - if !impl(ghc >= 8.0) - build-depends: semigroups == 0.18.* other-modules: Text.MMarkSpec , Text.MMark.ExtensionSpec , Text.MMark.TestUtils @@ -104,17 +95,15 @@ ghc-options: -O0 -Wall -Werror else ghc-options: -O2 -Wall - if impl(ghcjs) ghcjs-options: -O0 +RTS -K1G -M5G -RTS -Wall -Wwarn=missing-home-modules - default-language: Haskell2010 benchmark bench-speed main-is: Main.hs hs-source-dirs: bench/speed type: exitcode-stdio-1.0 - build-depends: base >= 4.8 && < 5.0 + build-depends: base >= 4.10 && < 5.0 , criterion >= 0.6.2.1 && < 1.6 , mmark , text >= 0.2 && < 1.3 @@ -122,17 +111,15 @@ ghc-options: -O2 -Wall -Werror else ghc-options: -O2 -Wall - if impl(ghcjs) ghcjs-options: -O0 +RTS -K1G -M6G -RTS -Wall -Wwarn=missing-home-modules - default-language: Haskell2010 benchmark bench-memory main-is: Main.hs hs-source-dirs: bench/memory type: exitcode-stdio-1.0 - build-depends: base >= 4.8 && < 5.0 + build-depends: base >= 4.10 && < 5.0 , mmark , text >= 0.2 && < 1.3 , weigh >= 0.0.4 @@ -140,8 +127,6 @@ ghc-options: -O2 -Wall -Werror else ghc-options: -O2 -Wall - if impl(ghcjs) ghcjs-options: -O0 +RTS -K1G -M6G -RTS -Wall -Wwarn=missing-home-modules - default-language: Haskell2010