Merge pull request #1688 from haskell-servant/maksbotan/0.20

Prepare 0.20 release
haskell-servant · Jun 23, 2023 · 6247d4d · 6247d4d
2 parents 88408e4 + 9dfb62e
commit 6247d4d
Show file tree

Hide file tree

Showing 20 changed files with 74 additions and 52 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -75,6 +75,15 @@ jobs:
         (cd servant-conduit && eval $DOCTEST)
         (cd servant-pipes && eval $DOCTEST)
 
+    - name: Save cache
+      uses: actions/cache/save@v3
+      if: always()
+      with:
+        path: |
+          ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
+          dist-newstyle
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+
   # stack:
   #   name: stack / ghc ${{ matrix.ghc }}
   #   runs-on: ubuntu-latest
@@ -130,7 +139,7 @@ jobs:
         cat cabal.project
         nix-shell ghcjs.nix --run "cabal v2-update && cabal v2-freeze"
 
-    - uses: actions/cache/save@v3
+    - uses: actions/cache/restore@v3
       name: Cache ~/.cabal/store and dist-newstyle
       with:
         path: |
@@ -147,3 +156,12 @@ jobs:
     - name: Tests
       run: |
         nix-shell ghcjs.nix --run ".github/run-ghcjs-tests.sh"
+
+    - name: Save cache
+      uses: actions/cache/save@v3
+      if: always()
+      with:
+        path: |
+          ~/.cabal/store
+          dist-newstyle
+        key: ${{ runner.os }}-ghcjs8.6-${{ hashFiles('cabal.project.freeze') }}
diff --git a/cabal.project b/cabal.project
@@ -68,3 +68,7 @@ if(impl(ghc >= 9.6.1))
 
   package servant-server
     ghc-options: -fprint-redundant-promotion-ticks
+
+allow-newer: servant-multipart:servant, servant-multipart:servant-server, servant-multipart-api:servant
+allow-newer: servant-pagination:servant, servant-pagination:servant-server
+allow-newer: servant-js:servant, servant-js:servant-foreign
diff --git a/doc/cookbook/managed-resource/managed-resource.cabal b/doc/cookbook/managed-resource/managed-resource.cabal
@@ -15,9 +15,9 @@ executable cookbook-managed-resource
   build-depends:       base == 4.*
                      , text >= 1.2
                      , aeson >= 1.2
-                     , servant
-                     , servant-client
-                     , servant-server
+                     , servant >= 0.20 && <0.21
+                     , servant-client >= 0.20 && <0.21
+                     , servant-server >= 0.20 && <0.21
                      , warp >= 3.2
                      , wai >= 3.2
                      , http-types >= 0.12

diff --git a/doc/cookbook/using-free-client/using-free-client.cabal b/doc/cookbook/using-free-client/using-free-client.cabal
@@ -14,12 +14,12 @@ executable cookbook-using-free-client
   main-is:             UsingFreeClient.lhs
   build-depends:       base >= 4.9 && <5
                      , free
-                     , servant
-                     , servant-client
+                     , servant >= 0.20 && <0.21
+                     , servant-client >= 0.20 && <0.21
                      , http-client
-                     , servant-client-core
+                     , servant-client-core >= 0.20 && <0.21
                      , base-compat
-                     , servant-server
+                     , servant-server >= 0.20 && <0.21
                      , warp >= 3.2
   default-language:    Haskell2010
   ghc-options:         -Wall -pgmL markdown-unlit

diff --git a/servant-auth/servant-auth-client/servant-auth-client.cabal b/servant-auth/servant-auth-client/servant-auth-client.cabal
@@ -35,8 +35,8 @@ library
     , bytestring          >= 0.10.6.0 && < 0.12
     , containers          >= 0.5.6.2  && < 0.7
     , servant-auth        == 0.4.*
-    , servant             >= 0.13     && < 0.20
-    , servant-client-core >= 0.13     && < 0.20
+    , servant             >= 0.13     && < 0.21
+    , servant-client-core >= 0.13     && < 0.21
 
   exposed-modules:
       Servant.Auth.Client
@@ -69,7 +69,7 @@ test-suite spec
     , http-client          >= 0.5.13.1 && < 0.8
     , http-types           >= 0.12.2   && < 0.13
     , servant-auth-server  >= 0.4.2.0  && < 0.5
-    , servant-server       >= 0.13     && < 0.20
+    , servant-server       >= 0.13     && < 0.21
     , time                 >= 1.5.0.1  && < 1.13
     , transformers         >= 0.4.2.0  && < 0.7
     , wai                  >= 3.2.1.2  && < 3.3

diff --git a/servant-auth/servant-auth-docs/servant-auth-docs.cabal b/servant-auth/servant-auth-docs/servant-auth-docs.cabal
@@ -36,8 +36,8 @@ library
   ghc-options: -Wall
   build-depends:
       base         >= 4.10    && < 4.19
-    , servant-docs >= 0.11.2  && < 0.13
-    , servant      >= 0.13    && < 0.20
+    , servant-docs >= 0.13    && < 0.14
+    , servant      >= 0.13    && < 0.21
     , servant-auth == 0.4.*
     , lens         >= 4.16.1  && <5.3
   exposed-modules:

diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal
@@ -46,9 +46,9 @@ library
     , memory                  >= 0.14.16  && < 0.19
     , monad-time              >= 0.3.1.0  && < 0.4
     , mtl                     ^>= 2.2.2   || ^>= 2.3.1
-    , servant                 >= 0.13     && < 0.20
+    , servant                 >= 0.13     && < 0.21
     , servant-auth            == 0.4.*
-    , servant-server          >= 0.13     && < 0.20
+    , servant-server          >= 0.13     && < 0.21
     , tagged                  >= 0.8.4    && < 0.9
     , text                    >= 1.2.3.0  && < 2.1
     , time                    >= 1.5.0.1  && < 1.13

diff --git a/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal b/servant-auth/servant-auth-swagger/servant-auth-swagger.cabal
@@ -35,7 +35,7 @@ library
     , text            >= 1.2.3.0 && < 2.1
     , servant-swagger >= 1.1.5   && < 2
     , swagger2        >= 2.2.2   && < 3
-    , servant         >= 0.13    && < 0.20
+    , servant         >= 0.13    && < 0.21
     , servant-auth    == 0.4.*
     , lens            >= 4.16.1  && < 5.3
   exposed-modules:

diff --git a/servant-auth/servant-auth/servant-auth.cabal b/servant-auth/servant-auth/servant-auth.cabal
@@ -38,7 +38,7 @@ library
     , aeson                   >= 1.3.1.1  && < 3
     , jose                    >= 0.10     && < 0.11
     , lens                    >= 4.16.1   && < 5.3
-    , servant                 >= 0.15     && < 0.20
+    , servant                 >= 0.15     && < 0.21
     , text                    >= 1.2.3.0  && < 2.1
     , unordered-containers    >= 0.2.9.0  && < 0.3
   exposed-modules:

diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-client-core
-version:             0.19
+version:             0.20
 
 synopsis:            Core functionality and class for client function generation for servant APIs
 category:            Servant, Web
@@ -65,7 +65,7 @@ library
 
   -- Servant dependencies
   build-depends:
-      servant            >= 0.19
+      servant            >= 0.20
 
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.

diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-client
-version:             0.19
+version:             0.20
 
 synopsis:            Automatic derivation of querying functions for servant
 category:            Servant, Web
@@ -58,8 +58,8 @@ library
   -- Servant dependencies.
   -- Strict dependency on `servant-client-core` as we re-export things.
   build-depends:
-      servant               >= 0.18 && < 0.20
-    , servant-client-core   >= 0.19 && < 0.19.1
+      servant               >= 0.20 && < 0.21
+    , servant-client-core   >= 0.20 && < 0.21
 
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.
@@ -128,8 +128,8 @@ test-suite spec
     , HUnit             >= 1.6.0.0  && < 1.7
     , network           >= 2.8.0.0  && < 3.2
     , QuickCheck        >= 2.12.6.1 && < 2.15
-    , servant           == 0.19.*
-    , servant-server    == 0.19.*
+    , servant           >= 0.20     && < 0.21
+    , servant-server    >= 0.20     && < 0.21
 
   build-tool-depends:
     hspec-discover:hspec-discover >= 2.6.0 && < 2.11

diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-conduit
-version:             0.15.1
+version:             0.16
 
 synopsis:            Servant Stream support for conduit.
 category:            Servant, Web, Enumerator
@@ -33,7 +33,7 @@ library
     , conduit       >=1.3.1    && <1.4
     , mtl           ^>=2.2.2   || ^>=2.3.1
     , resourcet     >=1.2.2    && <1.4
-    , servant       >=0.15     && <0.20
+    , servant       >=0.20     && <0.21
     , unliftio-core >=0.1.2.0  && <0.3
   hs-source-dirs:      src
   default-language:    Haskell2010
@@ -52,10 +52,10 @@ test-suite example
     , conduit
     , http-media
     , resourcet
-    , servant
+    , servant        >=0.20     && <0.21
     , servant-conduit
-    , servant-server >=0.15     && <0.20
-    , servant-client >=0.15     && <0.20
+    , servant-server >=0.20     && <0.21
+    , servant-client >=0.20     && <0.21
     , wai            >=3.2.1.2  && <3.3
     , warp           >=3.2.25   && <3.4
     , http-client

diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-docs
-version:             0.12
+version:             0.13
 
 synopsis:            generate API docs for your servant webservice
 category:            Servant, Web
@@ -47,7 +47,7 @@ library
 
   -- Servant dependencies
   build-depends:
-      servant            >= 0.18 && <0.20
+      servant            >= 0.20 && <0.21
 
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.

diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-foreign
-version:             0.15.4
+version:             0.16
 
 synopsis:            Helpers for generating clients for servant APIs in any programming language
 category:            Servant, Web
@@ -46,7 +46,7 @@ library
 
   -- Servant dependencies
   build-depends:
-      servant            >=0.18 && <0.20
+      servant            >=0.20 && <0.21
 
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.

diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-http-streams
-version:             0.18.4
+version:             0.20
 
 synopsis:            Automatic derivation of querying functions for servant
 category:            Servant, Web
@@ -54,8 +54,8 @@ library
   -- Servant dependencies.
   -- Strict dependency on `servant-client-core` as we re-export things.
   build-depends:
-      servant               >= 0.18 && < 0.20
-    , servant-client-core   >= 0.18.3 && <0.20
+      servant               >= 0.20 && < 0.21
+    , servant-client-core   >= 0.20 && <0.21
 
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.
@@ -116,8 +116,8 @@ test-suite spec
     , HUnit             >= 1.6.0.0  && < 1.7
     , network           >= 2.8.0.0  && < 3.2
     , QuickCheck        >= 2.12.6.1 && < 2.15
-    , servant           == 0.19.*
-    , servant-server    == 0.19.*
+    , servant-server    >= 0.20 && < 0.21
+    , servant           >= 0.20 && < 0.21
 
   build-tool-depends:
     hspec-discover:hspec-discover >= 2.6.0 && < 2.11

diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-machines
-version:             0.15.1
+version:             0.16
 
 synopsis:            Servant Stream support for machines
 category:            Servant, Web, Enumerator
@@ -32,7 +32,7 @@ library
     , bytestring    >=0.10.8.1 && <0.12
     , machines      >=0.6.4    && <0.8
     , mtl           ^>=2.2.2   || ^>=2.3.1
-    , servant       >=0.15     && <0.20
+    , servant       >=0.20     && <0.21
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options: -Wall
@@ -48,11 +48,11 @@ test-suite example
     , base-compat
     , bytestring
     , http-media
-    , servant
+    , servant        >=0.20     && <0.21
     , machines
     , servant-machines
-    , servant-server >=0.15     && <0.20
-    , servant-client >=0.15     && <0.20
+    , servant-server >=0.20     && <0.21
+    , servant-client >=0.20     && <0.21
     , wai            >=3.2.1.2  && <3.3
     , warp           >=3.2.25   && <3.4
     , http-client

diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal
@@ -34,7 +34,7 @@ library
     , pipes-safe    >=2.3.1    && <2.4
     , mtl           ^>=2.2.2   || ^>=2.3.1
     , monad-control >=1.0.2.3  && <1.1
-    , servant       >=0.15     && <0.20
+    , servant       >=0.20     && <0.21
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options: -Wall
@@ -50,13 +50,13 @@ test-suite example
     , base-compat
     , bytestring
     , http-media
-    , servant
     , pipes
     , pipes-safe
     , servant-pipes
     , pipes-bytestring  >=2.1.6    && <2.2
-    , servant-server    >=0.15     && <0.20
-    , servant-client    >=0.15     && <0.20
+    , servant           >=0.20     && <0.21
+    , servant-server    >=0.15     && <0.21
+    , servant-client    >=0.15     && <0.21
     , wai               >=3.2.1.2  && <3.3
     , warp              >=3.2.25   && <3.4
     , http-client

diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-server
-version:             0.19.2
+version:             0.20
 
 synopsis:            A family of combinators for defining webservices APIs and serving them
 category:            Servant, Web
@@ -72,7 +72,7 @@ library
   -- Servant dependencies
   -- strict dependency as we re-export 'servant' things.
   build-depends:
-      servant             >= 0.19     && < 0.20
+      servant             >= 0.20     && < 0.21
     , http-api-data       >= 0.4.1    && < 0.6
 
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

diff --git a/servant-swagger/servant-swagger.cabal b/servant-swagger/servant-swagger.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant-swagger
-version:             1.1.11
+version:             1.2
 synopsis:            Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.
 description:
   Swagger is a project used to describe and document RESTful APIs. The core of the
@@ -77,7 +77,7 @@ library
                      , http-media                >=0.7.1.3  && <0.9
                      , insert-ordered-containers >=0.2.1.0  && <0.3
                      , lens                      >=4.17     && <6
-                     , servant                   >=0.18.2   && <0.20
+                     , servant                   >=0.20     && <0.21
                      , singleton-bool            >=0.1.4    && <0.2
                      , swagger2                  >=2.3.0.1  && <3
                      , text                      >=1.2.3.0  && <2.1

diff --git a/servant/servant.cabal b/servant/servant.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                servant
-version:             0.19.1
+version:             0.20
 
 synopsis:            A family of combinators for defining webservices APIs
 category:            Servant, Web