d60c6fa · typeable/http-api-data

git.iko.soy/typeable/http-api-data

Allow http-types-0.12

commitd60c6fa62cfe8264de682cb5294c5f92a28dd3f0 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 28 Jan 2018, 15:10 (9 years ago) parentc623065

3 files changed+15−9

compare with master

unifiedsplit

.travis.yml+3−3 CHANGELOG.md+6 http-api-data.cabal+6−6

.travis.yml+3−3

@@ -28,7 +28,7 @@ before_cache:

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

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

3030

31− - rm -fv $HOME/.cabal/packages/head.hackage

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

3232

3333matrix:

3434 include:

@@ -97,14 +97,14 @@ script:

9797

9898 # build & run tests, build benchmarks

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

100− - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi

100+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi

101101

102102 # cabal check

103103 - (cd http-api-data-* && cabal check)

104104

105105 # haddock

106106 - rm -rf ./dist-newstyle

107− - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi

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

108108

109109 - if [ $HCNUMVER -eq 70804 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='attoparsec ==0.13.0.1' --constraint='attoparsec-iso8601 ==1.0.0.0' --constraint='bytestring ==0.10.4.0' --constraint='containers ==0.5.5.1' --constraint='hashable ==1.1.2.4' --constraint='http-types ==0.8.6' --constraint='text ==1.1.1.3' --constraint='time ==1.4.2' --constraint='time-local-compat ==0.1.1.0' --constraint='unordered-containers ==0.2.5.0' --constraint='uri-bytestring ==0.1.7' --constraint='uuid-types ==1.0.2' all; else echo skipping...; fi

110110

CHANGELOG.md+6

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

1+0.3.7.2

2+---

4+* Allow http-types-0.12

5+* .cabal file adjustments

170.3.7.1

28---

http-api-data.cabal+6−6

@@ -1,5 +1,5 @@

11name: http-api-data

2−version: 0.3.7.1

2+version: 0.3.7.2

33license: BSD3

44license-file: LICENSE

55author: Nickolay Kudasov <nickolay.kudasov@gmail.com>

@@ -29,7 +29,7 @@ custom-setup

2929 setup-depends:

3030 base >= 4.7 && <4.11,

3131 Cabal >= 1.18 && <2.1,

32− cabal-doctest >=1.0.1 && <1.1

32+ cabal-doctest >=1.0.6 && <1.1

3333

3434flag use-text-show

3535 description: Use text-show library for efficient ToHttpApiData implementations.

@@ -45,7 +45,7 @@ library

4545 , bytestring >= 0.10.4.0 && < 0.11

4646 , containers >= 0.5.5.1 && < 0.6

4747 , hashable >= 1.1.2.4 && < 1.3

48− , http-types >= 0.8.6 && < 0.12

48+ , http-types >= 0.8.6 && < 0.13

4949 , text >= 1.1.1.3 && < 1.3

5050 , time >= 1.4.2 && < 1.9

5151 , time-locale-compat >= 0.1.1.0 && < 0.2

@@ -73,10 +73,10 @@ test-suite spec

7373 hs-source-dirs: test

7474 ghc-options: -Wall

7575 default-language: Haskell2010

76− build-tool-depends: hspec-discover:hspec-discover

76+ build-tool-depends: hspec-discover:hspec-discover >= 2.4.7 && <2.5

7777 build-depends: HUnit

78− , hspec >= 1.3

79− , base >= 4 && < 5

78+ , hspec >= 2.4.7

79+ , base

8080 , bytestring

8181 , QuickCheck >=2.9

8282 , quickcheck-instances >= 0.3.12