From 781c51555352afbca7affd076c63cc6db6517e47 Mon Sep 17 00:00:00 2001 From: iko Date: Tue, 4 Feb 2020 15:03:39 +0300 Subject: [PATCH 1/3] bumped version and added explicit default-language to tests. --- ChangeLog.md | 6 ++++++ validationt.cabal | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 2e0bfe9..bc23d3c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,11 @@ # Revision history for validationt +## 0.3.0 + +* Added documentation. +* Fixed `textErrors` behaviour. +* Dropped `transformers-lift` dependency. + ## 0.2.1.0 * GHC 8.4 support diff --git a/validationt.cabal b/validationt.cabal index 78cce4f..8613306 100644 --- a/validationt.cabal +++ b/validationt.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: validationt -version: 0.2.1.0 +version: 0.3.0 synopsis: Straightforward validation monad. description: Convenient solution for validating web forms and APIs. homepage: https://github.com/typeable/validationt @@ -54,6 +54,7 @@ test-suite doctest hs-source-dirs: test ghc-options: -Wall main-is: Doc.hs + default-language: Haskell2010 build-depends: base >=4.8 && < 5 , aeson >= 1.0 , doctest From bf15ce7c33c3dbf72a21d1659446325136c105fb Mon Sep 17 00:00:00 2001 From: iko Date: Tue, 4 Feb 2020 15:22:29 +0300 Subject: [PATCH 2/3] renamed travisci fields --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3db6438..76de8f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,15 +4,13 @@ language: haskell git: depth: 5 -cabal: "2.4" - cache: directories: - "$HOME/.cabal/store" - "$HOME/.stack" - "$TRAVIS_BUILD_DIR/.stack-work" -matrix: +jobs: include: # Cabal From 9da2d9a3f2daffcffc706c7f070cd9698fdc1e1d Mon Sep 17 00:00:00 2001 From: iko Date: Tue, 4 Feb 2020 16:23:03 +0300 Subject: [PATCH 3/3] Removed cabal from travis --- .travis.yml | 37 +++++++++++++------------------------ test/Doc.hs | 2 +- validationt.cabal | 20 +++++--------------- 3 files changed, 19 insertions(+), 40 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76de8f4..748581e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,38 +12,27 @@ cache: jobs: include: - - # Cabal + - ghc: 8.6.5 + env: SNAPSHOT="lts-14.22" + - ghc: 8.6.4 + env: SNAPSHOT="lts-13.19" + - ghc: 8.6.3 + env: SNAPSHOT="lts-13.11" - ghc: 8.4.4 - - ghc: 8.6.5 - - # Stack - - ghc: 8.6.5 - env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml" + env: SNAPSHOT="lts-12.26" install: - | - if [ -z "$STACK_YAML" ]; then - ghc --version - cabal --version - cabal new-update - cabal new-build --enable-tests --enable-benchmarks - else - # install stack - curl -sSL https://get.haskellstack.org/ | sh + # install stack + curl -sSL https://get.haskellstack.org/ | sh - # build project with stack - stack --version - stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks - fi + # build project with stack + stack --version + stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks --resolver=$SNAPSHOT script: - | - if [ -z "$STACK_YAML" ]; then - cabal new-test --enable-tests - else - stack test --system-ghc - fi + stack test --system-ghc notifications: email: false diff --git a/test/Doc.hs b/test/Doc.hs index 4efb7ee..3e5fba2 100644 --- a/test/Doc.hs +++ b/test/Doc.hs @@ -3,4 +3,4 @@ module Main (main) where import Test.DocTest main :: IO () -main = doctest [ "-XOverloadedStrings", "src" ] +main = doctest [ "-XOverloadedStrings", "-isrc", "src" ] diff --git a/validationt.cabal b/validationt.cabal index 8613306..21fbe1f 100644 --- a/validationt.cabal +++ b/validationt.cabal @@ -50,22 +50,12 @@ library -Wmissing-export-lists test-suite doctest + default-language: Haskell2010 type: exitcode-stdio-1.0 hs-source-dirs: test ghc-options: -Wall main-is: Doc.hs - default-language: Haskell2010 - build-depends: base >=4.8 && < 5 - , aeson >= 1.0 - , doctest - , containers - , exceptions - , lens - , monad-control - , mtl - , QuickCheck - , text - , transformers - , transformers-base - , vector - , doctest + build-depends: + base >= 4.10.0.0 + , doctest >= 0.11.4 + , validationt