Skip to content

Commit 6f9af70

Browse files
ysangkokysangkok
committed
Allow GHC 9.10
1 parent 3940521 commit 6f9af70

File tree

14 files changed

+59
-36
lines changed

14 files changed

+59
-36
lines changed

‎cabal.project

+23
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,26 @@ if(impl(ghc >= 9.6.1))
6969

7070
package servant-server
7171
ghc-options: -fprint-redundant-promotion-ticks
72+
73+
allow-newer: postgresql-simple:base
74+
allow-newer: servant-swagger-ui:base
75+
allow-newer: servant-swagger-ui-core:base
76+
allow-newer: file-embed-lzma:base
77+
allow-newer: file-embed-lzma:template-haskell
78+
allow-newer: file-embed-lzma:filepath
79+
allow-newer: lzma:base
80+
allow-newer: servant-openapi3:base
81+
allow-newer: insert-ordered-containers:base
82+
allow-newer: insert-ordered-containers:lens
83+
allow-newer: openapi3:base
84+
allow-newer: openapi3:template-haskell
85+
allow-newer: swagger2:base
86+
allow-newer: swagger2:template-haskell
87+
allow-newer: swagger2:lens
88+
allow-newer: swagger2:containers
89+
allow-newer: pipes-safe:base
90+
allow-newer: servant-js:base
91+
allow-newer: servant-js:lens
92+
allow-newer: lucid:base
93+
allow-newer: stringsearch:containers
94+
allow-newer: Cabal

‎servant-auth/servant-auth-client/servant-auth-client.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainer: [email protected]
1616
copyright: (c) Julian K. Arni
1717
license: BSD-3-Clause
1818
license-file: LICENSE
19-
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
2020
build-type: Simple
2121
extra-source-files:
2222
CHANGELOG.md
@@ -31,9 +31,9 @@ library
3131
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
3232
ghc-options: -Wall
3333
build-depends:
34-
base >= 4.10 && < 4.20
34+
base >= 4.10 && < 4.21
3535
, bytestring >= 0.10.6.0 && < 0.13
36-
, containers >= 0.5.6.2 && < 0.7
36+
, containers >= 0.5.6.2 && < 0.8
3737
, servant-auth == 0.4.*
3838
, servant >= 0.13 && < 0.21
3939
, servant-client-core >= 0.13 && < 0.21

‎servant-auth/servant-auth-docs/servant-auth-docs.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ maintainer: [email protected]
1616
copyright: (c) Julian K. Arni
1717
license: BSD-3-Clause
1818
license-file: LICENSE
19-
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
2020
build-type: Custom
2121
extra-source-files:
2222
CHANGELOG.md
2323

2424
custom-setup
2525
setup-depends:
26-
base < 4.20, Cabal < 4, cabal-doctest >=1.0.6 && <1.1
26+
base < 4.21, Cabal < 4, cabal-doctest >=1.0.6 && <1.1
2727

2828
source-repository head
2929
type: git
@@ -35,7 +35,7 @@ library
3535
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
3636
ghc-options: -Wall
3737
build-depends:
38-
base >= 4.10 && < 4.20
38+
base >= 4.10 && < 4.21
3939
, servant-docs >= 0.13 && < 0.14
4040
, servant >= 0.13 && < 0.21
4141
, servant-auth == 0.4.*

‎servant-auth/servant-auth-server/servant-auth-server.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainer: [email protected]
1616
copyright: (c) Julian K. Arni
1717
license: BSD-3-Clause
1818
license-file: LICENSE
19-
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
2020
build-type: Simple
2121
extra-source-files:
2222
CHANGELOG.md
@@ -31,7 +31,7 @@ library
3131
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
3232
ghc-options: -Wall
3333
build-depends:
34-
base >= 4.10 && < 4.20
34+
base >= 4.10 && < 4.21
3535
, aeson >= 1.0.0.1 && < 3
3636
, base64-bytestring >= 1.0.0.1 && < 2
3737
, blaze-builder >= 0.4.1.0 && < 0.5

‎servant-auth/servant-auth-swagger/servant-auth-swagger.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainer: [email protected]
1616
copyright: (c) Julian K. Arni
1717
license: BSD-3-Clause
1818
license-file: LICENSE
19-
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
2020
build-type: Simple
2121
extra-source-files:
2222
CHANGELOG.md
@@ -31,7 +31,7 @@ library
3131
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
3232
ghc-options: -Wall
3333
build-depends:
34-
base >= 4.10 && < 4.20
34+
base >= 4.10 && < 4.21
3535
, text >= 1.2.3.0 && < 2.2
3636
, servant-swagger >= 1.1.5 && < 2
3737
, swagger2 >= 2.2.2 && < 3

‎servant-auth/servant-auth/servant-auth.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ maintainer: [email protected]
1818
copyright: (c) Julian K. Arni
1919
license: BSD-3-Clause
2020
license-file: LICENSE
21-
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
21+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4, GHC ==9.10.1
2222
build-type: Simple
2323
extra-source-files:
2424
CHANGELOG.md
@@ -33,8 +33,8 @@ library
3333
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
3434
ghc-options: -Wall
3535
build-depends:
36-
base >= 4.10 && < 4.20
37-
, containers >= 0.6 && < 0.7
36+
base >= 4.10 && < 4.21
37+
, containers >= 0.6 && < 0.8
3838
, aeson >= 2.0 && < 3
3939
, jose >= 0.10 && < 0.12
4040
, lens >= 4.16.1 && < 5.4

‎servant-client-core/servant-client-core.cabal

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ copyright:
2020

2121
build-type: Simple
2222
tested-with:
23-
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
23+
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
2424

2525
extra-source-files:
2626
CHANGELOG.md
@@ -102,12 +102,12 @@ library
102102
--
103103
-- note: mtl lower bound is so low because of GHC-7.8
104104
build-depends:
105-
, base >=4.9 && <4.20
105+
, base >=4.9 && <4.21
106106
, bytestring >=0.10.8.1 && <0.13
107107
, constraints >=0.2 && <0.15
108-
, containers >=0.5.7.1 && <0.7
108+
, containers >=0.5.7.1 && <0.8
109109
, deepseq >=1.4.2.0 && <1.6
110-
, template-haskell >=2.11.1.0 && <2.22
110+
, template-haskell >=2.11.1.0 && <2.23
111111
, text >=1.2.3.0 && <2.2
112112

113113
-- Servant dependencies

‎servant-client/servant-client.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ copyright:
2222

2323
build-type: Simple
2424
tested-with:
25-
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
25+
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
2626

2727
extra-source-files:
2828
CHANGELOG.md
@@ -94,9 +94,9 @@ library
9494
-- Bundled with GHC: Lower bound to not force re-installs
9595
-- text and mtl are bundled starting with GHC-8.4
9696
build-depends:
97-
, base >=4.9 && <4.20
97+
, base >=4.9 && <4.21
9898
, bytestring >=0.10.8.1 && <0.13
99-
, containers >=0.5.7.1 && <0.7
99+
, containers >=0.5.7.1 && <0.8
100100
, deepseq >=1.4.2.0 && <1.6
101101
, mtl ^>=2.2.2 || ^>=2.3.1
102102
, stm >=2.4.5.1 && <2.6

‎servant-docs/servant-docs.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ author: Servant Contributors
1919
maintainer: [email protected]
2020
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
2121
build-type: Simple
22-
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
22+
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1
2323

2424
extra-source-files:
2525
CHANGELOG.md
@@ -41,7 +41,7 @@ library
4141
--
4242
-- note: mtl lower bound is so low because of GHC-7.8
4343
build-depends:
44-
base >= 4.9 && < 4.20
44+
base >= 4.9 && < 4.21
4545
, bytestring >= 0.10.8.1 && < 0.13
4646
, text >= 1.2.3.0 && < 2.2
4747

‎servant-foreign/servant-foreign.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ author: Servant Contributors
2121
maintainer: [email protected]
2222
copyright: 2015-2019 Servant Contributors
2323
build-type: Simple
24-
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
24+
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1
2525

2626
extra-source-files:
2727
CHANGELOG.md
@@ -41,7 +41,7 @@ library
4141
--
4242
-- note: mtl lower bound is so low because of GHC-7.8
4343
build-depends:
44-
base >= 4.9 && < 4.20
44+
base >= 4.9 && < 4.21
4545
, text >= 1.2.3.0 && < 2.2
4646

4747
-- Servant dependencies

‎servant-http-streams/servant-http-streams.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ author: Servant Contributors
2020
maintainer: [email protected]
2121
copyright: 2019 Servant Contributors
2222
build-type: Simple
23-
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2
23+
tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2, GHC ==9.10.1
2424

2525
extra-source-files:
2626
CHANGELOG.md
@@ -38,9 +38,9 @@ library
3838
-- Bundled with GHC: Lower bound to not force re-installs
3939
-- text and mtl are bundled starting with GHC-8.4
4040
build-depends:
41-
base >= 4.9 && < 4.20
41+
base >= 4.9 && < 4.21
4242
, bytestring >= 0.10.8.1 && < 0.13
43-
, containers >= 0.5.7.1 && < 0.7
43+
, containers >= 0.5.7.1 && < 0.8
4444
, deepseq >= 1.4.2.0 && < 1.6
4545
, mtl ^>= 2.2.2 || ^>= 2.3.1
4646
, text >= 1.2.3.0 && < 2.2

‎servant-quickcheck/servant-quickcheck.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ maintainer: [email protected]
1212
category: Web
1313
build-type: Simple
1414
extra-source-files: CHANGELOG.yaml
15-
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.1
15+
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.1 || ==9.10.1
1616

1717
source-repository head
1818
type: git
@@ -36,7 +36,7 @@ library
3636
ghc-options: -Wall -Wcompat
3737
build-depends:
3838
aeson >=0.8 && <2.3
39-
, base >=4.9 && <4.20
39+
, base >=4.9 && <4.21
4040
, base-compat-batteries >=0.10.1 && <0.15
4141
, bytestring >=0.10 && <0.13
4242
, case-insensitive >=1.2 && <1.3

‎servant-server/servant-server.cabal

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ copyright:
2727

2828
build-type: Simple
2929
tested-with:
30-
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
30+
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
3131

3232
extra-source-files:
3333
CHANGELOG.md
@@ -116,11 +116,11 @@ library
116116
-- Bundled with GHC: Lower bound to not force re-installs
117117
-- text and mtl are bundled starting with GHC-8.4
118118
build-depends:
119-
, base >=4.9 && <4.20
119+
, base >=4.9 && <4.21
120120
, bytestring >=0.10.8.1 && <0.13
121121
, constraints >=0.2 && <0.15
122-
, containers >=0.5.7.1 && <0.7
123-
, filepath >=1.4.1.1 && <1.5
122+
, containers >=0.5.7.1 && <0.8
123+
, filepath >=1.4.1.1 && <1.6
124124
, mtl ^>=2.2.2 || ^>=2.3.1
125125
, text >=1.2.3.0 && <2.2
126126
, transformers >=0.5.2.0 && <0.7

‎servant/servant.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ copyright:
2121

2222
build-type: Simple
2323
tested-with:
24-
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
24+
GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2 || ==9.10.1
2525

2626
extra-source-files: CHANGELOG.md
2727

@@ -127,10 +127,10 @@ library
127127
--
128128
-- note: mtl lower bound is so low because of GHC-7.8
129129
build-depends:
130-
, base >=4.9 && <4.20
130+
, base >=4.9 && <4.21
131131
, bytestring >=0.10.8.1 && <0.13
132132
, constraints >=0.2
133-
, containers >=0.6 && <0.7
133+
, containers >=0.6 && <0.8
134134
, mtl ^>=2.2.2 || ^>=2.3.1
135135
, sop-core >=0.4.0.0 && <0.6
136136
, text >=1.2.3.0 && <2.2

0 commit comments

Comments
 (0)