From a6581c45a7aa721c515484582b135ebaaee98b51 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 13 Nov 2018 00:14:16 +0200 Subject: [PATCH] Support servant-0.15 --- .travis.yml | 5 ++++- cabal.make-travis-yml | 6 +++++- servant-swagger-ui-core/servant-swagger-ui-core.cabal | 4 ++-- .../servant-swagger-ui-jensoleg.cabal | 4 ++-- servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal | 4 ++-- servant-swagger-ui/servant-swagger-ui.cabal | 4 ++-- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ec31f0..b69fdbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -136,7 +136,10 @@ script: - rm -rf cabal.project.local # Constraint set servant-0.14 - - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80600 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all; else echo skipping...; fi + - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80800 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.14.*' all; else echo skipping...; fi + + # Constraint set servant-0.15 + - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all; else echo skipping...; fi # REGENDATA ["--branch","master","--output",".travis.yml","--config","cabal.project"] diff --git a/cabal.make-travis-yml b/cabal.make-travis-yml index 7b620c2..e203e8a 100644 --- a/cabal.make-travis-yml +++ b/cabal.make-travis-yml @@ -1,3 +1,7 @@ constraint-set servant-0.14 - ghc: >= 7.8 && <8.6 + ghc: >= 7.8 && <8.8 constraints: servant ==0.14.* + +constraint-set servant-0.15 + ghc: >= 8.0 && <8.8 + constraints: servant ==0.15.* diff --git a/servant-swagger-ui-core/servant-swagger-ui-core.cabal b/servant-swagger-ui-core/servant-swagger-ui-core.cabal index ca38235..2093d31 100644 --- a/servant-swagger-ui-core/servant-swagger-ui-core.cabal +++ b/servant-swagger-ui-core/servant-swagger-ui-core.cabal @@ -35,9 +35,9 @@ library , blaze-markup >=0.7.0.2 && <0.9 , bytestring >=0.10.4.0 && <0.11 , http-media >=0.7.1.3 && <0.8 - , servant >=0.14 && <0.15 + , servant >=0.14 && <0.16 , servant-blaze >=0.8 && <0.9 - , servant-server >=0.14 && <0.15 + , servant-server >=0.14 && <0.16 , swagger2 >=2.3.0.1 && <2.4 , text >=1.2.3.0 && <1.3 , transformers >=0.3 && <0.6 diff --git a/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal b/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal index 94ef7c2..5e4a696 100644 --- a/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal +++ b/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal @@ -85,8 +85,8 @@ library base >=4.7 && <4.13 , bytestring >=0.10.4.0 && <0.11 , file-embed-lzma >=0 && <0.1 - , servant >=0.14 && <0.15 - , servant-server >=0.14 && <0.15 + , servant >=0.14 && <0.16 + , servant-server >=0.14 && <0.16 , swagger2 >=2.3.0.1 && <2.4 , text >=1.2.3.0 && <1.3 exposed-modules: diff --git a/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal b/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal index 0456a9b..ff6fbd8 100644 --- a/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal +++ b/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal @@ -39,8 +39,8 @@ library base >=4.7 && <4.13 , bytestring >=0.10.4.0 && <0.11 , file-embed-lzma >=0 && <0.1 - , servant >=0.14 && <0.15 - , servant-server >=0.14 && <0.15 + , servant >=0.14 && <0.16 + , servant-server >=0.14 && <0.16 , swagger2 >=2.3.0.1 && <2.4 , text >=1.2.3.0 && <1.3 exposed-modules: diff --git a/servant-swagger-ui/servant-swagger-ui.cabal b/servant-swagger-ui/servant-swagger-ui.cabal index 24b0ecc..09722a7 100644 --- a/servant-swagger-ui/servant-swagger-ui.cabal +++ b/servant-swagger-ui/servant-swagger-ui.cabal @@ -45,8 +45,8 @@ library base >=4.7 && <4.13 , bytestring >=0.10.4.0 && <0.11 , file-embed-lzma >=0 && <0.1 - , servant >=0.14 && <0.15 - , servant-server >=0.14 && <0.15 + , servant >=0.14 && <0.16 + , servant-server >=0.14 && <0.16 , swagger2 >=2.3.0.1 && <2.4 , text >=1.2.3.0 && <1.3 exposed-modules: