diff --git a/.travis.yml b/.travis.yml --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # # runghc make_travis_yml_2.hs 'lens-toml-parser.cabal' # -# For more information, see https://github.com/hvr/multi-ghc-travis +# For more information, see https://github.com/haskell-CI/haskell-ci # language: c sudo: false @@ -28,12 +28,18 @@ matrix: include: - - compiler: "ghc-8.0.2" + - compiler: "ghc-8.6.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.2], sources: [hvr-ghc]}} + - compiler: "ghc-8.4.4" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}} - compiler: "ghc-8.2.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}} + - compiler: "ghc-8.0.2" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}} before_install: - HC=${CC} @@ -51,14 +57,18 @@ - BENCH=${BENCH---enable-benchmarks} - TEST=${TEST---enable-tests} - HADDOCK=${HADDOCK-true} - - INSTALLED=${INSTALLED-true} + - UNCONSTRAINED=${UNCONSTRAINED-true} + - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false} - GHCHEAD=${GHCHEAD-false} - travis_retry cabal update -v - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config" - rm -fv cabal.project cabal.project.local - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$' - "printf 'packages: \".\"\\n' > cabal.project" - - cat cabal.project + - touch cabal.project.local + - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- lens-toml-parser | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi" + - cat cabal.project || true + - cat cabal.project.local || true - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi @@ -72,18 +82,18 @@ # any command which exits with a non-zero exit code causes the build to fail. script: # test that source-distributions can be generated - - (cd "." && cabal sdist) - - mv "."/dist/lens-toml-parser-*.tar.gz ${DISTDIR}/ + - cabal new-sdist all + - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - "printf 'packages: lens-toml-parser-*/*.cabal\\n' > cabal.project" - - cat cabal.project + - touch cabal.project.local + - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- lens-toml-parser | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi" + - cat cabal.project || true + - cat cabal.project.local || true # this builds all libraries and executables (without tests/benchmarks) - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all - # Build with installed constraints for packages in global-db - - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi - # build & run tests, build benchmarks - cabal new-build -w ${HC} ${TEST} ${BENCH} all - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi @@ -92,8 +102,10 @@ - (cd lens-toml-parser-* && cabal check) # haddock - - rm -rf ./dist-newstyle - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi + + # Build without installed constraints for packages in global-db + - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi # REGENDATA ["lens-toml-parser.cabal"] # EOF diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -13,3 +13,8 @@ * Refactored (used `Right` instead of `pure` in prism definitions). * Simplified tests/Main.hs to appease hlint. + +## 0.1.0.3 -- 2018-11-14 + +* Loosened constraints on `base`, `containers`, `profunctors`, and `time`. +* Tweaked tests/Main.hs to appease hlint. diff --git a/lens-toml-parser.cabal b/lens-toml-parser.cabal --- a/lens-toml-parser.cabal +++ b/lens-toml-parser.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: lens-toml-parser -version: 0.1.0.2 +version: 0.1.0.3 synopsis: Lenses for toml-parser description: This library provides lenses for toml-parser. license: ISC @@ -14,7 +14,7 @@ category: Language, Lenses build-type: Simple cabal-version: >=1.10 -tested-with: GHC == 8.0.2, GHC == 8.2.2 +tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.2 extra-source-files: .gitignore @@ -31,10 +31,10 @@ exposed-modules: TOML.Lens -- other-modules: -- other-extensions: - build-depends: base >=4.8 && <4.11 + build-depends: base >=4.8 && <4.13 , text >=1.2 && <1.3 - , time >=1.5 && <1.9 - , profunctors >=5.2 && <5.3 + , time >=1.5 && <1.10 + , profunctors >=5.2 && <5.4 , toml-parser >=0.1 && <0.2 hs-source-dirs: src default-language: Haskell2010 @@ -43,8 +43,8 @@ test-suite tests type: exitcode-stdio-1.0 main-is: Main.hs - build-depends: base >=4.8 && <4.11 - , containers >=0.5 && <0.6 + build-depends: base >=4.8 && <4.13 + , containers >=0.5 && <0.7 , text >=1.2 && <1.3 , dwergaz >=0.2 && <0.3 , toml-parser >=0.1 && <0.2 diff --git a/src/TOML/Lens.hs b/src/TOML/Lens.hs --- a/src/TOML/Lens.hs +++ b/src/TOML/Lens.hs @@ -1,7 +1,7 @@ -- | -- Module : TOML.Lens -- Description : Lenses for toml-parser --- Copyright : (c) 2017, Henry Till +-- Copyright : (c) 2017-2018, Henry Till -- License : ISC -- Maintainer : henrytill@gmail.com -- Stability : experimental diff --git a/tests/Main.hs b/tests/Main.hs --- a/tests/Main.hs +++ b/tests/Main.hs @@ -141,5 +141,5 @@ main = do ex <- readTOMLFile "./example/example-v0.4.0.toml" let rs = runTests ex - _ <- mapM_ print rs + mapM_ print rs unless (all isPassed rs) exitFailure