From 43cf589e0ec071d8c4d5f254a546fe1998ed055b Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Thu, 30 Jul 2020 19:03:58 +0300 Subject: [PATCH] Bump version to 0.18 --- .travis.yml | 8 ++++++++ cabal.project | 6 ++++++ servant-client-core/servant-client-core.cabal | 4 ++-- servant-client/servant-client.cabal | 10 +++++----- servant-conduit/servant-conduit.cabal | 6 +++--- servant-docs/servant-docs.cabal | 2 +- servant-foreign/servant-foreign.cabal | 2 +- servant-http-streams/servant-http-streams.cabal | 10 +++++----- servant-machines/servant-machines.cabal | 6 +++--- servant-pipes/servant-pipes.cabal | 6 +++--- servant-server/servant-server.cabal | 4 ++-- servant/servant.cabal | 2 +- 12 files changed, 40 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0944531f..4db8acad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -195,6 +195,10 @@ install: echo "constraints: sqlite-simple < 0" >> cabal.project echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project + echo "allow-newer: servant-multipart:servant" >> cabal.project + echo "allow-newer: servant-multipart:servant-server" >> cabal.project + echo "allow-newer: servant-multipart:servant-client-core" >> cabal.project + echo "allow-newer: servant-js:servant" >> cabal.project echo "optimization: False" >> cabal.project - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-custom-errors|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true @@ -336,6 +340,10 @@ script: echo "constraints: sqlite-simple < 0" >> cabal.project echo "allow-newer: servant-pagination-2.2.2:servant" >> cabal.project echo "allow-newer: servant-pagination-2.2.2:servant-server" >> cabal.project + echo "allow-newer: servant-multipart:servant" >> cabal.project + echo "allow-newer: servant-multipart:servant-server" >> cabal.project + echo "allow-newer: servant-multipart:servant-client-core" >> cabal.project + echo "allow-newer: servant-js:servant" >> cabal.project echo "optimization: False" >> cabal.project - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-custom-errors|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-pagination|cookbook-structuring-apis|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true diff --git a/cabal.project b/cabal.project index fcc8c291..7ac8231c 100644 --- a/cabal.project +++ b/cabal.project @@ -63,3 +63,9 @@ write-ghc-environment-files: always -- https://github.com/chordify/haskell-servant-pagination/pull/12 allow-newer: servant-pagination-2.2.2:servant allow-newer: servant-pagination-2.2.2:servant-server + +-- https://github.com/haskell-servant/servant-multipart/pull/41 +allow-newer: servant-multipart:servant +allow-newer: servant-multipart:servant-server +allow-newer: servant-multipart:servant-client-core +allow-newer: servant-js:servant diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 1d1618ce..bb684c29 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: servant-client-core -version: 0.17 +version: 0.18 synopsis: Core functionality and class for client function generation for servant APIs category: Servant, Web @@ -70,7 +70,7 @@ library -- Servant dependencies build-depends: - servant >= 0.17 && <0.18 + servant >= 0.18 && <0.19 -- 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 index 20c7e522..bd5fb453 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: servant-client -version: 0.17 +version: 0.18 synopsis: Automatic derivation of querying functions for servant category: Servant, Web @@ -63,8 +63,8 @@ library -- Servant dependencies. -- Strict dependency on `servant-client-core` as we re-export things. build-depends: - servant == 0.17.* - , servant-client-core >= 0.17 && <0.17.1 + servant == 0.18.* + , servant-client-core >= 0.18 && <0.18.1 -- 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.14 - , servant == 0.17.* - , servant-server == 0.17.* + , servant == 0.18.* + , servant-server == 0.18.* , tdigest >= 0.2 && < 0.3 build-tool-depends: diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal index d6bdf0a0..11db60b7 100644 --- a/servant-conduit/servant-conduit.cabal +++ b/servant-conduit/servant-conduit.cabal @@ -40,7 +40,7 @@ library , conduit >=1.3.1 && <1.4 , mtl >=2.2.2 && <2.3 , resourcet >=1.2.2 && <1.3 - , servant >=0.15 && <0.18 + , servant >=0.15 && <0.19 , unliftio-core >=0.1.2.0 && <0.3 hs-source-dirs: src default-language: Haskell2010 @@ -61,8 +61,8 @@ test-suite example , resourcet , servant , servant-conduit - , servant-server >=0.15 && <0.18 - , servant-client >=0.15 && <0.18 + , servant-server >=0.15 && <0.19 + , servant-client >=0.15 && <0.19 , 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 index c061cc8e..f93272f6 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -53,7 +53,7 @@ library -- Servant dependencies build-depends: - servant >= 0.17 && <0.18 + servant >= 0.18 && <0.19 -- 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 index a0531c38..6a2cc0a0 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -52,7 +52,7 @@ library -- Servant dependencies build-depends: - servant >=0.17 && <0.18 + servant >=0.18 && <0.19 -- 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 index 041919e2..62ebffa8 100644 --- a/servant-http-streams/servant-http-streams.cabal +++ b/servant-http-streams/servant-http-streams.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: servant-http-streams -version: 0.17 +version: 0.18 synopsis: Automatic derivation of querying functions for servant category: Servant, Web @@ -60,8 +60,8 @@ library -- Servant dependencies. -- Strict dependency on `servant-client-core` as we re-export things. build-depends: - servant == 0.17.* - , servant-client-core >= 0.17 && <0.17.1 + servant == 0.18.* + , servant-client-core >= 0.18 && <0.19.1 -- 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. @@ -122,8 +122,8 @@ test-suite spec , HUnit >= 1.6.0.0 && < 1.7 , network >= 2.8.0.0 && < 3.2 , QuickCheck >= 2.12.6.1 && < 2.14 - , servant == 0.17.* - , servant-server == 0.17.* + , servant == 0.18.* + , servant-server == 0.18.* , tdigest >= 0.2 && < 0.3 build-tool-depends: diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal index a4103947..c6ada8c5 100644 --- a/servant-machines/servant-machines.cabal +++ b/servant-machines/servant-machines.cabal @@ -39,7 +39,7 @@ library , bytestring >=0.10.8.1 && <0.11 , machines >=0.6.4 && <0.8 , mtl >=2.2.2 && <2.3 - , servant >=0.15 && <0.18 + , servant >=0.15 && <0.19 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall @@ -58,8 +58,8 @@ test-suite example , servant , machines , servant-machines - , servant-server >=0.15 && <0.18 - , servant-client >=0.15 && <0.18 + , servant-server >=0.15 && <0.19 + , servant-client >=0.15 && <0.19 , 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 index d0c82340..cdabca7e 100644 --- a/servant-pipes/servant-pipes.cabal +++ b/servant-pipes/servant-pipes.cabal @@ -41,7 +41,7 @@ library , pipes-safe >=2.3.1 && <2.4 , mtl >=2.2.2 && <2.3 , monad-control >=1.0.2.3 && <1.1 - , servant >=0.15 && <0.18 + , servant >=0.15 && <0.19 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall @@ -62,8 +62,8 @@ test-suite example , pipes-safe , servant-pipes , pipes-bytestring >=2.1.6 && <2.2 - , servant-server >=0.15 && <0.18 - , servant-client >=0.15 && <0.18 + , servant-server >=0.15 && <0.19 + , servant-client >=0.15 && <0.19 , 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 index c0a42da4..d16ea789 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: servant-server -version: 0.17 +version: 0.18 x-revision: 1 synopsis: A family of combinators for defining webservices APIs and serving them @@ -77,7 +77,7 @@ library -- Servant dependencies -- strict dependency as we re-export 'servant' things. build-depends: - servant >= 0.17 && < 0.17.1 + servant >= 0.18 && < 0.19.1 , http-api-data >= 0.4.1 && < 0.4.2 -- Other dependencies: Lower bound around what is in the latest Stackage LTS. diff --git a/servant/servant.cabal b/servant/servant.cabal index c2f5c090..f5d821b1 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: servant -version: 0.17 +version: 0.18 synopsis: A family of combinators for defining webservices APIs category: Servant, Web