Skip to content

Commit 3b1f5ef

Browse files
maksbotanmaksbotan
authored
Merge pull request #108 from haskell-servant/janus/servant-0.20
Allow servant-0.20 and other newer deps
2 parents 82f4751 + 9b18f76 commit 3b1f5ef

File tree

7 files changed

+34
-16
lines changed

7 files changed

+34
-16
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.6.2
36+
compilerKind: ghc
37+
compilerVersion: 9.6.2
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.4.5
3641
compilerKind: ghc
3742
compilerVersion: 9.4.5
@@ -256,10 +261,14 @@ jobs:
256261
- name: prepare for constraint sets
257262
run: |
258263
rm -f cabal.project.local
264+
- name: constraint set servant-0.20
265+
run: |
266+
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi
267+
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi
259268
- name: constraint set servant-0.19
260269
run: |
261-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all
262-
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
270+
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all ; fi
271+
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all ; fi
263272
- name: constraint set servant-0.18
264273
run: |
265274
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi

‎cabal.haskell-ci

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ constraint-set servant-0.18
1515
constraint-set servant-0.19
1616
ghc: >= 8.6 && <9.6
1717
constraints: servant ==0.19.*
18+
19+
constraint-set servant-0.20
20+
ghc: >= 8.10 && <9.8
21+
constraints: servant ==0.20.*

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ tested-with:
2424
|| ==9.0.2
2525
|| ==9.2.7
2626
|| ==9.4.5
27+
|| ==9.6.2
2728

2829
extra-source-files: Changelog.md
2930

@@ -35,14 +36,14 @@ library
3536
hs-source-dirs: src
3637
ghc-options: -Wall
3738
build-depends:
38-
base >=4.7 && <4.18
39+
base >=4.7 && <4.19
3940
, aeson >=0.8.0.2 && <2.2
4041
, blaze-markup >=0.7.0.2 && <0.9
4142
, bytestring >=0.10.4.0 && <0.12
4243
, http-media >=0.7.1.3 && <0.9
43-
, servant >=0.14 && <0.20
44+
, servant >=0.14 && <0.21
4445
, servant-blaze >=0.8 && <0.10
45-
, servant-server >=0.14 && <0.20
46+
, servant-server >=0.14 && <0.21
4647
, text >=1.2.3.0 && <2.1
4748
, transformers >=0.3 && <0.7
4849
, transformers-compat >=0.3 && <0.8

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ tested-with:
1919
|| ==9.0.2
2020
|| ==9.2.7
2121
|| ==9.4.5
22+
|| ==9.6.2
2223

2324
source-repository head
2425
type: git
@@ -29,8 +30,8 @@ executable servant-swagger-ui-example
2930
ghc-options: -threaded
3031
build-depends:
3132
aeson >=0.8.0.2 && <2.2
32-
, base >=4.7 && <4.18
33-
, base-compat >=0.9.3 && <0.13
33+
, base >=4.7 && <4.19
34+
, base-compat >=0.9.3 && <0.14
3435
, lens >=4.7.0.1 && <5.3
3536
, servant
3637
, servant-server

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ tested-with:
2323
|| ==9.0.2
2424
|| ==9.2.7
2525
|| ==9.4.5
26+
|| ==9.6.2
2627

2728
extra-source-files:
2829
jensoleg.index.html.tmpl
@@ -84,12 +85,12 @@ library
8485
ghc-options: -Wall
8586
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
8687
build-depends:
87-
base >=4.7 && <4.18
88+
base >=4.7 && <4.19
8889
, aeson >=0.8.0.2 && <2.2
8990
, bytestring >=0.10.4.0 && <0.12
9091
, file-embed-lzma >=0 && <0.1
91-
, servant >=0.14 && <0.20
92-
, servant-server >=0.14 && <0.20
92+
, servant >=0.14 && <0.21
93+
, servant-server >=0.14 && <0.21
9394
, text >=1.2.3.0 && <2.1
9495

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

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ tested-with:
2323
|| ==9.0.2
2424
|| ==9.2.7
2525
|| ==9.4.5
26+
|| ==9.6.2
2627

2728
extra-source-files:
2829
redoc-dist-1.22.3/redoc.min.js
@@ -38,12 +39,12 @@ library
3839
ghc-options: -Wall
3940
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
4041
build-depends:
41-
base >=4.7 && <4.18
42+
base >=4.7 && <4.19
4243
, aeson >=0.8.0.2 && <2.2
4344
, bytestring >=0.10.4.0 && <0.12
4445
, file-embed-lzma >=0 && <0.1
45-
, servant >=0.14 && <0.20
46-
, servant-server >=0.14 && <0.20
46+
, servant >=0.14 && <0.21
47+
, servant-server >=0.14 && <0.21
4748
, text >=1.2.3.0 && <2.1
4849

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

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ tested-with:
2323
|| ==9.0.2
2424
|| ==9.2.7
2525
|| ==9.4.5
26+
|| ==9.6.2
2627

2728
extra-source-files:
2829
CHANGELOG.md
@@ -54,12 +55,12 @@ library
5455
ghc-options: -Wall
5556
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
5657
build-depends:
57-
base >=4.7 && <4.18
58+
base >=4.7 && <4.19
5859
, aeson >=0.8.0.2 && <2.2
5960
, bytestring >=0.10.4.0 && <0.12
6061
, file-embed-lzma >=0 && <0.1
61-
, servant >=0.14 && <0.20
62-
, servant-server >=0.14 && <0.20
62+
, servant >=0.14 && <0.21
63+
, servant-server >=0.14 && <0.21
6364
, text >=1.2.3.0 && <2.1
6465

6566
exposed-modules: Servant.Swagger.UI

0 commit comments

Comments
 (0)