09aa94e · typeable/validationt

git.iko.soy/typeable/validationt

Merge pull request #1 from 4e6/ghc-84

Add: GHC-8.4 support

commit09aa94ec6273c15924414d0490a653d0f8ab842e authorDenis Redozubov <denis.redozubov@gmail.com> dateMon 25 Jun 2018, 19:15 (8 years ago) parent24578c9 33541bf

3 files changed+129−7

compare with master

unifiedsplit

.travis.yml+104 src/Control/Monad/Validation.hs+14−2 validationt.cabal+11−5

.travis.ymlnew file+104

@@ -0,0 +1,104 @@

1+# This Travis job script has been generated by a script via

2+#

3+# runghc make_travis_yml_2.hs 'validationt.cabal'

4+#

5+# For more information, see https://github.com/hvr/multi-ghc-travis

6+#

7+language: c

8+sudo: false

10+git:

11+ submodules: false # whether to recursively clone submodules

12+

13+cache:

14+ directories:

15+ - $HOME/.cabal/packages

16+ - $HOME/.cabal/store

17+

18+before_cache:

19+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log

20+ # remove files that are regenerated by 'cabal update'

21+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*

22+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json

23+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache

24+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar

25+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

26+

27+ - rm -rfv $HOME/.cabal/packages/head.hackage

28+

29+matrix:

30+ include:

31+ - compiler: "ghc-7.10.3"

32+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

33+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}

34+ - compiler: "ghc-8.0.2"

35+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}

37+ - compiler: "ghc-8.2.2"

38+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

39+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}

40+ - compiler: "ghc-8.4.1"

41+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

42+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}

43+

44+before_install:

45+ - HC=${CC}

46+ - HCPKG=${HC/ghc/ghc-pkg}

47+ - unset CC

48+ - ROOTDIR=$(pwd)

49+ - mkdir -p $HOME/.local/bin

50+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"

51+ - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))

52+ - echo $HCNUMVER

53+

54+install:

55+ - cabal --version

56+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

57+ - BENCH=${BENCH---enable-benchmarks}

58+ - TEST=${TEST---enable-tests}

59+ - HADDOCK=${HADDOCK-true}

60+ - INSTALLED=${INSTALLED-true}

61+ - GHCHEAD=${GHCHEAD-false}

62+ - travis_retry cabal update -v

63+ - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"

64+ - rm -fv cabal.project cabal.project.local

65+ - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

66+ - "printf 'packages: \".\"\\n' > cabal.project"

67+ - cat cabal.project

68+ - if [ -f "./configure.ac" ]; then

69+ (cd "." && autoreconf -i);

70+ fi

71+ - rm -f cabal.project.freeze

72+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all

73+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all

74+ - rm -rf .ghc.environment.* "."/dist

75+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

76+

77+# Here starts the actual work to be performed for the package under test;

78+# any command which exits with a non-zero exit code causes the build to fail.

79+script:

80+ # test that source-distributions can be generated

81+ - (cd "." && cabal sdist)

82+ - mv "."/dist/validationt-*.tar.gz ${DISTDIR}/

83+ - cd ${DISTDIR} || false

84+ - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

85+ - "printf 'packages: validationt-*/*.cabal\\n' > cabal.project"

86+ - cat cabal.project

87+ # this builds all libraries and executables (without tests/benchmarks)

88+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

89+

90+ # Build with installed constraints for packages in global-db

91+ - 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

92+

93+ # build & run tests, build benchmarks

94+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all

95+

96+ # cabal check

97+ - (cd validationt-* && cabal check)

98+

99+ # haddock

100+ - rm -rf ./dist-newstyle

101+ - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi

102+

103+# REGENDATA ["validationt.cabal"]

104+# EOF

src/Control/Monad/Validation.hs+14−2

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE GeneralizedNewtypeDeriving #-}

23{-# LANGUAGE OverloadedStrings #-}

34{-# LANGUAGE TemplateHaskell #-}

@@ -47,10 +48,14 @@ instance (Ord k) => Ixed (MonoidMap k v) where

4748instance (Ord k) => At (MonoidMap k v) where

4849 at key = _MonoidMap . at key

4950

51+#if MIN_VERSION_base(4,11,0)

52+instance (Ord k, Semigroup v) => Semigroup (MonoidMap k v) where

53+ (<>) = mmAppend

54+#endif

55+

5056instance (Ord k, Monoid v) => Monoid (MonoidMap k v) where

5157 mempty = MonoidMap M.empty

52− mappend (MonoidMap a) (MonoidMap b) =

53− MonoidMap $ M.unionWith (<>) a b

58+ mappend = mmAppend

5459

5560instance (ToJSON k, ToJSON v) => ToJSON (MonoidMap k v) where

5661 toJSON (MonoidMap m) = toJSON $ L.map toObj $ M.toList m

@@ -70,6 +75,13 @@ instance (Ord k, FromJSON k, FromJSON v) => FromJSON (MonoidMap k v) where

7075 val <- obj .: "value"

7176 return (key, val)

7277

78+#if MIN_VERSION_base(4,11,0)

79+mmAppend :: (Ord k, Semigroup v) => MonoidMap k v -> MonoidMap k v -> MonoidMap k v

80+#else

81+mmAppend :: (Ord k, Monoid v) => MonoidMap k v -> MonoidMap k v -> MonoidMap k v

82+#endif

83+mmAppend (MonoidMap a) (MonoidMap b) = MonoidMap $ M.unionWith (<>) a b

84+

7385-- | Convenient for 'vZoom' as first artument. Will prevent generation

7486-- of map with 'mempty' values

7587mmSingleton :: (Eq v, Monoid v, Ord k) => k -> v -> MonoidMap k v

validationt.cabal+11−5

@@ -3,9 +3,9 @@

44name: validationt

55version: 0.2.0.0

6−synopsis: Straightforward validation monad. Convenient solution for validating web forms and APIs.

7−-- description:

8−homepage: typeable.io

6+synopsis: Straightforward validation monad.

7+description: Convenient solution for validating web forms and APIs.

8+homepage: https://github.com/typeable/validationt

99license: BSD3

1010license-file: LICENSE

1111author: Typeable.io contributors

@@ -15,11 +15,17 @@ category: Control

1515build-type: Simple

1616extra-source-files: ChangeLog.md

1717cabal-version: >=1.10

18+tested-with: GHC == 7.10.3

19+ , GHC == 8.0.2

20+ , GHC == 8.2.2

21+ , GHC == 8.4.1

22+

23+source-repository head

24+ type: git

25+ location: git@github.com:typeable/validationt.git

1826

1927library

2028 exposed-modules: Control.Monad.Validation

21− -- other-modules:

22− -- other-extensions:

2329 build-depends: base >=4.8 && < 5

2430 , aeson >= 1.0

2531 , containers