Skip to content

Commit

Permalink
Merge pull request #113 from haskell-servant/maksbotan/aeson-2.2
Browse files Browse the repository at this point in the history
Allow aeson-2.2
  • Loading branch information
maksbotan committed Oct 3, 2023
2 parents 19211b3 + 2b4b16b commit 2c8092b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 7 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.16.3
# version: 0.16.6
#
# REGENDATA ("0.16.3",["github","--config=cabal.haskell-ci","cabal.project"])
# REGENDATA ("0.16.6",["github","--config=cabal.haskell-ci","cabal.project"])
#
name: Haskell-CI
on:
Expand Down Expand Up @@ -263,22 +263,32 @@ jobs:
rm -f cabal.project.local
- name: constraint set servant-0.20
run: |
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run ; fi
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi
- name: constraint set servant-0.19
run: |
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all ; fi
- name: constraint set servant-0.18
run: |
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all --dry-run ; fi
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
- name: constraint set servant-0.17
run: |
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all --dry-run ; fi
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
- name: constraint set servant-0.16
run: |
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all --dry-run ; fi
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all ; fi
- name: save cache
Expand Down
2 changes: 1 addition & 1 deletion servant-swagger-ui-core/servant-swagger-ui-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ library
ghc-options: -Wall
build-depends:
base >=4.7 && <4.19
, aeson >=0.8.0.2 && <2.2
, aeson >=0.8.0.2 && <2.3
, blaze-markup >=0.7.0.2 && <0.9
, bytestring >=0.10.4.0 && <0.12
, http-media >=0.7.1.3 && <0.9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ executable servant-swagger-ui-example
main-is: Main.hs
ghc-options: -threaded
build-depends:
aeson >=0.8.0.2 && <2.2
aeson >=0.8.0.2 && <2.3
, base >=4.7 && <4.19
, base-compat >=0.9.3 && <0.14
, lens >=4.7.0.1 && <5.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ library
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
build-depends:
base >=4.7 && <4.19
, aeson >=0.8.0.2 && <2.2
, aeson >=0.8.0.2 && <2.3
, bytestring >=0.10.4.0 && <0.12
, file-embed-lzma >=0 && <0.1
, servant >=0.14 && <0.21
Expand Down
2 changes: 1 addition & 1 deletion servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ library
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
build-depends:
base >=4.7 && <4.19
, aeson >=0.8.0.2 && <2.2
, aeson >=0.8.0.2 && <2.3
, bytestring >=0.10.4.0 && <0.12
, file-embed-lzma >=0 && <0.1
, servant >=0.14 && <0.21
Expand Down
2 changes: 1 addition & 1 deletion servant-swagger-ui/servant-swagger-ui.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ library
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
build-depends:
base >=4.7 && <4.19
, aeson >=0.8.0.2 && <2.2
, aeson >=0.8.0.2 && <2.3
, bytestring >=0.10.4.0 && <0.12
, file-embed-lzma >=0 && <0.1
, servant >=0.14 && <0.21
Expand Down

0 comments on commit 2c8092b

Please sign in to comment.