Support GHC-9.0.1 (haskell-servant#12)

biocad · Jul 1, 2021 · 73a55a6 · 73a55a6
1 parent 99a2159
commit 73a55a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -30,6 +30,8 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.0.1
+            allow-failure: false
           - compiler: ghc-8.10.4
             allow-failure: false
           - compiler: ghc-8.8.4
@@ -189,13 +191,13 @@ jobs:
           rm -f cabal.project.local
       - name: constraint set servant-0.18.2
         run: |
-          if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.2' all ; fi
+          if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.2' all ; fi
       - name: constraint set servant-0.18.1
         run: |
-          if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.1' all ; fi
+          if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.1' all ; fi
       - name: constraint set servant-0.18
         run: |
-          if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18' all ; fi
+          if [ $((HCNUMVER >= 80800 && 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 ; fi
diff --git a/example/example.cabal b/example/example.cabal
@@ -18,6 +18,7 @@ tested-with:
    || ==8.6.5
    || ==8.8.4
    || ==8.10.4
+   || ==9.0.1
 
 library
   ghc-options:      -Wall
@@ -55,7 +56,7 @@ test-suite swagger-server-spec
   other-modules:
     TodoSpec
     Paths_example
-  build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.8
+  build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.9
   build-depends:    base  == 4.*
                   , base-compat >= 0.6.0
                   , aeson >=0.11.2.0

diff --git a/servant-openapi3.cabal b/servant-openapi3.cabal
@@ -33,6 +33,7 @@ tested-with:
    || ==8.6.5
    || ==8.8.4
    || ==8.10.4
+   || ==9.0.1
 
 extra-source-files:
     README.md
@@ -53,8 +54,8 @@ source-repository head
 
 custom-setup
   setup-depends:
-    base >=4.9 && <4.15,
-    Cabal >= 1.24 && <3.3,
+    base >=4.9 && <4.16,
+    Cabal >= 1.24 && <3.5,
     cabal-doctest >=1.0.6 && <1.1
 
 library
@@ -75,7 +76,7 @@ library
   hs-source-dirs:      src
   build-depends:       aeson                     >=1.4.2.0 && <1.6
                      , aeson-pretty              >=0.8.7    && <0.9
-                     , base                      >=4.9.1.0  && <4.15
+                     , base                      >=4.9.1.0  && <4.16
                      , base-compat               >=0.10.5   && <0.12
                      , bytestring                >=0.10.8.1 && <0.11
                      , http-media                >=0.7.1.3  && <0.9
@@ -96,7 +97,7 @@ test-suite doctests
   build-depends:
     base,
     directory >= 1.0,
-    doctest >= 0.11.1 && <0.18,
+    doctest >= 0.11.1 && <0.19,
     servant,
     QuickCheck,
     filepath