git.iko.soy/typeable/http-api-data
on master help sign in
Allow http-types-0.12
d60c6faOleg Grenrus
.travis.yml+3−3
compare with master
unifiedsplit
@@ -28,7 +28,7 @@ before_cache:
28 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
28 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
29 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
29 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
30
30
31− - rm -fv $HOME/.cabal/packages/head.hackage
31+ - rm -rfv $HOME/.cabal/packages/head.hackage
32
32
33matrix:
33matrix:
34 include:
34 include:
@@ -97,14 +97,14 @@ script:
97
97
98 # build & run tests, build benchmarks
98 # build & run tests, build benchmarks
99 - cabal new-build -w ${HC} ${TEST} ${BENCH} all
99 - 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
101
101
102 # cabal check
102 # cabal check
103 - (cd http-api-data-* && cabal check)
103 - (cd http-api-data-* && cabal check)
104
104
105 # haddock
105 # haddock
106 - rm -rf ./dist-newstyle
106 - 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
108
108
109 - 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
109 - 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
110
110
CHANGELOG.md+6
@@ -1,3 +1,9 @@
1+0.3.7.2
2+---
3+
4+* Allow http-types-0.12
5+* .cabal file adjustments
6+
10.3.7.1
70.3.7.1
2---
8---
3
9
http-api-data.cabal+6−6
@@ -1,5 +1,5 @@
1name: http-api-data
1name: http-api-data
2−version: 0.3.7.1
2+version: 0.3.7.2
3license: BSD3
3license: BSD3
4license-file: LICENSE
4license-file: LICENSE
5author: Nickolay Kudasov <nickolay.kudasov@gmail.com>
5author: Nickolay Kudasov <nickolay.kudasov@gmail.com>
@@ -29,7 +29,7 @@ custom-setup
29 setup-depends:
29 setup-depends:
30 base >= 4.7 && <4.11,
30 base >= 4.7 && <4.11,
31 Cabal >= 1.18 && <2.1,
31 Cabal >= 1.18 && <2.1,
32− cabal-doctest >=1.0.1 && <1.1
32+ cabal-doctest >=1.0.6 && <1.1
33
33
34flag use-text-show
34flag use-text-show
35 description: Use text-show library for efficient ToHttpApiData implementations.
35 description: Use text-show library for efficient ToHttpApiData implementations.
@@ -45,7 +45,7 @@ library
45 , bytestring >= 0.10.4.0 && < 0.11
45 , bytestring >= 0.10.4.0 && < 0.11
46 , containers >= 0.5.5.1 && < 0.6
46 , containers >= 0.5.5.1 && < 0.6
47 , hashable >= 1.1.2.4 && < 1.3
47 , hashable >= 1.1.2.4 && < 1.3
48− , http-types >= 0.8.6 && < 0.12
48+ , http-types >= 0.8.6 && < 0.13
49 , text >= 1.1.1.3 && < 1.3
49 , text >= 1.1.1.3 && < 1.3
50 , time >= 1.4.2 && < 1.9
50 , time >= 1.4.2 && < 1.9
51 , time-locale-compat >= 0.1.1.0 && < 0.2
51 , time-locale-compat >= 0.1.1.0 && < 0.2
@@ -73,10 +73,10 @@ test-suite spec
73 hs-source-dirs: test
73 hs-source-dirs: test
74 ghc-options: -Wall
74 ghc-options: -Wall
75 default-language: Haskell2010
75 default-language: Haskell2010
76− build-tool-depends: hspec-discover:hspec-discover
76+ build-tool-depends: hspec-discover:hspec-discover >= 2.4.7 && <2.5
77 build-depends: HUnit
77 build-depends: HUnit
78− , hspec >= 1.3
78+ , hspec >= 2.4.7
79− , base >= 4 && < 5
79+ , base
80 , bytestring
80 , bytestring
81 , QuickCheck >=2.9
81 , QuickCheck >=2.9
82 , quickcheck-instances >= 0.3.12
82 , quickcheck-instances >= 0.3.12