Skip to content

Commit 2c8092b

Browse files
authored
Merge pull request #113 from haskell-servant/maksbotan/aeson-2.2
Allow aeson-2.2
2 parents 19211b3 + 2b4b16b commit 2c8092b

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.16.3
11+
# version: 0.16.6
1212
#
13-
# REGENDATA ("0.16.3",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.16.6",["github","--config=cabal.haskell-ci","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -263,22 +263,32 @@ jobs:
263263
rm -f cabal.project.local
264264
- name: constraint set servant-0.20
265265
run: |
266+
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run ; fi
267+
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
266268
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi
267269
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi
268270
- name: constraint set servant-0.19
269271
run: |
272+
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run ; fi
273+
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
270274
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all ; fi
271275
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all ; fi
272276
- name: constraint set servant-0.18
273277
run: |
278+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all --dry-run ; fi
279+
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
274280
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
275281
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
276282
- name: constraint set servant-0.17
277283
run: |
284+
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all --dry-run ; fi
285+
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
278286
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi
279287
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
280288
- name: constraint set servant-0.16
281289
run: |
290+
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all --dry-run ; fi
291+
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
282292
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' --dependencies-only -j2 all ; fi
283293
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
284294
- name: save cache

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ library
3737
ghc-options: -Wall
3838
build-depends:
3939
base >=4.7 && <4.19
40-
, aeson >=0.8.0.2 && <2.2
40+
, aeson >=0.8.0.2 && <2.3
4141
, blaze-markup >=0.7.0.2 && <0.9
4242
, bytestring >=0.10.4.0 && <0.12
4343
, http-media >=0.7.1.3 && <0.9

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ executable servant-swagger-ui-example
2929
main-is: Main.hs
3030
ghc-options: -threaded
3131
build-depends:
32-
aeson >=0.8.0.2 && <2.2
32+
aeson >=0.8.0.2 && <2.3
3333
, base >=4.7 && <4.19
3434
, base-compat >=0.9.3 && <0.14
3535
, lens >=4.7.0.1 && <5.3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ library
8686
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
8787
build-depends:
8888
base >=4.7 && <4.19
89-
, aeson >=0.8.0.2 && <2.2
89+
, aeson >=0.8.0.2 && <2.3
9090
, bytestring >=0.10.4.0 && <0.12
9191
, file-embed-lzma >=0 && <0.1
9292
, servant >=0.14 && <0.21

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
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
4141
build-depends:
4242
base >=4.7 && <4.19
43-
, aeson >=0.8.0.2 && <2.2
43+
, aeson >=0.8.0.2 && <2.3
4444
, bytestring >=0.10.4.0 && <0.12
4545
, file-embed-lzma >=0 && <0.1
4646
, servant >=0.14 && <0.21

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ library
5656
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
5757
build-depends:
5858
base >=4.7 && <4.19
59-
, aeson >=0.8.0.2 && <2.2
59+
, aeson >=0.8.0.2 && <2.3
6060
, bytestring >=0.10.4.0 && <0.12
6161
, file-embed-lzma >=0 && <0.1
6262
, servant >=0.14 && <0.21

0 commit comments

Comments
 (0)