Merge pull request #36 from biocad/ysangkok/patch-1

No upper bound on Cabal dependency, copy of #35

Author: maksbotan

.github/workflows/haskell-ci.yml

@@ -33,9 +33,9 @@ jobs:
       matrix:
         include:
           # Added manually - no 9.4 in haskell-ci yet
-          - compiler: ghc-9.4.2
+          - compiler: ghc-9.4.3
             compilerKind: ghc
-            compilerVersion: 9.4.2
+            compilerVersion: 9.4.3
             setup-method: ghcup
             allow-failure: true
           - compiler: ghc-9.2.2
@@ -243,8 +243,8 @@ jobs:
           rm -f cabal.project.local
       - name: constraint set servant-0.19
         run: |
-          if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19' --dependencies-only -j2 all ; fi
-          if [ $((HCNUMVER >= 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19' all ; fi
+          if [ $((HCNUMVER >= 80800 && HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19' --dependencies-only -j2 all ; fi
+          if [ $((HCNUMVER >= 80800 && HCNUMVER < 90400)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19' all ; fi
       - name: constraint set servant-0.18.2
         run: |
           if [ $((HCNUMVER >= 80800 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.2' --dependencies-only -j2 all ; fi

example/example.cabal

@@ -19,7 +19,7 @@ tested-with:
    || ==8.10.7
    || ==9.0.2
    || ==9.2.2
-   || ==9.4.2
+   || ==9.4.3
 
 library
   ghc-options:      -Wall

servant-openapi3.cabal

@@ -34,7 +34,7 @@ tested-with:
    || ==8.10.7
    || ==9.0.2
    || ==9.2.2
-   || ==9.4.2
+   || ==9.4.3
 
 extra-source-files:
     README.md
@@ -56,7 +56,7 @@ source-repository head
 custom-setup
   setup-depends:
     base >=4.9 && <4.18,
-    Cabal >= 1.24 && <3.7,
+    Cabal >= 1.24,
     cabal-doctest >=1.0.6 && <1.1
 
 library
@@ -85,7 +85,7 @@ library
                      , lens                      >=4.17     && <5.3
                      , servant                   >=0.17     && <0.20
                      , singleton-bool            >=0.1.4    && <0.2
-                     , openapi3                  >=3.0.0    && <3.3
+                     , openapi3                  >=3.2.3    && <3.3
                      , text                      >=1.2.3.0  && <3
                      , unordered-containers      >=0.2.9.0  && <0.3
 

src/Servant/OpenApi/Internal.hs

@@ -229,7 +229,8 @@ instance
 
       combineSwagger :: OpenApi -> OpenApi -> OpenApi
       combineSwagger s t = OpenApi
-        { _openApiInfo = _openApiInfo s <> _openApiInfo t
+        { _openApiOpenapi = _openApiOpenapi s <> _openApiOpenapi t
+        , _openApiInfo = _openApiInfo s <> _openApiInfo t
         , _openApiServers = _openApiServers s <> _openApiServers t
         , _openApiPaths = InsOrdHashMap.unionWith combinePathItem (_openApiPaths s) (_openApiPaths t)
         , _openApiComponents = _openApiComponents s <> _openApiComponents t