From 2f332917d0e4484ed205aa7fcc16bc0d53bd217c Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 15 Oct 2018 15:35:33 +0300 Subject: [PATCH] More relaxation, GHC-8.4.4 --- .travis.yml | 22 ++++--------------- doc/cookbook/basic-auth/basic-auth.cabal | 2 +- .../db-postgres-pool/db-postgres-pool.cabal | 2 +- .../db-sqlite-simple/db-sqlite-simple.cabal | 2 +- doc/cookbook/file-upload/file-upload.cabal | 2 +- doc/cookbook/generic/generic.cabal | 2 +- doc/cookbook/https/https.cabal | 2 +- .../jwt-and-basic-auth.cabal | 2 +- doc/cookbook/pagination/pagination.cabal | 2 +- .../structuring-apis/structuring-apis.cabal | 2 +- .../using-custom-monad.cabal | 2 +- doc/tutorial/tutorial.cabal | 2 +- servant-client-core/servant-client-core.cabal | 9 +++++--- servant-client/servant-client.cabal | 12 ++++++---- servant-docs/servant-docs.cabal | 9 +++++--- servant-foreign/servant-foreign.cabal | 8 ++++--- servant-server/servant-server.cabal | 12 ++++++---- servant/servant.cabal | 10 ++++++--- 18 files changed, 55 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index b87f060c..422377f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,9 +36,9 @@ matrix: - compiler: "ghc-8.6.1" # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}} - - compiler: "ghc-8.4.3" + - compiler: "ghc-8.4.4" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}} - compiler: "ghc-8.2.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}} @@ -137,24 +137,10 @@ install: script: # test that source-distributions can be generated - echo Packaging... && echo -en 'travis_fold:start:sdist\\r' - - (cd "servant" && cabal sdist) - - (cd "servant-client" && cabal sdist) - - (cd "servant-client-core" && cabal sdist) - - (cd "servant-docs" && cabal sdist) - - (cd "servant-foreign" && cabal sdist) - - (cd "servant-server" && cabal sdist) - - (cd "doc/tutorial" && cabal sdist) - - (cd "doc/cookbook/basic-auth" && cabal sdist) - - (cd "doc/cookbook/db-postgres-pool" && cabal sdist) - - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist) - - (cd "doc/cookbook/file-upload" && cabal sdist) - - (cd "doc/cookbook/generic" && cabal sdist) - - (cd "doc/cookbook/https" && cabal sdist) - - (cd "doc/cookbook/structuring-apis" && cabal sdist) - - (cd "doc/cookbook/using-custom-monad" && cabal sdist) + - cabal new-sdist all - echo -en 'travis_fold:end:sdist\\r' - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r' - - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz "doc/cookbook/generic"/dist/cookbook-generic-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz ${DISTDIR}/ + - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-https-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal\\n' > cabal.project" diff --git a/doc/cookbook/basic-auth/basic-auth.cabal b/doc/cookbook/basic-auth/basic-auth.cabal index d677f14f..9db05bdc 100644 --- a/doc/cookbook/basic-auth/basic-auth.cabal +++ b/doc/cookbook/basic-auth/basic-auth.cabal @@ -13,7 +13,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-basic-auth diff --git a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal index a25a4f49..95b8f922 100644 --- a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal +++ b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal @@ -13,7 +13,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-db-postgres-pool diff --git a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal index a215a6e0..8446fbf2 100644 --- a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal +++ b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal @@ -13,7 +13,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-db-sqlite-simple diff --git a/doc/cookbook/file-upload/file-upload.cabal b/doc/cookbook/file-upload/file-upload.cabal index cd472f52..fd155372 100644 --- a/doc/cookbook/file-upload/file-upload.cabal +++ b/doc/cookbook/file-upload/file-upload.cabal @@ -13,7 +13,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-file-upload diff --git a/doc/cookbook/generic/generic.cabal b/doc/cookbook/generic/generic.cabal index 4185ecb2..0584b756 100644 --- a/doc/cookbook/generic/generic.cabal +++ b/doc/cookbook/generic/generic.cabal @@ -13,7 +13,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-using-custom-monad diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal index 1d958eed..c4c68352 100644 --- a/doc/cookbook/https/https.cabal +++ b/doc/cookbook/https/https.cabal @@ -13,7 +13,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-https diff --git a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal index 603c03f4..bc086752 100644 --- a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal +++ b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal @@ -16,7 +16,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-jwt-and-basic-auth diff --git a/doc/cookbook/pagination/pagination.cabal b/doc/cookbook/pagination/pagination.cabal index 8da68b94..8c3a8ae7 100644 --- a/doc/cookbook/pagination/pagination.cabal +++ b/doc/cookbook/pagination/pagination.cabal @@ -16,7 +16,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-pagination diff --git a/doc/cookbook/structuring-apis/structuring-apis.cabal b/doc/cookbook/structuring-apis/structuring-apis.cabal index 42836527..a5c72854 100644 --- a/doc/cookbook/structuring-apis/structuring-apis.cabal +++ b/doc/cookbook/structuring-apis/structuring-apis.cabal @@ -13,7 +13,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-structuring-apis diff --git a/doc/cookbook/using-custom-monad/using-custom-monad.cabal b/doc/cookbook/using-custom-monad/using-custom-monad.cabal index bb3219e5..447760f5 100644 --- a/doc/cookbook/using-custom-monad/using-custom-monad.cabal +++ b/doc/cookbook/using-custom-monad/using-custom-monad.cabal @@ -13,7 +13,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 executable cookbook-using-custom-monad diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal index 9eaff2ac..a9740796 100644 --- a/doc/tutorial/tutorial.cabal +++ b/doc/tutorial/tutorial.cabal @@ -17,7 +17,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 extra-source-files: static/index.html diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 51310544..bb76d806 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -1,9 +1,13 @@ name: servant-client-core version: 0.14.1 +x-revision: 1 + synopsis: Core functionality and class for client function generation for servant APIs +category: Web, Servant description: This library provides backend-agnostic generation of client functions. For more information, see the README. + license: BSD3 license-file: LICENSE author: Servant Contributors @@ -12,7 +16,6 @@ homepage: http://haskell-servant.readthedocs.org/ bug-reports: http://github.com/haskell-servant/servant/issues cabal-version: >=1.10 copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2017 Servant Contributors -category: Web build-type: Simple extra-source-files: include/*.h @@ -23,7 +26,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 source-repository head @@ -101,7 +104,7 @@ test-suite spec build-depends: deepseq >= 1.3.0.2 && <1.5 , hspec >= 2.4.1 && <2.6 - , QuickCheck >= 2.11.3 && < 2.12 + , QuickCheck >= 2.11.3 && < 2.13 build-tool-depends: hspec-discover:hspec-discover >= 2.5.1 && <2.6 diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 59f74b10..1f3c902c 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -1,6 +1,9 @@ name: servant-client version: 0.14 +x-revision: 2 + synopsis: automatical derivation of querying functions for servant webservices +category: Servant, Web description: This library lets you derive automatically Haskell functions that let you query each endpoint of a webservice. @@ -8,12 +11,12 @@ description: See . . + license: BSD3 license-file: LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2017 Servant Contributors -category: Servant, Web build-type: Simple cabal-version: >=1.10 tested-with: @@ -21,8 +24,9 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 + homepage: http://haskell-servant.readthedocs.org/ Bug-reports: http://github.com/haskell-servant/servant/issues extra-source-files: @@ -116,8 +120,8 @@ test-suite spec generics-sop >= 0.3.2.0 && < 0.4 , hspec >= 2.5.1 && < 2.6 , HUnit >= 1.6 && < 1.7 - , network >= 2.6.3.2 && < 2.8 - , QuickCheck >= 2.10.1 && < 2.12 + , network >= 2.6.3.2 && < 2.9 + , QuickCheck >= 2.10.1 && < 2.13 , servant == 0.14.* , servant-server == 0.14.* diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal index fa8635f2..4ae05bc6 100644 --- a/servant-docs/servant-docs.cabal +++ b/servant-docs/servant-docs.cabal @@ -1,19 +1,21 @@ name: servant-docs version: 0.11.2 -x-revision: 5 +x-revision: 6 + synopsis: generate API docs for your servant webservice +category: Servant, Web description: Library for generating API docs from a servant API definition. . Runnable example . . + license: BSD3 license-file: LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contributors -category: Servant, Web build-type: Simple cabal-version: >=1.10 tested-with: @@ -21,8 +23,9 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 + homepage: http://haskell-servant.readthedocs.org/ Bug-reports: http://github.com/haskell-servant/servant/issues extra-source-files: diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal index f4957741..a024f7f4 100644 --- a/servant-foreign/servant-foreign.cabal +++ b/servant-foreign/servant-foreign.cabal @@ -1,7 +1,9 @@ name: servant-foreign version: 0.11.1 -x-revision: 3 +x-revision: 4 + synopsis: Helpers for generating clients for servant APIs in any programming language +category: Servant, Web description: Helper types and functions for generating client functions for servant APIs in any programming language . @@ -10,12 +12,12 @@ description: See the servant-js package for an example . + license: BSD3 license-file: LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2015-2016 Servant Contributors -category: Servant, Web build-type: Simple cabal-version: >=1.10 extra-source-files: @@ -28,7 +30,7 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 source-repository head diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index 354d4d4d..8d0f1bf9 100644 --- a/servant-server/servant-server.cabal +++ b/servant-server/servant-server.cabal @@ -1,6 +1,9 @@ name: servant-server version: 0.14.1 +x-revision: 1 + synopsis: A family of combinators for defining webservices APIs and serving them +category: Servant, Web description: A family of combinators for defining webservices APIs and serving them . @@ -11,6 +14,7 @@ description: a webserver that serves this API, using this package. . + homepage: http://haskell-servant.readthedocs.org/ Bug-reports: http://github.com/haskell-servant/servant/issues license: BSD3 @@ -18,7 +22,6 @@ license-file: LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contributors -category: Servant, Web build-type: Custom cabal-version: >=1.10 tested-with: @@ -26,8 +29,9 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 + extra-source-files: include/*.h CHANGELOG.md @@ -94,7 +98,7 @@ library , http-types >= 0.12.1 && < 0.13 , network-uri >= 2.6.1.0 && < 2.7 , monad-control >= 1.0.2.3 && < 1.1 - , network >= 2.6.3.5 && < 2.8 + , network >= 2.6.3.5 && < 2.9 , string-conversions >= 0.4.0.1 && < 0.5 , resourcet >= 1.1.11 && < 1.3 , tagged >= 0.8.5 && < 0.9 @@ -170,7 +174,7 @@ test-suite spec , directory >= 1.2.1.0 && < 1.4 , hspec >= 2.5.1 && < 2.6 , hspec-wai >= 0.9.0 && < 0.10 - , QuickCheck >= 2.11.3 && < 2.12 + , QuickCheck >= 2.11.3 && < 2.13 , should-not-typecheck >= 2.1.0 && < 2.2 , temporary >= 1.3 && < 1.4 , wai-extra >= 3.0.21.0 && < 3.1 diff --git a/servant/servant.cabal b/servant/servant.cabal index 7a4cde4e..282ebe9a 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -1,12 +1,16 @@ name: servant version: 0.14.1 +x-revision: 1 + synopsis: A family of combinators for defining webservices APIs +category: Servant, Web description: A family of combinators for defining webservices APIs and serving them . You can learn about the basics in the . . + homepage: http://haskell-servant.readthedocs.org/ Bug-reports: http://github.com/haskell-servant/servant/issues license: BSD3 @@ -14,7 +18,6 @@ license-file: LICENSE author: Servant Contributors maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, Servant Contributors -category: Servant, Web build-type: Custom cabal-version: >=1.10 tested-with: @@ -22,8 +25,9 @@ tested-with: GHC==7.10.3 GHC==8.0.2 GHC==8.2.2 - GHC==8.4.3 + GHC==8.4.4 GHC==8.6.1 + extra-source-files: include/*.h CHANGELOG.md @@ -160,7 +164,7 @@ test-suite spec build-depends: aeson-compat >= 0.3.7.1 && < 0.4 , hspec >= 2.5.1 && < 2.6 - , QuickCheck >= 2.11.3 && < 2.12 + , QuickCheck >= 2.11.3 && < 2.13 , quickcheck-instances >= 0.3.18 && < 0.4 build-tool-depends: