git.iko.soy/typeable/servant-swagger-ui
on master help sign in
Support GHC 8.10, relax bounds for servant
commitbfb1f553f37bb61d69168c31c7803a49a6bee4e1 authorMaxim Koltsov <kolmax94@gmail.com> dateWed 5 Aug 2020, 13:15 (6 years ago) parent828ded3
6 files changed+72−42
compare with master
unifiedsplit
.travis.yml+41−14 servant-swagger-ui-core/servant-swagger-ui-core.cabal+7−6 servant-swagger-ui-example/servant-swagger-ui-example.cabal+5−4 servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal+7−6 servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal+6−6 servant-swagger-ui/servant-swagger-ui.cabal+6−6
.travis.yml+41−14
@@ -2,9 +2,13 @@
22#
33# haskell-ci '--output' '.travis.yml' '--config=cabal.haskell-ci' 'cabal.project'
44#
5+# To regenerate the script (for example after adjusting tested-with) run
6+#
7+# haskell-ci regenerate
8+#
59# For more information, see https://github.com/haskell-CI/haskell-ci
610#
7−# version: 0.9.20200121
11+# version: 0.10.3
812#
913version: ~> 1.0
1014language: c
@@ -32,26 +36,29 @@ before_cache:
3236 - rm -rfv $CABALHOME/packages/head.hackage
3337jobs:
3438 include:
35− - compiler: ghc-8.8.1
36− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
39+ - compiler: ghc-8.10.2
40+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.2","cabal-install-3.2"]}}
41+ os: linux
42+ - compiler: ghc-8.8.4
43+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.4","cabal-install-3.2"]}}
3744 os: linux
3845 - compiler: ghc-8.6.5
39− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
46+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
4047 os: linux
4148 - compiler: ghc-8.4.4
42− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
49+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
4350 os: linux
4451 - compiler: ghc-8.2.2
45− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
52+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}
4653 os: linux
4754 - compiler: ghc-8.0.2
48− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
55+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}
4956 os: linux
5057 - compiler: ghc-7.10.3
51− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
58+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.2"]}}
5259 os: linux
5360 - compiler: ghc-7.8.4
54− addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
61+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.2"]}}
5562 os: linux
5663before_install:
5764 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
@@ -105,6 +112,16 @@ install:
105112 echo "packages: servant-swagger-ui-example" >> cabal.project
106113 echo "packages: servant-swagger-ui-jensoleg" >> cabal.project
107114 echo "packages: servant-swagger-ui-redoc" >> cabal.project
115+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui' >> cabal.project ; fi
116+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
117+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-core' >> cabal.project ; fi
118+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
119+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-example' >> cabal.project ; fi
120+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
121+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-jensoleg' >> cabal.project ; fi
122+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
123+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-redoc' >> cabal.project ; fi
124+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
108125 - |
109126 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
110127 - cat cabal.project || true
@@ -117,8 +134,8 @@ install:
117134 - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
118135 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
119136 - rm cabal.project.freeze
120− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
121− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
137+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
138+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
122139script:
123140 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
124141 # Packaging...
@@ -142,6 +159,16 @@ script:
142159 echo "packages: ${PKGDIR_servant_swagger_ui_example}" >> cabal.project
143160 echo "packages: ${PKGDIR_servant_swagger_ui_jensoleg}" >> cabal.project
144161 echo "packages: ${PKGDIR_servant_swagger_ui_redoc}" >> cabal.project
162+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui' >> cabal.project ; fi
163+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
164+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-core' >> cabal.project ; fi
165+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
166+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-example' >> cabal.project ; fi
167+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
168+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-jensoleg' >> cabal.project ; fi
169+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
170+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-swagger-ui-redoc' >> cabal.project ; fi
171+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
145172 - |
146173 - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
147174 - cat cabal.project || true
@@ -170,9 +197,9 @@ script:
170197 # Constraint set servant-0.15
171198 - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all ; fi
172199 # Constraint set servant-0.16
173− - if [ $HCNUMVER -ge 80000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
200+ - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 81000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
174201 # Constraint set servant-0.17
175− - if [ $HCNUMVER -ge 80000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
202+ - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 81000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
176203
177−# REGENDATA ("0.9.20200121",["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"])
204+# REGENDATA ("0.10.3",["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"])
178205# EOF
servant-swagger-ui-core/servant-swagger-ui-core.cabal+7−6
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-core
33version: 0.3.3
4−x-revision: 3
4+x-revision: 4
55synopsis: Servant swagger ui core components
66category: Web, Servant, Swagger
77description:
@@ -26,7 +26,8 @@ tested-with:
2626 || ==8.2.2
2727 || ==8.4.4
2828 || ==8.6.5
29− || ==8.8.1
29+ || ==8.8.4
30+ || ==8.10.2
3031
3132extra-source-files: Changelog.md
3233
@@ -38,14 +39,14 @@ library
3839 hs-source-dirs: src
3940 ghc-options: -Wall
4041 build-depends:
41− base >=4.7 && <4.14
42+ base >=4.7 && <4.15
4243 , blaze-markup >=0.7.0.2 && <0.9
4344 , bytestring >=0.10.4.0 && <0.11
4445 , http-media >=0.7.1.3 && <0.9
45− , servant >=0.14 && <0.18
46+ , servant >=0.14 && <0.19
4647 , servant-blaze >=0.8 && <0.10
47− , servant-server >=0.14 && <0.18
48− , swagger2 >=2.3.0.1 && <2.6
48+ , servant-server >=0.14 && <0.19
49+ , swagger2 >=2.3.0.1 && <2.7
4950 , text >=1.2.3.0 && <1.3
5051 , transformers >=0.3 && <0.6
5152 , transformers-compat >=0.3 && <0.7
servant-swagger-ui-example/servant-swagger-ui-example.cabal+5−4
@@ -20,7 +20,8 @@ tested-with:
2020 || ==8.2.2
2121 || ==8.4.4
2222 || ==8.6.5
23− || ==8.8.1
23+ || ==8.8.4
24+ || ==8.10.2
2425
2526source-repository head
2627 type: git
@@ -30,10 +31,10 @@ executable servant-swagger-ui-example
3031 main-is: Main.hs
3132 ghc-options: -threaded
3233 build-depends:
33− aeson >=0.8.0.2 && <1.5
34− , base >=4.7 && <4.14
34+ aeson >=0.8.0.2 && <1.6
35+ , base >=4.7 && <4.15
3536 , base-compat >=0.9.3 && <0.12
36− , lens >=4.7.0.1 && <4.19
37+ , lens >=4.7.0.1 && <4.20
3738 , servant
3839 , servant-server
3940 , servant-swagger
servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal+7−6
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-jensoleg
33version: 0.3.3
4−x-revision: 3
4+x-revision: 4
55synopsis: Servant swagger ui: Jens-Ole Graulund theme
66category: Web, Servant, Swagger
77description:
@@ -25,7 +25,8 @@ tested-with:
2525 || ==8.2.2
2626 || ==8.4.4
2727 || ==8.6.5
28− || ==8.8.1
28+ || ==8.8.4
29+ || ==8.10.2
2930
3031extra-source-files:
3132 jensoleg.index.html.tmpl
@@ -87,12 +88,12 @@ library
8788 ghc-options: -Wall
8889 build-depends: servant-swagger-ui-core >=0.3.3 && <0.4
8990 build-depends:
90− base >=4.7 && <4.14
91+ base >=4.7 && <4.15
9192 , bytestring >=0.10.4.0 && <0.11
9293 , file-embed-lzma >=0 && <0.1
93− , servant >=0.14 && <0.18
94− , servant-server >=0.14 && <0.18
95− , swagger2 >=2.3.0.1 && <2.6
94+ , servant >=0.14 && <0.19
95+ , servant-server >=0.14 && <0.19
96+ , swagger2 >=2.3.0.1 && <2.7
9697 , text >=1.2.3.0 && <1.3
9798
9899 exposed-modules: Servant.Swagger.UI.JensOleG
servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal+6−6
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-redoc
33version: 0.3.3.1.22.3
4−x-revision: 2
4+x-revision: 3
55synopsis: Servant swagger ui: ReDoc theme
66category: Web, Servant, Swagger
77description:
@@ -19,7 +19,7 @@ license: BSD3
1919license-file: LICENSE
2020build-type: Simple
2121tested-with:
22− GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.1
22+ GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2
2323
2424extra-source-files:
2525 redoc-dist-1.22.3/redoc.min.js
@@ -35,12 +35,12 @@ library
3535 ghc-options: -Wall
3636 build-depends: servant-swagger-ui-core >=0.3.3 && <0.4
3737 build-depends:
38− base >=4.7 && <4.14
38+ base >=4.7 && <4.15
3939 , bytestring >=0.10.4.0 && <0.11
4040 , file-embed-lzma >=0 && <0.1
41− , servant >=0.14 && <0.18
42− , servant-server >=0.14 && <0.18
43− , swagger2 >=2.3.0.1 && <2.6
41+ , servant >=0.14 && <0.19
42+ , servant-server >=0.14 && <0.19
43+ , swagger2 >=2.3.0.1 && <2.7
4444 , text >=1.2.3.0 && <1.3
4545
4646 exposed-modules: Servant.Swagger.UI.ReDoc
servant-swagger-ui/servant-swagger-ui.cabal+6−6
@@ -1,7 +1,6 @@
11cabal-version: 1.12
22name: servant-swagger-ui
33version: 0.3.4.3.36.1
4−x-revision: 2
54synopsis: Servant swagger ui
65category: Web, Servant, Swagger
76description:
@@ -25,7 +24,8 @@ tested-with:
2524 || ==8.2.2
2625 || ==8.4.4
2726 || ==8.6.5
28− || ==8.8.1
27+ || ==8.8.4
28+ || ==8.10.2
2929
3030extra-source-files:
3131 CHANGELOG.md
@@ -47,12 +47,12 @@ library
4747 ghc-options: -Wall
4848 build-depends: servant-swagger-ui-core >=0.3.3 && <0.4
4949 build-depends:
50− base >=4.7 && <4.14
50+ base >=4.7 && <4.15
5151 , bytestring >=0.10.4.0 && <0.11
5252 , file-embed-lzma >=0 && <0.1
53− , servant >=0.14 && <0.18
54− , servant-server >=0.14 && <0.18
55− , swagger2 >=2.3.0.1 && <2.6
53+ , servant >=0.14 && <0.19
54+ , servant-server >=0.14 && <0.19
55+ , swagger2 >=2.3.0.1 && <2.7
5656 , text >=1.2.3.0 && <1.3
5757
5858 exposed-modules: Servant.Swagger.UI