From 58b401558d6fd4435d84bf3fb92a5efbc41e6e38 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Wed, 20 Feb 2019 19:05:49 +0200 Subject: [PATCH] Bump versions to 0.16 --- .travis.yml | 18 +++++ Makefile | 11 ++- cabal.project | 8 +- servant-client-core/servant-client-core.cabal | 4 +- .../servant-client-ghcjs.cabal | 73 ++++++++++--------- servant-client/servant-client.cabal | 11 ++- servant-conduit/servant-conduit.cabal | 7 +- servant-docs/servant-docs.cabal | 3 +- servant-foreign/servant-foreign.cabal | 3 +- .../servant-http-streams.cabal | 8 +- servant-machines/servant-machines.cabal | 7 +- servant-pipes/servant-pipes.cabal | 9 ++- servant-server/servant-server.cabal | 4 +- servant/servant.cabal | 2 +- 14 files changed, 100 insertions(+), 68 deletions(-) diff --git a/.travis.yml b/.travis.yml index 429ee087..bcc0f04b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,6 +96,15 @@ install: - "echo 'constraints: foundation >=0.0.14' >> cabal.project" - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project" - "echo 'allow-newer: servant-js:base' >> cabal.project" + - "echo 'allow-newer: servant-pagination:servant' >> cabal.project" + - "echo 'allow-newer: servant-pagination: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-auth-server:servant' >> cabal.project" + - "echo 'allow-newer: servant-auth-server:servant-server' >> cabal.project" + - "echo 'allow-newer: servant-auth-server:http-api-data' >> cabal.project" + - "echo 'allow-newer: servant-js:servant' >> cabal.project" + - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project" @@ -174,6 +183,15 @@ script: - "echo 'constraints: foundation >=0.0.14' >> cabal.project" - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project" - "echo 'allow-newer: servant-js:base' >> cabal.project" + - "echo 'allow-newer: servant-pagination:servant' >> cabal.project" + - "echo 'allow-newer: servant-pagination: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-auth-server:servant' >> cabal.project" + - "echo 'allow-newer: servant-auth-server:servant-server' >> cabal.project" + - "echo 'allow-newer: servant-auth-server:http-api-data' >> cabal.project" + - "echo 'allow-newer: servant-js:servant' >> cabal.project" + - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project" - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project" diff --git a/Makefile b/Makefile index b1f92cb8..70ad462e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,19 @@ # With common maintenance tasks +HC ?= ghc-8.4.4 + all : @echo "Don't try to make all at once!" +really-all : + $(MAKE) build-ghc + $(MAKE) build-ghc HC=ghc-8.0.2 + $(MAKE) build-ghc HC=ghc-8.2.2 + $(MAKE) build-ghc HC=ghc-8.6.3 + $(MAKE) build-ghcjs + build-ghc : - cabal v2-build all + cabal v2-build -w $(HC) all build-ghcjs : cabal v2-build --builddir=dist-newstyle-ghcjs --project-file=cabal.ghcjs.project all diff --git a/cabal.project b/cabal.project index 76e4f523..fd2355e0 100644 --- a/cabal.project +++ b/cabal.project @@ -44,10 +44,10 @@ constraints: memory <0.14.12 || >0.14.12 allow-newer: --- servant-pagination:servant, servant-pagination:servant-server, --- servant-multipart:servant, servant-multipart:servant-server, --- servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data, --- servant-js:servant, servant-js:servant-foreign, + servant-pagination:servant, servant-pagination:servant-server, + servant-multipart:servant, servant-multipart:servant-server, + servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data, + servant-js:servant, servant-js:servant-foreign -- servant-quickcheck allow-newer: diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 090b6a28..55a710a2 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.15 +version: 0.16 synopsis: Core functionality and class for client function generation for servant APIs category: Servant, Web @@ -67,7 +67,7 @@ library -- Servant dependencies build-depends: - servant >= 0.15 && <0.16 + servant >= 0.16 && <0.17 -- 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-ghcjs/servant-client-ghcjs.cabal b/servant-client-ghcjs/servant-client-ghcjs.cabal index c1e2484d..6666dbee 100644 --- a/servant-client-ghcjs/servant-client-ghcjs.cabal +++ b/servant-client-ghcjs/servant-client-ghcjs.cabal @@ -1,9 +1,10 @@ -cabal-version: >=1.10 -name: servant-client-ghcjs -version: 0.14 +cabal-version: >=1.10 +name: servant-client-ghcjs +version: 0.16 +synopsis: + Automatic derivation of querying functions for servant webservices for GHCJS -synopsis: Automatic derivation of querying functions for servant webservices for GHCJS -category: Servant, Web +category: Servant, Web description: This library lets you automatically derive Haskell functions that let you query each endpoint of a webservice. @@ -12,52 +13,52 @@ description: . -homepage: http://haskell-servant.readthedocs.org/ -bug-reports: http://github.com/haskell-servant/servant/issues -license: BSD3 -license-file: LICENSE -author: Servant Contributors -maintainer: haskell-servant-maintainers@googlegroups.com -copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2018 Servant Contributors -build-type: Simple -tested-with: - GHC >= 7.8 +homepage: http://haskell-servant.readthedocs.org/ +bug-reports: http://github.com/haskell-servant/servant/issues +license: BSD3 +license-file: LICENSE +author: Servant Contributors +maintainer: haskell-servant-maintainers@googlegroups.com +copyright: + 2014-2016 Zalora South East Asia Pte Ltd, 2016-2018 Servant Contributors +build-type: Simple +tested-with: ghc >=7.8 extra-source-files: CHANGELOG.md README.md source-repository head - type: git + type: git location: http://github.com/haskell-servant/servant.git library exposed-modules: Servant.Client.Ghcjs Servant.Client.Internal.XhrClient - build-depends: - base >= 4.11 && < 4.12 - , bytestring >= 0.10 && < 0.11 - , case-insensitive >= 1.2.0.0 && < 1.3.0.0 - , containers >= 0.5 && < 0.7 - , exceptions >= 0.8 && < 0.11 - , ghcjs-base >= 0.2.0.0 && < 0.3.0.0 - , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0 - , http-media >= 0.6.2 && < 0.8 - , http-types >= 0.12 && < 0.13 - , monad-control >= 1.0.0.4 && < 1.1 - , mtl >= 2.2.2 && < 2.3 - , semigroupoids >= 5.3 && < 5.4 - , string-conversions >= 0.3 && < 0.5 - , transformers >= 0.3 && < 0.6 - , transformers-base >= 0.4.4 && < 0.5 + build-depends: + base >=4.11 && <4.12 + , bytestring >=0.10 && <0.11 + , case-insensitive >=1.2.0.0 && <1.3.0.0 + , containers >=0.5 && <0.7 + , exceptions >=0.8 && <0.11 + , ghcjs-base >=0.2.0.0 && <0.3.0.0 + , ghcjs-prim >=0.1.0.0 && <0.2.0.0 + , http-media >=0.6.2 && <0.8 + , http-types >=0.12 && <0.13 + , monad-control >=1.0.0.4 && <1.1 + , mtl >=2.2.2 && <2.3 + , semigroupoids >=5.3 && <5.4 + , string-conversions >=0.3 && <0.5 + , transformers >=0.3 && <0.6 + , transformers-base >=0.4.4 && <0.5 -- strict, as we re-export stuff build-depends: - servant == 0.15.*, - servant-client-core == 0.15.* + servant >=0.16 && <0.17 + , servant-client-core >=0.16 && <0.16.1 - hs-source-dirs: src + hs-source-dirs: src default-language: Haskell2010 - ghc-options: -Wall -Wno-redundant-constraints + ghc-options: -Wall -Wno-redundant-constraints diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 2a2b23e4..7f5e2f68 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -1,7 +1,6 @@ cabal-version: >=1.10 name: servant-client -version: 0.15 -x-revision: 1 +version: 0.16 synopsis: Automatic derivation of querying functions for servant category: Servant, Web @@ -62,8 +61,8 @@ library -- Servant dependencies. -- Strict dependency on `servant-client-core` as we re-export things. build-depends: - servant == 0.15.* - , servant-client-core >= 0.15 && <0.15.1 + servant == 0.16.* + , servant-client-core >= 0.16 && <0.16.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. @@ -120,8 +119,8 @@ test-suite spec , HUnit >= 1.6.0.0 && < 1.7 , network >= 2.8.0.0 && < 3.1 , QuickCheck >= 2.12.6.1 && < 2.13 - , servant == 0.15.* - , servant-server == 0.15.* + , servant == 0.16.* + , servant-server == 0.16.* , tdigest >= 0.2 && < 0.3 build-tool-depends: diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal index ed61a489..0680e882 100644 --- a/servant-conduit/servant-conduit.cabal +++ b/servant-conduit/servant-conduit.cabal @@ -1,6 +1,7 @@ cabal-version: >=1.10 name: servant-conduit version: 0.15 +x-revision: 1 synopsis: Servant Stream support for conduit. category: Servant, Web, Enumerator @@ -37,7 +38,7 @@ library , conduit >=1.3.1 && <1.4 , mtl >=2.2.2 && <2.3 , resourcet >=1.2.2 && <1.3 - , servant >=0.15 && <0.16 + , servant >=0.15 && <0.17 , unliftio-core >=0.1.2.0 && <0.2 hs-source-dirs: src default-language: Haskell2010 @@ -58,8 +59,8 @@ test-suite example , resourcet , servant , servant-conduit - , servant-server >=0.15 && <0.16 - , servant-client >=0.15 && <0.16 + , servant-server >=0.15 && <0.17 + , servant-client >=0.15 && <0.17 , wai >=3.2.1.2 && <3.3 , warp >=3.2.25 && <3.3 , http-client diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index f11cbb56..18c6eaeb 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -1,6 +1,7 @@ cabal-version: >=1.10 name: servant-docs version: 0.11.3 +x-revision: 1 synopsis: generate API docs for your servant webservice category: Servant, Web @@ -51,7 +52,7 @@ library -- Servant dependencies build-depends: - servant == 0.15.* + servant >= 0.15 && <0.17 -- 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 64a2654c..a2811ded 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -1,6 +1,7 @@ cabal-version: >=1.10 name: servant-foreign version: 0.15 +x-revision: 1 synopsis: Helpers for generating clients for servant APIs in any programming language category: Servant, Web @@ -50,7 +51,7 @@ library -- Servant dependencies build-depends: - servant == 0.15.* + servant >=0.15 && <0.17 -- 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 13896017..ac632938 100644 --- a/servant-http-streams/servant-http-streams.cabal +++ b/servant-http-streams/servant-http-streams.cabal @@ -58,8 +58,8 @@ library -- Servant dependencies. -- Strict dependency on `servant-client-core` as we re-export things. build-depends: - servant == 0.15.* - , servant-client-core >= 0.15 && <0.15.1 + servant == 0.16.* + , servant-client-core >= 0.16 && <0.16.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. @@ -120,8 +120,8 @@ test-suite spec , HUnit >= 1.6.0.0 && < 1.7 , network >= 2.8.0.0 && < 3.1 , QuickCheck >= 2.12.6.1 && < 2.13 - , servant == 0.15.* - , servant-server == 0.15.* + , servant == 0.16.* + , servant-server == 0.16.* , tdigest >= 0.2 && < 0.3 build-tool-depends: diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal index c4246eb3..90e874a9 100644 --- a/servant-machines/servant-machines.cabal +++ b/servant-machines/servant-machines.cabal @@ -1,6 +1,7 @@ cabal-version: >=1.10 name: servant-machines version: 0.15 +x-revision: 1 synopsis: Servant Stream support for machines category: Servant, Web, Enumerator @@ -36,7 +37,7 @@ library , bytestring >=0.10.8.1 && <0.11 , machines >=0.6.4 && <0.7 , mtl >=2.2.2 && <2.3 - , servant >=0.15 && <0.16 + , servant >=0.15 && <0.17 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall @@ -55,8 +56,8 @@ test-suite example , servant , machines , servant-machines - , servant-server >=0.15 && <0.16 - , servant-client >=0.15 && <0.16 + , servant-server >=0.15 && <0.17 + , servant-client >=0.15 && <0.17 , wai >=3.2.1.2 && <3.3 , warp >=3.2.25 && <3.3 , http-client diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal index a779146b..5be92ad0 100644 --- a/servant-pipes/servant-pipes.cabal +++ b/servant-pipes/servant-pipes.cabal @@ -1,6 +1,7 @@ +cabal-version: >=1.10 name: servant-pipes version: 0.15 -cabal-version: >=1.10 +x-revision: 1 synopsis: Servant Stream support for pipes category: Servant, Web, Pipes @@ -38,7 +39,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.16 + , servant >=0.15 && <0.17 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall @@ -59,8 +60,8 @@ test-suite example , pipes-safe , servant-pipes , pipes-bytestring >=2.1.6 && <2.2 - , servant-server >=0.15 && <0.16 - , servant-client >=0.15 && <0.16 + , servant-server >=0.15 && <0.17 + , servant-client >=0.15 && <0.17 , wai >=3.2.1.2 && <3.3 , warp >=3.2.25 && <3.3 , http-client diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index e01208dc..eb7f2140 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.15 +version: 0.16 synopsis: A family of combinators for defining webservices APIs and serving them category: Servant, Web @@ -76,7 +76,7 @@ library -- Servant dependencies -- strict dependency as we re-export 'servant' things. build-depends: - servant >= 0.15 && < 0.15.1 + servant >= 0.16 && < 0.17.1 , http-api-data >= 0.4 && < 0.4.1 -- Other dependencies: Lower bound around what is in the latest Stackage LTS. diff --git a/servant/servant.cabal b/servant/servant.cabal index 2d1bd44c..120cd135 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: servant -version: 0.15 +version: 0.16 synopsis: A family of combinators for defining webservices APIs category: Servant, Web