Skip to content

Commit 2980a26

Browse files
authored
Merge pull request #104 from ysangkok/janus/bump-deps
Allow newer dependencies
2 parents 69f8de6 + 4e2cedd commit 2980a26

File tree

7 files changed

+32
-22
lines changed

7 files changed

+32
-22
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.2.2
35+
- compiler: ghc-9.4.3
3636
compilerKind: ghc
37-
compilerVersion: 9.2.2
37+
compilerVersion: 9.4.3
38+
setup-method: ghcup
39+
allow-failure: false
40+
- compiler: ghc-9.2.5
41+
compilerKind: ghc
42+
compilerVersion: 9.2.5
3843
setup-method: ghcup
3944
allow-failure: false
4045
- compiler: ghc-9.0.2
@@ -262,8 +267,8 @@ jobs:
262267
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
263268
- name: constraint set servant-0.18
264269
run: |
265-
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
266-
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
270+
if [ $((HCNUMVER < 90002)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
271+
if [ $((HCNUMVER < 90002)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
267272
- name: constraint set servant-0.17
268273
run: |
269274
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi

cabal.haskell-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ constraint-set servant-0.18
1313
constraints: servant ==0.18.*
1414

1515
constraint-set servant-0.19
16-
ghc: >= 8.6 && <9.4
16+
ghc: >= 8.6 && <9.6
1717
constraints: servant ==0.19.*

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ tested-with:
2323
|| ==8.8.4
2424
|| ==8.10.7
2525
|| ==9.0.2
26-
|| ==9.2.2
26+
|| ==9.2.5
27+
|| ==9.4.3
2728

2829
extra-source-files: Changelog.md
2930

@@ -35,16 +36,16 @@ library
3536
hs-source-dirs: src
3637
ghc-options: -Wall
3738
build-depends:
38-
base >=4.7 && <4.17
39-
, aeson >=0.8.0.2 && <2.1.0
39+
base >=4.7 && <4.18
40+
, 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
4344
, servant >=0.14 && <0.20
4445
, servant-blaze >=0.8 && <0.10
4546
, servant-server >=0.14 && <0.20
4647
, text >=1.2.3.0 && <2.1
47-
, transformers >=0.3 && <0.6
48+
, transformers >=0.3 && <0.7
4849
, transformers-compat >=0.3 && <0.8
4950
, wai-app-static >=3.0.1.1 && <3.2
5051

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ tested-with:
1818
|| ==8.8.4
1919
|| ==8.10.7
2020
|| ==9.0.2
21-
|| ==9.2.2
21+
|| ==9.2.5
22+
|| ==9.4.3
2223

2324
source-repository head
2425
type: git
@@ -28,10 +29,10 @@ executable servant-swagger-ui-example
2829
main-is: Main.hs
2930
ghc-options: -threaded
3031
build-depends:
31-
aeson >=0.8.0.2 && <2.1.0
32-
, base >=4.7 && <4.17
32+
aeson >=0.8.0.2 && <2.2
33+
, base >=4.7 && <4.18
3334
, base-compat >=0.9.3 && <0.13
34-
, lens >=4.7.0.1 && <5.2
35+
, lens >=4.7.0.1 && <5.3
3536
, servant
3637
, servant-server
3738
, servant-swagger

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ tested-with:
2222
|| ==8.8.4
2323
|| ==8.10.7
2424
|| ==9.0.2
25-
|| ==9.2.2
25+
|| ==9.2.5
26+
|| ==9.4.3
2627

2728
extra-source-files:
2829
jensoleg.index.html.tmpl
@@ -84,8 +85,8 @@ 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.17
88-
, aeson >=0.8.0.2 && <2.1.0
88+
base >=4.7 && <4.18
89+
, aeson >=0.8.0.2 && <2.2
8990
, bytestring >=0.10.4.0 && <0.12
9091
, file-embed-lzma >=0 && <0.1
9192
, servant >=0.14 && <0.20

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ tested-with:
2222
|| ==8.8.4
2323
|| ==8.10.7
2424
|| ==9.0.2
25-
|| ==9.2.2
25+
|| ==9.2.5
26+
|| ==9.4.3
2627

2728
extra-source-files:
2829
redoc-dist-1.22.3/redoc.min.js
@@ -38,8 +39,8 @@ 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.17
42-
, aeson >=0.8.0.2 && <2.1.0
42+
base >=4.7 && <4.18
43+
, aeson >=0.8.0.2 && <2.2
4344
, bytestring >=0.10.4.0 && <0.12
4445
, file-embed-lzma >=0 && <0.1
4546
, servant >=0.14 && <0.20

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ tested-with:
2222
|| ==8.8.4
2323
|| ==8.10.7
2424
|| ==9.0.2
25-
|| ==9.2.2
25+
|| ==9.2.5
26+
|| ==9.4.3
2627

2728
extra-source-files:
2829
CHANGELOG.md
@@ -53,8 +54,8 @@ library
5354
ghc-options: -Wall
5455
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
5556
build-depends:
56-
base >=4.7 && <4.17
57-
, aeson >=0.8.0.2 && <2.1.0
57+
base >=4.7 && <4.18
58+
, aeson >=0.8.0.2 && <2.2
5859
, bytestring >=0.10.4.0 && <0.12
5960
, file-embed-lzma >=0 && <0.1
6061
, servant >=0.14 && <0.20

0 commit comments

Comments
 (0)