diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,16 +3,25 @@ `validation-selective` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 0.1.0.2 — Jun 11, 2021 + +* [#62](https://github.com/kowainik/validation-selective/issues/62): + Support GHC-9.2. +* [#64](https://github.com/kowainik/validation-selective/issues/64): + Allow `selective` version `0.5`. +* Allow `hspec-2.11`. +* Allow `doctest-0.20`. + ## 🥧 0.1.0.1 — Mar 14, 2021 -* [#57](https://github.com/kowainik/relude/issues/57): +* [#57](https://github.com/kowainik/validation-selective/issues/57): Support GHC-9.0. Upgrade minor version to 8.10.4 and 8.8.4. ## 0.1.0.0 — May 5, 2020 -* [#41](https://github.com/kowainik/relude/issues/41): +* [#41](https://github.com/kowainik/validation-selective/issues/41): Support GHC-8.10.1. -* [#24](https://github.com/kowainik/relude/issues/24): +* [#24](https://github.com/kowainik/validation-selective/issues/24): Add `validationAll`, `when*` and `maybe*` combinators into `Validation.Combinators`. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -2,12 +2,8 @@ ![Logo](https://user-images.githubusercontent.com/8126674/76859713-c0880200-6851-11ea-8bc1-bb9dee87d44f.png) [![GitHub CI](https://github.com/kowainik/validation-selective/workflows/CI/badge.svg)](https://github.com/kowainik/validation-selective/actions) -[![Build status](https://img.shields.io/travis/kowainik/validation-selective.svg?logo=travis)](https://travis-ci.org/kowainik/validation-selective) -[![Windows build status](https://ci.appveyor.com/api/projects/status/github/kowainik/validation-selective?branch=main&svg=true)](https://ci.appveyor.com/project/kowainik/validation-selective) [![Hackage](https://img.shields.io/hackage/v/validation-selective.svg?logo=haskell)](https://hackage.haskell.org/package/validation-selective) -[![Stackage Lts](http://stackage.org/package/validation-selective/badge/lts)](http://stackage.org/lts/package/validation-selective) -[![Stackage Nightly](http://stackage.org/package/validation-selective/badge/nightly)](http://stackage.org/nightly/package/validation-selective) [![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](LICENSE) Lightweight pure data validation based on `Applicative` and `Selective` functors. diff --git a/src/Validation.hs b/src/Validation.hs --- a/src/Validation.hs +++ b/src/Validation.hs @@ -7,7 +7,7 @@ {- | Copyright: (c) 2014 Chris Allen, Edward Kmett - (c) 2018-2021 Kowainik + (c) 2018-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik Stability: Stable @@ -645,8 +645,8 @@ {-# INLINE empty #-} (<|>) :: Validation e a -> Validation e a -> Validation e a - s@Success{} <|> _ = s - _ <|> s@Success{} = s + s@Success{} <|> _ = s + _ <|> s@Success{} = s Failure e <|> Failure e' = Failure (e <> e') {-# INLINE (<|>) #-} @@ -851,7 +851,7 @@ ... -} instance (NoValidationMonadError, Semigroup e) => Monad (Validation e) where - return = error "Unreachable Validation instance of Monad" + return = pure (>>=) = error "Unreachable Validation instance of Monad" -- | Helper type family to produce error messages diff --git a/src/Validation/Combinators.hs b/src/Validation/Combinators.hs --- a/src/Validation/Combinators.hs +++ b/src/Validation/Combinators.hs @@ -1,5 +1,5 @@ {- | -Copyright: (c) 2020-2021 Kowainik +Copyright: (c) 2020-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik Stability: Stable diff --git a/test/Doctest.hs b/test/Doctest.hs --- a/test/Doctest.hs +++ b/test/Doctest.hs @@ -1,5 +1,5 @@ {- -Copyright: (c) 2018-2020 Kowainik +Copyright: (c) 2018-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik diff --git a/test/Test/Laws.hs b/test/Test/Laws.hs --- a/test/Test/Laws.hs +++ b/test/Test/Laws.hs @@ -9,7 +9,7 @@ {- HLINT ignore "Reduce duplication" -} {- -Copyright: (c) 2018-2020 Kowainik +Copyright: (c) 2018-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik -} diff --git a/validation-selective.cabal b/validation-selective.cabal --- a/validation-selective.cabal +++ b/validation-selective.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: validation-selective -version: 0.1.0.1 +version: 0.1.0.2 synopsis: Lighweight pure data validation based on Applicative and Selective functors description: Lighweight pure data validation based on Applicative and Selective @@ -20,23 +20,24 @@ license-file: LICENSE author: Dmitrii Kovanikov, Veronika Romashkina maintainer: Kowainik -copyright: 2020-2021 Kowainik +copyright: 2020-2022 Kowainik category: Validation, Selective, Data build-type: Simple extra-doc-files: README.md CHANGELOG.md tested-with: GHC == 8.4.4 GHC == 8.6.5 - GHC == 8.8.3 - GHC == 8.10.4 - GHC == 9.0.1 + GHC == 8.8.4 + GHC == 8.10.7 + GHC == 9.0.2 + GHC == 9.2.2 source-repository head type: git location: https://github.com/kowainik/validation-selective.git common common-options - build-depends: base >= 4.11.1.0 && < 4.16 + build-depends: base >= 4.11 && < 4.17 ghc-options: -Wall -Wcompat @@ -53,6 +54,11 @@ ghc-options: -Wmissing-deriving-strategies if impl(ghc >= 8.10) ghc-options: -Wunused-packages + if impl(ghc >= 9.0) + ghc-options: -Winvalid-haddock + if impl(ghc >= 9.2) + ghc-options: -Wredundant-bang-patterns + -Woperator-whitespace default-language: Haskell2010 default-extensions: ConstraintKinds @@ -76,7 +82,7 @@ exposed-modules: Validation Validation.Combinators build-depends: deepseq ^>= 1.4.3.0 - , selective >= 0.3 && < 0.5 + , selective >= 0.3 && < 0.6 test-suite validation-selective-test import: common-options @@ -87,11 +93,11 @@ Test.Laws Test.Properties build-depends: validation-selective - , hedgehog ^>= 1.0 - , hspec ^>= 2.7.1 + , hedgehog >= 1.0 && < 1.2 + , hspec >= 2.7.1 && < 2.11 , hspec-hedgehog ^>= 0.0.1.1 , selective - , text ^>= 1.2.3 + , text >= 1.2.3 && < 2.1 ghc-options: -threaded -rtsopts -with-rtsopts=-N @@ -101,5 +107,5 @@ type: exitcode-stdio-1.0 hs-source-dirs: test main-is: Doctest.hs - build-depends: doctest >= 0.16 && < 0.19 + build-depends: doctest >= 0.16 && < 0.21 ghc-options: -threaded