git.iko.soy/typeable/servant-swagger-ui
on master help sign in
Support GHC-8.4.1
commitf20a0240a315b229197638236ae80aa66d805541 authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 23 Mar 2018, 08:15 (9 years ago) parent293b99c
3 files changed+11−7
compare with master
unifiedsplit
.travis.yml+5−2 cabal.make-travis-yml+1−1 servant-swagger-ui.cabal+5−4
.travis.yml+5−2
@@ -44,6 +44,9 @@ matrix:
4444 - compiler: "ghc-8.2.2"
4545 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4646 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
47+ - compiler: "ghc-8.4.1"
48+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
49+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
4750
4851before_install:
4952 - HC=${CC}
@@ -75,7 +78,7 @@ install:
7578 - rm -f cabal.project.freeze
7679 - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
7780 - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
78− - rm -rf "."/.ghc.environment.* "."/dist
81+ - rm -rf .ghc.environment.* "."/dist
7982 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
8083
8184# Here starts the actual work to be performed for the package under test;
@@ -117,7 +120,7 @@ script:
117120
118121 - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.12.*' all; else echo skipping...; fi
119122
120− - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.13.*' all; else echo skipping...; fi
123+ - if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80600 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.13.*' all; else echo skipping...; fi
121124
122125# REGENDATA ["--branch","master","--output",".travis.yml","--config","servant-swagger-ui.cabal"]
123126# EOF
cabal.make-travis-yml+1−1
@@ -23,5 +23,5 @@ constraint-set servant-0.12
2323 constraints: servant ==0.12.*
2424
2525constraint-set servant-0.13
26− ghc: >= 7.8 && <8.4
26+ ghc: >= 7.8 && <8.6
2727 constraints: servant ==0.13.*
servant-swagger-ui.cabal+5−4
@@ -1,5 +1,6 @@
11name: servant-swagger-ui
22version: 0.2.5.3.9.1
3+x-revision: 1
34synopsis: Servant swagger ui
45description: Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)
56category: Web, Servant, Swagger
@@ -9,7 +10,7 @@ author: Oleg Grenrus <oleg.grenrus@iki.fi>
910maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
1011license: BSD3
1112license-file: LICENSE
12−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
13+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1
1314build-type: Simple
1415cabal-version: >= 1.10
1516
@@ -92,7 +93,7 @@ library
9293 ghc-options: -Wall
9394
9495 build-depends:
95− base >=4.7 && <4.11
96+ base >=4.7 && <4.12
9697 , blaze-markup >=0.7.0.2 && <0.9
9798 , bytestring >=0.10.4.0 && <0.11
9899 , directory >=1.2.1.0 && <1.4
@@ -104,7 +105,7 @@ library
104105 , servant-server >=0.4.4.5 && <0.14
105106 , servant-swagger >=1.0.3 && <1.2
106107 , swagger2 >=2.0.1 && <2.3
107− , template-haskell >=2.9 && <2.13
108+ , template-haskell >=2.9 && <2.14
108109 , text >=1.2.0.6 && <1.3
109110 , wai-app-static >=3.0.1.1 && <3.2
110111 if flag(servant-0-5)
@@ -135,7 +136,7 @@ test-suite example
135136 , servant-swagger-ui
136137 , swagger2
137138 , text
138− , aeson >=0.8.0.2 && <1.3
139+ , aeson >=0.8.0.2 && <1.4
139140 , base-compat >=0.6.0 && <0.10
140141 , lens >=4.7.0.1 && <4.17
141142 , wai >=3.0.3.0 && <3.3