git.iko.soy/typeable/servant-swagger-ui
on master help sign in
Merge pull request #76 from haskell-servant/servant-0.17

Support servant-0.17

commitb284bd96fb562dc1c79c73a65b3ad55e78e7a6ca authorOleg Grenrus <oleg.grenrus@iki.fi> dateThu 23 Jan 2020, 23:59 (7 years ago) parent4d6f115c27472a
6 files changed+51−71
.travis.yml+34−58 cabal.haskell-ci+5−1 servant-swagger-ui-core/servant-swagger-ui-core.cabal+3−3 servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal+3−3 servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal+3−3 servant-swagger-ui/servant-swagger-ui.cabal+3−3
.travis.yml+34−58
@@ -4,7 +4,7 @@
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
7−# version: 0.9.20191209
7+# version: 0.9.20200121
88#
99version: ~> 1.0
1010language: c
@@ -65,57 +65,31 @@ before_install:
6565 - TOP=$(pwd)
6666 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
6767 - echo $HCNUMVER
68− - CABAL="$CABAL -vnormal+nowrap+markoutput"
68+ - CABAL="$CABAL -vnormal+nowrap"
6969 - set -o pipefail
70− - |
71− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
72− echo 'BEGIN { state = "output"; }' >> .colorful.awk
73− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
74− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
75− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
76− echo ' if (state == "cabal") {' >> .colorful.awk
77− echo ' print blue($0)' >> .colorful.awk
78− echo ' } else {' >> .colorful.awk
79− echo ' print $0' >> .colorful.awk
80− echo ' }' >> .colorful.awk
81− echo '}' >> .colorful.awk
82− - cat .colorful.awk
83− - |
84− color_cabal_output () {
85− awk -f $TOP/.colorful.awk
86− }
87− - echo text | color_cabal_output
88−install:
89− - ${CABAL} --version
90− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
9170 - TEST=--enable-tests
9271 - BENCH=--enable-benchmarks
9372 - HEADHACKAGE=false
9473 - rm -f $CABALHOME/config
9574 - |
96− echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
97− echo "remote-build-reporting: anonymous" >> $CABALHOME/config
98− echo "write-ghc-environment-files: always" >> $CABALHOME/config
99− echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
100− echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
101− echo "world-file: $CABALHOME/world" >> $CABALHOME/config
102− echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
103− echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
104− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
105− echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
106− echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
107− echo "install-dirs user" >> $CABALHOME/config
108− echo " prefix: $CABALHOME" >> $CABALHOME/config
109− echo "repository hackage.haskell.org" >> $CABALHOME/config
110− echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
111− echo " secure: True" >> $CABALHOME/config
112− echo " key-threshold: 3" >> $CABALHOME/config
113− echo " root-keys:" >> $CABALHOME/config
114− echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
115− echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
116− echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
117− echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
118− echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
75+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
76+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
77+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
78+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
79+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
80+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
81+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
82+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
83+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
84+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
85+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
86+ echo "install-dirs user" >> $CABALHOME/config
87+ echo " prefix: $CABALHOME" >> $CABALHOME/config
88+ echo "repository hackage.haskell.org" >> $CABALHOME/config
89+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
90+install:
91+ - ${CABAL} --version
92+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
11993 - |
12094 echo "program-default-options" >> $CABALHOME/config
12195 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -140,15 +114,15 @@ install:
140114 - if [ -f "servant-swagger-ui-example/configure.ac" ]; then (cd "servant-swagger-ui-example" && autoreconf -i); fi
141115 - if [ -f "servant-swagger-ui-jensoleg/configure.ac" ]; then (cd "servant-swagger-ui-jensoleg" && autoreconf -i); fi
142116 - if [ -f "servant-swagger-ui-redoc/configure.ac" ]; then (cd "servant-swagger-ui-redoc" && autoreconf -i); fi
143− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
117+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
144118 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
145119 - rm cabal.project.freeze
146− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
147− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
120+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
121+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
148122script:
149123 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
150124 # Packaging...
151− - ${CABAL} v2-sdist all | color_cabal_output
125+ - ${CABAL} v2-sdist all
152126 # Unpacking...
153127 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
154128 - cd ${DISTDIR} || false
@@ -174,10 +148,10 @@ script:
174148 - cat cabal.project.local || true
175149 # Building...
176150 # this builds all libraries and executables (without tests/benchmarks)
177− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
151+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
178152 # Building with tests and benchmarks...
179153 # build & run tests, build benchmarks
180− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
154+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
181155 # cabal check...
182156 - (cd ${PKGDIR_servant_swagger_ui} && ${CABAL} -vnormal check)
183157 - (cd ${PKGDIR_servant_swagger_ui_core} && ${CABAL} -vnormal check)
@@ -185,18 +159,20 @@ script:
185159 - (cd ${PKGDIR_servant_swagger_ui_jensoleg} && ${CABAL} -vnormal check)
186160 - (cd ${PKGDIR_servant_swagger_ui_redoc} && ${CABAL} -vnormal check)
187161 # haddock...
188− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
162+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
189163 # Building without installed constraints for packages in global-db...
190164 - rm -f cabal.project.local
191− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
165+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
192166 # Constraint sets
193167 - rm -rf cabal.project.local
194168 # Constraint set servant-0.14
195− - if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all | color_cabal_output ; fi
169+ - if [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all ; fi
196170 # Constraint set servant-0.15
197− - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all | color_cabal_output ; fi
171+ - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all ; fi
198172 # Constraint set servant-0.16
199− - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all | color_cabal_output ; fi
173+ - if [ $HCNUMVER -ge 80000 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
174+ # 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
200176
201−# REGENDATA ("0.9.20191209",["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"])
177+# REGENDATA ("0.9.20200121",["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"])
202178# EOF
cabal.haskell-ci+5−1
@@ -9,5 +9,9 @@ constraint-set servant-0.15
99 constraints: servant ==0.15.*
1010
1111constraint-set servant-0.16
12− ghc: >= 8.0 && <8.8
12+ ghc: >= 8.0 && <8.10
1313 constraints: servant ==0.16.*
14+
15+constraint-set servant-0.17
16+ ghc: >= 8.0 && <8.10
17+ constraints: servant ==0.17.*
servant-swagger-ui-core/servant-swagger-ui-core.cabal+3−3
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-core
33version: 0.3.3
4−x-revision: 2
4+x-revision: 3
55synopsis: Servant swagger ui core components
66category: Web, Servant, Swagger
77description:
@@ -42,9 +42,9 @@ library
4242 , blaze-markup >=0.7.0.2 && <0.9
4343 , bytestring >=0.10.4.0 && <0.11
4444 , http-media >=0.7.1.3 && <0.9
45− , servant >=0.14 && <0.17
45+ , servant >=0.14 && <0.18
4646 , servant-blaze >=0.8 && <0.10
47− , servant-server >=0.14 && <0.17
47+ , servant-server >=0.14 && <0.18
4848 , swagger2 >=2.3.0.1 && <2.6
4949 , text >=1.2.3.0 && <1.3
5050 , transformers >=0.3 && <0.6
servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal+3−3
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-jensoleg
33version: 0.3.3
4−x-revision: 2
4+x-revision: 3
55synopsis: Servant swagger ui: Jens-Ole Graulund theme
66category: Web, Servant, Swagger
77description:
@@ -90,8 +90,8 @@ library
9090 base >=4.7 && <4.14
9191 , bytestring >=0.10.4.0 && <0.11
9292 , file-embed-lzma >=0 && <0.1
93− , servant >=0.14 && <0.17
94− , servant-server >=0.14 && <0.17
93+ , servant >=0.14 && <0.18
94+ , servant-server >=0.14 && <0.18
9595 , swagger2 >=2.3.0.1 && <2.6
9696 , text >=1.2.3.0 && <1.3
9797
servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal+3−3
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui-redoc
33version: 0.3.3.1.22.3
4−x-revision: 1
4+x-revision: 2
55synopsis: Servant swagger ui: ReDoc theme
66category: Web, Servant, Swagger
77description:
@@ -38,8 +38,8 @@ library
3838 base >=4.7 && <4.14
3939 , bytestring >=0.10.4.0 && <0.11
4040 , file-embed-lzma >=0 && <0.1
41− , servant >=0.14 && <0.17
42− , servant-server >=0.14 && <0.17
41+ , servant >=0.14 && <0.18
42+ , servant-server >=0.14 && <0.18
4343 , swagger2 >=2.3.0.1 && <2.6
4444 , text >=1.2.3.0 && <1.3
4545
servant-swagger-ui/servant-swagger-ui.cabal+3−3
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: servant-swagger-ui
33version: 0.3.4.3.23.11
4−x-revision: 1
4+x-revision: 2
55synopsis: Servant swagger ui
66category: Web, Servant, Swagger
77description:
@@ -49,8 +49,8 @@ library
4949 base >=4.7 && <4.14
5050 , bytestring >=0.10.4.0 && <0.11
5151 , file-embed-lzma >=0 && <0.1
52− , servant >=0.14 && <0.17
53− , servant-server >=0.14 && <0.17
52+ , servant >=0.14 && <0.18
53+ , servant-server >=0.14 && <0.18
5454 , swagger2 >=2.3.0.1 && <2.6
5555 , text >=1.2.3.0 && <1.3
5656