diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,15 +3,22 @@ `shortcut-links` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 0.5.1.1 — Jan 27, 2021 + +* Drop support of GHC-8.2.2. +* Update supported version to GHC-8.10.3. +* Cover doctests in all modules. +* Update copyrights. + ## 0.5.1.0 — May 6, 2020 -* [#10](https://github.com/kowainik/colourista/issues/10): +* [#10](https://github.com/kowainik/shortcut-links/issues/10): Support GHC-8.10.1. Move to support of GHC-8.8.3 instead of 8.8.1. -* [#9](https://github.com/kowainik/colourista/issues/9): +* [#9](https://github.com/kowainik/shortcut-links/issues/9): Add more Haskell shortcuts: `hackage`, `stackage`, `haskell` and `cabal`. -* [#1](https://github.com/kowainik/colourista/issues/1): +* [#1](https://github.com/kowainik/shortcut-links/issues/1): Add `telegram` shortcut links. -* [#3](https://github.com/kowainik/colourista/issues/3): +* [#3](https://github.com/kowainik/shortcut-links/issues/3): Treat `#` correctly in wikipedia links. ## 0.5.0.0 - Dec 26, 2019 diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,12 +1,10 @@ # shortcut-links -[![GitHub CI](https://github.com/kowainik/colourista/workflows/CI/badge.svg)](https://github.com/kowainik/colourista/actions) -[![Travis CI](https://img.shields.io/travis/kowainik/shortcut-links.svg?logo=travis)](https://travis-ci.org/kowainik/shortcut-links) -[![AppVeyor CI](https://ci.appveyor.com/api/projects/status/github/kowainik/shortcut-links?branch=master&svg=true)](https://ci.appveyor.com/project/kowainik/shortcut-links) +[![GitHub CI](https://github.com/kowainik/shortcut-links/workflows/CI/badge.svg)](https://github.com/kowainik/shortcut-links/actions) [![Hackage](https://img.shields.io/hackage/v/shortcut-links.svg?logo=haskell)](https://hackage.haskell.org/package/shortcut-links) [![Stackage LTS](http://stackage.org/package/shortcut-links/badge/lts)](http://stackage.org/lts/package/shortcut-links) [![Stackage Nightly](http://stackage.org/package/shortcut-links/badge/nightly)](http://stackage.org/nightly/package/shortcut-links) -[![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](https://github.com/kowainik/shortcut-links/blob/master/LICENSE) +[![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](LICENSE) This package is a database of link shortcuts. A Markdown example: `[Google](@w)` turns into . diff --git a/shortcut-links.cabal b/shortcut-links.cabal --- a/shortcut-links.cabal +++ b/shortcut-links.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: shortcut-links -version: 0.5.1.0 +version: 0.5.1.1 synopsis: Link shortcuts for use in text markup description: This package is a database of link shortcuts. A Markdown example: @@ -14,24 +14,23 @@ author: Artyom maintainer: Kowainik copyright: 2015–2019 Aelve (BSD-3-Clause) - 2019-2020 Kowainik + 2019-2021 Kowainik category: Text, Web, Markdown build-type: Simple stability: stable extra-doc-files: README.md CHANGELOG.md -tested-with: GHC == 8.2.2 - GHC == 8.4.4 +tested-with: GHC == 8.4.4 GHC == 8.6.5 - GHC == 8.8.3 - GHC == 8.10.1 + GHC == 8.8.4 + GHC == 8.10.3 source-repository head type: git location: git://github.com/kowainik/shortcut-links.git common common-options - build-depends: base >= 4.10 && < 4.15 + build-depends: base >= 4.11 && < 4.15 ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates diff --git a/src/ShortcutLinks.hs b/src/ShortcutLinks.hs --- a/src/ShortcutLinks.hs +++ b/src/ShortcutLinks.hs @@ -1,6 +1,6 @@ {- | Copyright: (c) 2015-2019 Aelve - (c) 2019-2020 Kowainik + (c) 2019-2021 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik -} @@ -35,7 +35,9 @@ For instance, if you want to add @hk@ as a synonym for @hackage@, you'd write: ->>> useShortcutFrom ((["hk"], hackage) : allShortcuts) +@ +useShortcutFrom ((["hk"], hackage) : allShortcuts) +@ -} useShortcutFrom :: [([Text], Shortcut)] diff --git a/src/ShortcutLinks/All.hs b/src/ShortcutLinks/All.hs --- a/src/ShortcutLinks/All.hs +++ b/src/ShortcutLinks/All.hs @@ -3,7 +3,7 @@ {- | Copyright: (c) 2015-2019 Aelve - (c) 2019-2020 Kowainik + (c) 2019-2021 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik -} @@ -104,7 +104,6 @@ import Control.Monad (unless, when) import Data.Char (isAlphaNum, isDigit, isPunctuation, isSpace) import Data.Maybe (fromMaybe, isNothing) -import Data.Semigroup ((<>)) import Data.Text (Text) import ShortcutLinks.Utils (format, formatSlash, orElse, replaceSpaces, stripPrefixCI, titleFirst, @@ -116,6 +115,7 @@ -- $setup -- >>> import ShortcutLinks +-- >>> import ShortcutLinks.Utils -- | Resulting data type over the work of @shortcut-links@ data Result a diff --git a/src/ShortcutLinks/Utils.hs b/src/ShortcutLinks/Utils.hs --- a/src/ShortcutLinks/Utils.hs +++ b/src/ShortcutLinks/Utils.hs @@ -2,7 +2,7 @@ {- | Copyright: (c) 2015-2019 Aelve - (c) 2019-2020 Kowainik + (c) 2019-2021 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik @@ -20,7 +20,6 @@ ) where import Data.Char (isSpace, toUpper) -import Data.Semigroup ((<>)) import Data.Text (Text) import qualified Data.Text as T diff --git a/test/Doctest.hs b/test/Doctest.hs --- a/test/Doctest.hs +++ b/test/Doctest.hs @@ -25,4 +25,6 @@ : "-XScopedTypeVariables" : "-XTypeApplications" : [ "src/ShortcutLinks/All.hs" + , "src/ShortcutLinks/Utils.hs" + , "src/ShortcutLinks.hs" ]