Skip to content

Commit 4d6f115

Browse files
phadejphadej
authored
Merge pull request #75 from haskell-servant/swagger2-2.5
Swagger2 2.5
2 parents 7267460 + ba075f9 commit 4d6f115

File tree

6 files changed

+53
-31
lines changed

6 files changed

+53
-31
lines changed

‎.travis.yml

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7-
# version: 0.5.20190908
7+
# version: 0.9.20191209
88
#
9+
version: ~> 1.0
910
language: c
11+
os: linux
1012
dist: xenial
1113
git:
1214
# whether to recursively clone submodules
@@ -18,6 +20,7 @@ cache:
1820
directories:
1921
- $HOME/.cabal/packages
2022
- $HOME/.cabal/store
23+
- $HOME/.hlint
2124
before_cache:
2225
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2326
# remove files that are regenerated by 'cabal update'
@@ -27,22 +30,29 @@ before_cache:
2730
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
2831
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
2932
- rm -rfv $CABALHOME/packages/head.hackage
30-
matrix:
33+
jobs:
3134
include:
3235
- compiler: ghc-8.8.1
33-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
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"]}}
37+
os: linux
3438
- compiler: ghc-8.6.5
35-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
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"]}}
40+
os: linux
3641
- compiler: ghc-8.4.4
37-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
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"]}}
43+
os: linux
3844
- compiler: ghc-8.2.2
39-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
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"]}}
46+
os: linux
4047
- compiler: ghc-8.0.2
41-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
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"]}}
49+
os: linux
4250
- compiler: ghc-7.10.3
43-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-3.0"]}}
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"]}}
52+
os: linux
4453
- compiler: ghc-7.8.4
45-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-3.0"]}}
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"]}}
55+
os: linux
4656
before_install:
4757
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
4858
- WITHCOMPILER="-w $HC"
@@ -83,21 +93,29 @@ install:
8393
- HEADHACKAGE=false
8494
- rm -f $CABALHOME/config
8595
- |
86-
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
87-
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
88-
echo "write-ghc-environment-files: always" >> $CABALHOME/config
89-
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
90-
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
91-
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
92-
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
93-
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
94-
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
95-
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
96-
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
97-
echo "install-dirs user" >> $CABALHOME/config
98-
echo " prefix: $CABALHOME" >> $CABALHOME/config
99-
echo "repository hackage.haskell.org" >> $CABALHOME/config
100-
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
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
101119
- |
102120
echo "program-default-options" >> $CABALHOME/config
103121
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -180,5 +198,5 @@ script:
180198
# Constraint set servant-0.16
181199
- 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
182200

183-
# REGENDATA ["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"]
201+
# REGENDATA ("0.9.20191209",["--output",".travis.yml","--config=cabal.haskell-ci","cabal.project"])
184202
# EOF

‎servant-swagger-ui-core/servant-swagger-ui-core.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 1.12
22
name: servant-swagger-ui-core
33
version: 0.3.3
4-
x-revision: 1
4+
x-revision: 2
55
synopsis: Servant swagger ui core components
66
category: Web, Servant, Swagger
77
description:
@@ -45,7 +45,7 @@ library
4545
, servant >=0.14 && <0.17
4646
, servant-blaze >=0.8 && <0.10
4747
, servant-server >=0.14 && <0.17
48-
, swagger2 >=2.3.0.1 && <2.5
48+
, swagger2 >=2.3.0.1 && <2.6
4949
, text >=1.2.3.0 && <1.3
5050
, transformers >=0.3 && <0.6
5151
, transformers-compat >=0.3 && <0.7

‎servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 1.12
22
name: servant-swagger-ui-jensoleg
33
version: 0.3.3
4-
x-revision: 1
4+
x-revision: 2
55
synopsis: Servant swagger ui: Jens-Ole Graulund theme
66
category: Web, Servant, Swagger
77
description:
@@ -92,7 +92,7 @@ library
9292
, file-embed-lzma >=0 && <0.1
9393
, servant >=0.14 && <0.17
9494
, servant-server >=0.14 && <0.17
95-
, swagger2 >=2.3.0.1 && <2.5
95+
, swagger2 >=2.3.0.1 && <2.6
9696
, text >=1.2.3.0 && <1.3
9797

9898
exposed-modules: Servant.Swagger.UI.JensOleG

‎servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ library
4040
, file-embed-lzma >=0 && <0.1
4141
, servant >=0.14 && <0.17
4242
, servant-server >=0.14 && <0.17
43-
, swagger2 >=2.3.0.1 && <2.5
43+
, swagger2 >=2.3.0.1 && <2.6
4444
, text >=1.2.3.0 && <1.3
4545

4646
exposed-modules: Servant.Swagger.UI.ReDoc

‎servant-swagger-ui/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
- 0.3.4.3.23.11
2+
- Update to `swagger-ui-3.23.11`
3+
14
- 0.3.4.3.22.2
25
- Fix #67: We didn't use served `swagger.json`
36

‎servant-swagger-ui/servant-swagger-ui.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 1.12
22
name: servant-swagger-ui
33
version: 0.3.4.3.23.11
4+
x-revision: 1
45
synopsis: Servant swagger ui
56
category: Web, Servant, Swagger
67
description:
@@ -50,7 +51,7 @@ library
5051
, file-embed-lzma >=0 && <0.1
5152
, servant >=0.14 && <0.17
5253
, servant-server >=0.14 && <0.17
53-
, swagger2 >=2.3.0.1 && <2.5
54+
, swagger2 >=2.3.0.1 && <2.6
5455
, text >=1.2.3.0 && <1.3
5556

5657
exposed-modules: Servant.Swagger.UI

0 commit comments

Comments
 (0)