Skip to content

Commit 7c77279

Browse files
authored
Allow GHC-9.0.1 (#91)
1 parent 3d15c0f commit 7c77279

File tree

7 files changed

+25
-8
lines changed

7 files changed

+25
-8
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
strategy:
3131
matrix:
3232
include:
33+
- compiler: ghc-9.0.1
34+
allow-failure: false
3335
- compiler: ghc-8.10.4
3436
allow-failure: false
3537
- compiler: ghc-8.8.4
@@ -164,6 +166,14 @@ jobs:
164166
echo "package servant-swagger-ui-redoc" >> cabal.project
165167
echo " ghc-options: -Werror=missing-methods" >> cabal.project
166168
cat >> cabal.project <<EOF
169+
allow-newer: swagger2:base
170+
allow-newer: swagger2:lens
171+
allow-newer: swagger2:optics-core
172+
allow-newer: swagger2:optics-th
173+
allow-newer: swagger2:template-haskell
174+
allow-newer: servant-swagger:base
175+
allow-newer: servant-swagger:lens
176+
allow-newer: servant-swagger:Cabal
167177
EOF
168178
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(servant-swagger-ui|servant-swagger-ui-core|servant-swagger-ui-example|servant-swagger-ui-jensoleg|servant-swagger-ui-redoc)$/; }' >> cabal.project.local
169179
cat cabal.project
@@ -212,7 +222,7 @@ jobs:
212222
rm -f cabal.project.local
213223
- name: constraint set servant-0.18
214224
run: |
215-
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
225+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
216226
- name: constraint set servant-0.17
217227
run: |
218228
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi

cabal.project

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ packages:
44
servant-swagger-ui-example/
55
servant-swagger-ui-jensoleg/
66
servant-swagger-ui-redoc/
7+
8+
allow-newer: swagger2:base, swagger2:lens, swagger2:optics-core, swagger2:optics-th, swagger2:template-haskell
9+
allow-newer: servant-swagger:base, servant-swagger:lens, servant-swagger:Cabal

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ tested-with:
2424
|| ==8.6.5
2525
|| ==8.8.4
2626
|| ==8.10.4
27+
|| ==9.0.1
2728

2829
extra-source-files: Changelog.md
2930

@@ -35,7 +36,7 @@ library
3536
hs-source-dirs: src
3637
ghc-options: -Wall
3738
build-depends:
38-
base >=4.7 && <4.15
39+
base >=4.7 && <4.16
3940
, aeson >=0.8.0.2 && <1.6
4041
, blaze-markup >=0.7.0.2 && <0.9
4142
, bytestring >=0.10.4.0 && <0.11

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
|| ==8.6.5
2020
|| ==8.8.4
2121
|| ==8.10.4
22+
|| ==9.0.1
2223

2324
source-repository head
2425
type: git
@@ -29,9 +30,9 @@ executable servant-swagger-ui-example
2930
ghc-options: -threaded
3031
build-depends:
3132
aeson >=0.8.0.2 && <1.6
32-
, base >=4.7 && <4.15
33+
, base >=4.7 && <4.16
3334
, base-compat >=0.9.3 && <0.12
34-
, lens >=4.7.0.1 && <4.20
35+
, lens >=4.7.0.1 && <5.1
3536
, servant
3637
, servant-server
3738
, servant-swagger

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ tested-with:
2323
|| ==8.6.5
2424
|| ==8.8.4
2525
|| ==8.10.4
26+
|| ==9.0.1
2627

2728
extra-source-files:
2829
jensoleg.index.html.tmpl
@@ -84,7 +85,7 @@ 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.15
88+
base >=4.7 && <4.16
8889
, aeson >=0.8.0.2 && <1.6
8990
, bytestring >=0.10.4.0 && <0.11
9091
, file-embed-lzma >=0 && <0.1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ license: BSD3
1818
license-file: LICENSE
1919
build-type: Simple
2020
tested-with:
21-
GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.4
21+
GHC ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1
2222

2323
extra-source-files:
2424
redoc-dist-1.22.3/redoc.min.js
@@ -34,7 +34,7 @@ library
3434
ghc-options: -Wall
3535
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
3636
build-depends:
37-
base >=4.7 && <4.15
37+
base >=4.7 && <4.16
3838
, aeson >=0.8.0.2 && <1.6
3939
, bytestring >=0.10.4.0 && <0.11
4040
, file-embed-lzma >=0 && <0.1

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ tested-with:
2323
|| ==8.6.5
2424
|| ==8.8.4
2525
|| ==8.10.4
26+
|| ==9.0.1
2627

2728
extra-source-files:
2829
CHANGELOG.md
@@ -44,7 +45,7 @@ library
4445
ghc-options: -Wall
4546
build-depends: servant-swagger-ui-core >=0.3.5 && <0.4
4647
build-depends:
47-
base >=4.7 && <4.15
48+
base >=4.7 && <4.16
4849
, aeson >=0.8.0.2 && <1.6
4950
, bytestring >=0.10.4.0 && <0.11
5051
, file-embed-lzma >=0 && <0.1

0 commit comments

Comments
 (0)