From 4cc4641dc12336df8cf3604e43b14824da46148c Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sat, 3 Aug 2019 14:37:46 +0300 Subject: [PATCH] Allow warp-3.3 and singleton-bool-0.1.5 --- .travis.yml | 80 ++++++++++++------------- cabal.haskell-ci | 2 + cabal.project | 7 ++- servant-conduit/servant-conduit.cabal | 2 +- servant-machines/servant-machines.cabal | 2 +- servant-pipes/servant-pipes.cabal | 2 +- servant-server/servant-server.cabal | 6 +- servant/servant.cabal | 4 +- 8 files changed, 55 insertions(+), 50 deletions(-) diff --git a/.travis.yml b/.travis.yml index a527c9cb..2088a62e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.3.20190521 +# version: 0.3.20190730 # language: c dist: xenial @@ -32,7 +32,7 @@ matrix: include: - compiler: ghc-8.8.1 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}} - env: GHCHEAD=true + env: HEADHACKAGE=true - compiler: ghc-8.6.5 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}} - compiler: ghc-8.4.4 @@ -78,11 +78,12 @@ install: - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - TEST=--enable-tests - BENCH=--enable-benchmarks - - GHCHEAD=${GHCHEAD-false} + - HEADHACKAGE=${HEADHACKAGE-false} - rm -f $CABALHOME/config - | echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config echo "remote-build-reporting: anonymous" >> $CABALHOME/config + echo "write-ghc-environment-files: always" >> $CABALHOME/config echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config echo "world-file: $CABALHOME/world" >> $CABALHOME/config @@ -96,15 +97,14 @@ install: echo "repository hackage.haskell.org" >> $CABALHOME/config echo " url: http://hackage.haskell.org/" >> $CABALHOME/config - | - if $GHCHEAD; then + if $HEADHACKAGE; then echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config - - echo "repository head.hackage" >> $CABALHOME/config - echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config + echo "repository head.hackage.ghc.haskell.org" >> $CABALHOME/config + echo " url: https://ghc.gitlab.haskell.org/head.hackage/" >> $CABALHOME/config echo " secure: True" >> $CABALHOME/config - echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config - echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config - echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config + echo " root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config + echo " 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config + echo " f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config echo " key-threshold: 3" >> $CABALHOME/config fi - | @@ -142,21 +142,21 @@ install: if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi - | - echo "constraints: foundation >=0.0.14" >> cabal.project - echo "constraints: memory <0.14.12 || >0.14.12" >> 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 - echo "allow-newer: servant-quickcheck:hspec" >> cabal.project - echo "allow-newer: servant-quickcheck:http-client" >> cabal.project - echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project - echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project - echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project - echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project - echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project - echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project - echo "optimization: False" >> cabal.project - echo "write-ghc-environment-files: always" >> cabal.project + echo "constraints: foundation >=0.0.14" >> cabal.project + echo "constraints: memory <0.14.12 || >0.14.12" >> 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 + echo "allow-newer: servant-quickcheck:hspec" >> cabal.project + echo "allow-newer: servant-quickcheck:http-client" >> cabal.project + echo "allow-newer: servant-quickcheck:warp" >> cabal.project + echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project + echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project + echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project + echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project + echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project + echo "allow-newer: openssl-streams-1.2.2.0:network" >> 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-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|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 - cat cabal.project.local || true @@ -227,21 +227,21 @@ script: if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi - | - echo "constraints: foundation >=0.0.14" >> cabal.project - echo "constraints: memory <0.14.12 || >0.14.12" >> 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 - echo "allow-newer: servant-quickcheck:hspec" >> cabal.project - echo "allow-newer: servant-quickcheck:http-client" >> cabal.project - echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project - echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project - echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project - echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project - echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project - echo "allow-newer: openssl-streams-1.2.2.0:network" >> cabal.project - echo "optimization: False" >> cabal.project - echo "write-ghc-environment-files: always" >> cabal.project + echo "constraints: foundation >=0.0.14" >> cabal.project + echo "constraints: memory <0.14.12 || >0.14.12" >> 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 + echo "allow-newer: servant-quickcheck:hspec" >> cabal.project + echo "allow-newer: servant-quickcheck:http-client" >> cabal.project + echo "allow-newer: servant-quickcheck:warp" >> cabal.project + echo "allow-newer: vault-0.3.1.2:hashable" >> cabal.project + echo "allow-newer: psqueues-0.2.7.1:hashable" >> cabal.project + echo "allow-newer: sqlite-simple-0.4.16.0:semigroups" >> cabal.project + echo "allow-newer: direct-sqlite-2.3.24:semigroups" >> cabal.project + echo "allow-newer: io-streams-1.5.1.0:network" >> cabal.project + echo "allow-newer: openssl-streams-1.2.2.0:network" >> 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-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|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 - cat cabal.project.local || true diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 8b84b642..9f6d4bf0 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -20,3 +20,5 @@ constraint-set http-media-0.8 constraint-set http-media-0.7 constraints: http-media ==0.7.* + +head-hackage: >= 8.8 diff --git a/cabal.project b/cabal.project index 0a81685c..5523c55f 100644 --- a/cabal.project +++ b/cabal.project @@ -48,9 +48,12 @@ allow-newer: -- servant-quickcheck allow-newer: - servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server, + servant-quickcheck:servant, + servant-quickcheck:servant-client, + servant-quickcheck:servant-server, servant-quickcheck:hspec, - servant-quickcheck:http-client + servant-quickcheck:http-client, + servant-quickcheck:warp -- constraints: semigroups ^>=0.19 -- constraints: hashable ^>=1.3 diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal index ff8eec5f..f43109a4 100644 --- a/servant-conduit/servant-conduit.cabal +++ b/servant-conduit/servant-conduit.cabal @@ -62,6 +62,6 @@ test-suite example , 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 + , warp >=3.2.25 && <3.4 , http-client default-language: Haskell2010 diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal index c6c5a185..f08cf295 100644 --- a/servant-machines/servant-machines.cabal +++ b/servant-machines/servant-machines.cabal @@ -59,6 +59,6 @@ test-suite example , 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 + , warp >=3.2.25 && <3.4 , http-client default-language: Haskell2010 diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal index a674de82..9956a7fb 100644 --- a/servant-pipes/servant-pipes.cabal +++ b/servant-pipes/servant-pipes.cabal @@ -63,6 +63,6 @@ test-suite example , 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 + , warp >=3.2.25 && <3.4 , http-client default-language: Haskell2010 diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal index e999d308..60e160cb 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.16.1 +version: 0.16.2 synopsis: A family of combinators for defining webservices APIs and serving them category: Servant, Web @@ -80,7 +80,7 @@ library -- Servant dependencies -- strict dependency as we re-export 'servant' things. build-depends: - servant >= 0.16.1 && < 0.16.2 + servant >= 0.16.2 && < 0.16.3 , http-api-data >= 0.4.1 && < 0.4.2 -- Other dependencies: Lower bound around what is in the latest Stackage LTS. @@ -121,7 +121,7 @@ executable greet build-depends: aeson >= 1.4.1.0 && < 1.5 - , warp >= 3.2.25 && < 3.3 + , warp >= 3.2.25 && < 3.4 test-suite spec type: exitcode-stdio-1.0 diff --git a/servant/servant.cabal b/servant/servant.cabal index cf887858..3eb32ef5 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: servant -version: 0.16.1 +version: 0.16.2 synopsis: A family of combinators for defining webservices APIs category: Servant, Web @@ -100,7 +100,7 @@ library -- i.e. re-export, or allow using without direct dependency build-depends: http-api-data >= 0.4.1 && < 0.4.2 - , singleton-bool >= 0.1.4 && < 0.1.5 + , singleton-bool >= 0.1.5 && < 0.1.6 -- 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.