git.iko.soy/typeable/http-api-data
on master help sign in
Support GHC-8.6
commitff11afea1885e4591c9e33ea9b7cfe78f1235523 authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 24 Sep 2018, 23:04 (8 years ago) parent2c0800e
6 files changed+45−135
compare with master
unifiedsplit
.travis.yml+9−19 cabal.make-travis-yml−54 http-api-data.cabal+33−21 stack-ghc-7.10.yaml−12 stack-ghc-7.8.yaml−26 stack.yaml+3−3
.travis.yml+9−19
@@ -2,7 +2,7 @@
22#
33# runghc make_travis_yml_2.hs '--config' '--output' '.travis.yml' 'http-api-data.cabal'
44#
5−# For more information, see https://github.com/hvr/multi-ghc-travis
5+# For more information, see https://github.com/haskell-CI/haskell-ci
66#
77language: c
88sudo: false
@@ -32,21 +32,24 @@ before_cache:
3232
3333matrix:
3434 include:
35+ - compiler: "ghc-8.6.1"
36+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
3538 - compiler: "ghc-8.4.3"
3639 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
3841 - compiler: "ghc-8.2.2"
3942 # env: TEST=--disable-tests BENCH=--disable-benchmarks
40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
43+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4144 - compiler: "ghc-8.0.2"
4245 # env: TEST=--disable-tests BENCH=--disable-benchmarks
43− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
46+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4447 - compiler: "ghc-7.10.3"
4548 # env: TEST=--disable-tests BENCH=--disable-benchmarks
46− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
49+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
4750 - compiler: "ghc-7.8.4"
4851 # env: TEST=--disable-tests BENCH=--disable-benchmarks
49− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
52+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
5053
5154before_install:
5255 - HC=${CC}
@@ -116,18 +119,5 @@ script:
116119 # Build without installed constraints for packages in global-db
117120 - 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
118121
119− # Constraint sets
120− - rm -rf cabal.project.local
121−
122− # Constraint set lower-bounds-7.8.4
123− - 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='semigroups ==0.16' --constraint='text ==1.1.1.3' --constraint='time ==1.4.2' --constraint='time-local-compat ==0.1.1.0' --constraint='unordered-containers ==0.2.6.0' --constraint='uri-bytestring ==0.1.7' --constraint='uuid-types ==1.0.2' all; else echo skipping...; fi
124−
125− # Constraint set lower-bounds-7.10.3
126− - if [ $HCNUMVER -eq 71003 ]; 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.6.0' --constraint='containers ==0.5.6.1' --constraint='hashable ==1.2.3.2' --constraint='http-types ==0.8.6' --constraint='semigroups ==0.16.0.1' --constraint='text ==1.2.0.2' --constraint='time ==1.5.0.1' --constraint='time-local-compat ==0.1.1.0' --constraint='unordered-containers ==0.2.6.0' --constraint='uri-bytestring ==0.1.7' --constraint='uuid-types ==1.0.2' all; else echo skipping...; fi
127−
128− # Constraint set lower-bounds-8.0.2
129− - if [ $HCNUMVER -eq 80002 ]; 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.6.0' --constraint='containers ==0.5.7.0' --constraint='hashable ==1.2.4.0' --constraint='http-types ==0.8.6' --constraint='text ==1.2.2.0' --constraint='time ==1.5.0.1' --constraint='time-local-compat ==0.1.1.0' --constraint='unordered-containers ==0.2.6.0' --constraint='uri-bytestring ==0.2.1.0' --constraint='uuid-types ==1.0.2' all; else echo skipping...; fi
130−
131−
132122# REGENDATA ["--config","--output",".travis.yml","http-api-data.cabal"]
133123# EOF
cabal.make-travis-yml−54
@@ -1,56 +1,2 @@
11jobs: :2
22branches: master
3−
4−-- we use http-types ==0.8.6
5−-- because build plan has blaze-builder-0.4
6−--
7−-- strict lower-bound for http-types ==0.8.3,
8−constraint-set lower-bounds-7.8.4
9− ghc: == 7.8.4
10− constraints:
11− attoparsec ==0.13.0.1,
12− attoparsec-iso8601 ==1.0.0.0,
13− bytestring ==0.10.4.0,
14− containers ==0.5.5.1,
15− hashable ==1.1.2.4,
16− http-types ==0.8.6,
17− semigroups ==0.16,
18− text ==1.1.1.3,
19− time ==1.4.2,
20− time-local-compat ==0.1.1.0,
21− unordered-containers ==0.2.6.0,
22− uri-bytestring ==0.1.7,
23− uuid-types ==1.0.2
24−
25−constraint-set lower-bounds-7.10.3
26− ghc: == 7.10.3
27− constraints:
28− attoparsec ==0.13.0.1,
29− attoparsec-iso8601 ==1.0.0.0,
30− bytestring ==0.10.6.0,
31− containers ==0.5.6.1,
32− hashable ==1.2.3.2,
33− http-types ==0.8.6,
34− semigroups ==0.16.0.1,
35− text ==1.2.0.2,
36− time ==1.5.0.1,
37− time-local-compat ==0.1.1.0,
38− unordered-containers ==0.2.6.0,
39− uri-bytestring ==0.1.7,
40− uuid-types ==1.0.2
41−
42−constraint-set lower-bounds-8.0.2
43− ghc: == 8.0.2
44− constraints:
45− attoparsec ==0.13.0.1,
46− attoparsec-iso8601 ==1.0.0.0,
47− bytestring ==0.10.6.0,
48− containers ==0.5.7.0,
49− hashable ==1.2.4.0,
50− http-types ==0.8.6,
51− text ==1.2.2.0,
52− time ==1.5.0.1,
53− time-local-compat ==0.1.1.0,
54− unordered-containers ==0.2.6.0,
55− uri-bytestring ==0.2.1.0,
56− uuid-types ==1.0.2
http-api-data.cabal+33−21
@@ -24,7 +24,8 @@ tested-with:
2424 GHC==7.10.3,
2525 GHC==8.0.2,
2626 GHC==8.2.2,
27− GHC==8.4.3
27+ GHC==8.4.3,
28+ GHC==8.6.1
2829
2930custom-setup
3031 setup-depends:
@@ -40,24 +41,32 @@ flag use-text-show
4041library
4142 hs-source-dirs: src/
4243 include-dirs: include/
43− build-depends: base >= 4.7 && < 4.12
44− , attoparsec >= 0.13.0.1 && < 0.14
45− , attoparsec-iso8601 >= 1.0.0.0 && < 1.1
44+
45+ -- GHC bundled
46+ build-depends: base >= 4.7 && < 4.13
4647 , bytestring >= 0.10.4.0 && < 0.11
47− , containers >= 0.5.5.1 && < 0.6
48− , hashable >= 1.1.2.4 && < 1.3
49− , http-types >= 0.8.6 && < 0.13
50− , text >= 1.1.1.3 && < 1.3
48+ , containers >= 0.5.5.1 && < 0.7
49+ , text >= 1.2.3.0 && < 1.3
5150 , time >= 1.4.2 && < 1.9
52− , time-locale-compat >= 0.1.1.0 && < 0.2
53− , unordered-containers >= 0.2.6.0 && < 0.3
54− , uuid-types >= 1.0.2 && < 1.1
55− , cookie >= 0.4 && < 0.45
51+
52+ -- other-dependencies
53+ build-depends:
54+ attoparsec >= 0.13.2.2 && < 0.14
55+ , attoparsec-iso8601 >= 1.0.0.0 && < 1.1
56+ , cookie >= 0.4.3 && < 0.4.5
57+ , hashable >= 1.2.7.0 && < 1.3
58+ , http-types >= 0.12.1 && < 0.13
59+ , time-locale-compat >= 0.1.1.5 && < 0.2
60+ , unordered-containers >= 0.2.9.0 && < 0.3
61+ , uuid-types >= 1.0.3 && <1.1
62+
5663 if !impl(ghc >= 8.0)
57− build-depends: semigroups >= 0.16 && < 0.19
64+ build-depends: semigroups >= 0.18.5 && < 0.19
65+
5866 if flag(use-text-show)
5967 cpp-options: -DUSE_TEXT_SHOW
60− build-depends: text-show >= 2
68+ build-depends: text-show >= 3.7.4 && <3.8
69+
6170 exposed-modules:
6271 Web.HttpApiData
6372 Web.FormUrlEncoded
@@ -76,13 +85,11 @@ test-suite spec
7685 hs-source-dirs: test
7786 ghc-options: -Wall
7887 default-language: Haskell2010
79− build-tool-depends: hspec-discover:hspec-discover >= 2.4.7 && <2.5
80− build-depends: HUnit
81− , hspec >= 2.4.7
82− , base
88+ build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.6
89+ -- inherited depndencies
90+ build-depends:
91+ base
8392 , bytestring
84− , QuickCheck >=2.9
85− , quickcheck-instances >= 0.3.12
8693 , unordered-containers
8794 , http-api-data
8895 , text
@@ -90,12 +97,17 @@ test-suite spec
9097 , bytestring
9198 , uuid-types
9299
100+ build-depends: HUnit >= 1.6.0.0 && <1.7
101+ , hspec >= 2.5.5 && <2.6
102+ , QuickCheck >= 2.11.3 && <2.13
103+ , quickcheck-instances >= 0.3.19 && <0.4
104+
93105test-suite doctests
94106 ghc-options: -Wall
95107 build-depends:
96108 base,
97109 directory >= 1.0,
98− doctest >= 0.11 && <0.17,
110+ doctest >= 0.16.0 && <0.17,
99111 filepath
100112 default-language: Haskell2010
101113 hs-source-dirs: test
stack-ghc-7.10.yamldeleted−12
@@ -1,12 +0,0 @@
1−resolver: lts-6.8
2−
3−packages:
4−- '.'
5−
6−flags:
7− http-api-data:
8− use-text-show: false
9−
10−extra-deps:
11−- QuickCheck-2.9.2
12−extra-package-dbs: []
stack-ghc-7.8.yamldeleted−26
@@ -1,26 +0,0 @@
1−resolver: lts-2.22
2−
3−packages:
4−- '.'
5−
6−flags:
7− http-api-data:
8− use-text-show: false
9−
10−extra-deps:
11−- time-locale-compat-0.1.1.3
12−- uri-bytestring-0.2.2.0
13−# below are dependencies necessary for use-text-show=true
14−- text-show-2.1.2
15−- base-compat-0.9.1
16−- bifunctors-5.2
17−- semigroups-0.16.2.2
18−- th-lift-0.7.6
19−- transformers-compat-0.4.0.4
20−- base-orphans-0.5.4
21−- generic-deriving-1.9.0
22−- doctest-0.11.0
23−- QuickCheck-2.9.2
24−- quickcheck-instances-0.3.12
25−- quickcheck-io-0.1.3
26−extra-package-dbs: []
stack.yaml+3−3
@@ -1,6 +1,6 @@
1+resolver: lts-12.10
2+packages:
3+- '.'
14flags:
25 http-api-data:
36 use-text-show: false
4−packages:
5−- .
6−resolver: lts-12.9