9142c73 · typeable/servant

git.iko.soy/typeable/servant

Bump versions

commit9142c7375dbf95bdca24eafb70b09eb5fedb1acd authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 28 May 2019, 17:14 (7 years ago) parent8e2be01

28 files changed+59−60

compare with master

unifiedsplit

.travis.yml+28−28

@@ -30,8 +30,8 @@ before_cache:

3030 - rm -rfv $CABALHOME/packages/head.hackage

3131matrix:

3232 include:

33− - compiler: ghc-8.6.4

34− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}

33+ - compiler: ghc-8.6.5

34+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}

3535 - compiler: ghc-8.4.4

3636 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}

3737 - compiler: ghc-8.2.2

@@ -111,19 +111,19 @@ install:

111111 echo 'packages: "servant-machines"' >> cabal.project

112112 echo 'packages: "servant-conduit"' >> cabal.project

113113 echo 'packages: "servant-pipes"' >> cabal.project

114− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/basic-auth"' >> cabal.project ; fi

115− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/curl-mock"' >> cabal.project ; fi

116− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/basic-streaming"' >> cabal.project ; fi

117− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/db-postgres-pool"' >> cabal.project ; fi

118− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/db-sqlite-simple"' >> cabal.project ; fi

119− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/file-upload"' >> cabal.project ; fi

120− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/generic"' >> cabal.project ; fi

121− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/https"' >> cabal.project ; fi

122− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/pagination"' >> cabal.project ; fi

123− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/testing"' >> cabal.project ; fi

124− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi

125− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi

126− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi

114+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/basic-auth"' >> cabal.project ; fi

115+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/curl-mock"' >> cabal.project ; fi

116+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/basic-streaming"' >> cabal.project ; fi

117+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/db-postgres-pool"' >> cabal.project ; fi

118+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/db-sqlite-simple"' >> cabal.project ; fi

119+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/file-upload"' >> cabal.project ; fi

120+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/generic"' >> cabal.project ; fi

121+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/https"' >> cabal.project ; fi

122+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/pagination"' >> cabal.project ; fi

123+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/testing"' >> cabal.project ; fi

124+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi

125+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi

126+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi

127127 - |

128128 echo "constraints: foundation >=0.0.14" >> cabal.project

129129 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

@@ -196,19 +196,19 @@ script:

196196 echo 'packages: "servant-machines-*/*.cabal"' >> cabal.project

197197 echo 'packages: "servant-conduit-*/*.cabal"' >> cabal.project

198198 echo 'packages: "servant-pipes-*/*.cabal"' >> cabal.project

199− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-basic-auth-*/*.cabal"' >> cabal.project ; fi

200− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-curl-mock-*/*.cabal"' >> cabal.project ; fi

201− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-basic-streaming-*/*.cabal"' >> cabal.project ; fi

202− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-db-postgres-pool-*/*.cabal"' >> cabal.project ; fi

203− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-db-sqlite-simple-*/*.cabal"' >> cabal.project ; fi

204− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-file-upload-*/*.cabal"' >> cabal.project ; fi

205− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-generic-*/*.cabal"' >> cabal.project ; fi

206− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-https-*/*.cabal"' >> cabal.project ; fi

207− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-pagination-*/*.cabal"' >> cabal.project ; fi

208− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-testing-*/*.cabal"' >> cabal.project ; fi

209− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi

210− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi

211− if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi

199+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-basic-auth-*/*.cabal"' >> cabal.project ; fi

200+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-curl-mock-*/*.cabal"' >> cabal.project ; fi

201+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-basic-streaming-*/*.cabal"' >> cabal.project ; fi

202+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-db-postgres-pool-*/*.cabal"' >> cabal.project ; fi

203+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-db-sqlite-simple-*/*.cabal"' >> cabal.project ; fi

204+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-file-upload-*/*.cabal"' >> cabal.project ; fi

205+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-generic-*/*.cabal"' >> cabal.project ; fi

206+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-https-*/*.cabal"' >> cabal.project ; fi

207+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-pagination-*/*.cabal"' >> cabal.project ; fi

208+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-testing-*/*.cabal"' >> cabal.project ; fi

209+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi

210+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi

211+ if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi

212212 - |

213213 echo "constraints: foundation >=0.0.14" >> cabal.project

214214 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project

doc/cookbook/basic-auth/basic-auth.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-basic-auth

1414 main-is: BasicAuth.lhs

doc/cookbook/basic-streaming/basic-streaming.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-basic-streaming

1414 main-is: Streaming.lhs

doc/cookbook/curl-mock/curl-mock.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbock-curl-mock

1414 main-is: CurlMock.lhs

doc/cookbook/db-postgres-pool/db-postgres-pool.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-db-postgres-pool

1414 main-is: PostgresPool.lhs

doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-db-sqlite-simple

1414 main-is: DBConnection.lhs

doc/cookbook/file-upload/file-upload.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-file-upload

1414 main-is: FileUpload.lhs

doc/cookbook/generic/generic.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-using-custom-monad

1414 main-is: Generic.lhs

doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+1−1

@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

1111category: Servant

1212build-type: Simple

1313cabal-version: >=1.10

14−tested-with: GHC==8.4.4, GHC==8.6.4

14+tested-with: GHC==8.4.4, GHC==8.6.5

1515

1616executable cookbook-hoist-server-with-context

1717 main-is: HoistServerWithContext.lhs

doc/cookbook/https/https.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-https

1414 main-is: Https.lhs

doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+1−1

@@ -11,7 +11,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

1111category: Servant

1212build-type: Simple

1313cabal-version: >=1.10

14−tested-with: GHC==8.4.4, GHC==8.6.4

14+tested-with: GHC==8.4.4, GHC==8.6.5

1515

1616executable cookbook-jwt-and-basic-auth

1717 main-is: JWTAndBasicAuth.lhs

doc/cookbook/pagination/pagination.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-pagination

1414 main-is: Pagination.lhs

doc/cookbook/sentry/sentry.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-sentry

1414 main-is: Sentry.lhs

doc/cookbook/structuring-apis/structuring-apis.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-structuring-apis

1414 main-is: StructuringApis.lhs

doc/cookbook/testing/testing.cabal+1−1

@@ -10,7 +10,7 @@ maintainer: haskell-servant-maintainers@googlegroups.com

1010category: Servant

1111build-type: Simple

1212cabal-version: >=1.10

13−tested-with: GHC==8.4.4, GHC==8.6.4

13+tested-with: GHC==8.4.4, GHC==8.6.5

1414

1515executable cookbook-testing

1616 main-is: Testing.lhs

doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-using-custom-monad

1414 main-is: UsingCustomMonad.lhs

doc/cookbook/using-free-client/using-free-client.cabal+1−1

@@ -8,7 +8,7 @@ author: Servant Contributors

88maintainer: haskell-servant-maintainers@googlegroups.com

99build-type: Simple

1010cabal-version: >=1.10

11−tested-with: GHC==8.4.4, GHC==8.6.4

11+tested-with: GHC==8.4.4, GHC==8.6.5

1212

1313executable cookbook-using-free-client

1414 main-is: UsingFreeClient.lhs

doc/tutorial/tutorial.cabal+1−1

@@ -16,7 +16,7 @@ tested-with:

1616 GHC==8.0.2

1717 GHC==8.2.2

1818 GHC==8.4.4

19− GHC==8.6.4

19+ GHC==8.6.5

2020extra-source-files:

2121 static/index.html

2222 static/ui.js

servant-client-core/servant-client-core.cabal+1−1

@@ -21,7 +21,7 @@ tested-with:

2121 GHC ==8.0.2

2222 || ==8.2.2

2323 || ==8.4.4

24− || ==8.6.4

24+ || ==8.6.5

2525

2626extra-source-files:

2727 CHANGELOG.md

servant-client/servant-client.cabal+1−1

@@ -25,7 +25,7 @@ tested-with:

2525 GHC ==8.0.2

2626 || ==8.2.2

2727 || ==8.4.4

28− || ==8.6.4

28+ || ==8.6.5

2929

3030extra-source-files:

3131 CHANGELOG.md

servant-conduit/servant-conduit.cabal+1−1

@@ -21,7 +21,7 @@ tested-with:

2121 GHC ==8.0.2

2222 || ==8.2.2

2323 || ==8.4.4

24− || ==8.6.4

24+ || ==8.6.5

2525

2626extra-source-files:

2727 CHANGELOG.md

servant-docs/servant-docs.cabal+1−1

@@ -24,7 +24,7 @@ tested-with:

2424 GHC ==8.0.2

2525 || ==8.2.2

2626 || ==8.4.4

27− || ==8.6.4

27+ || ==8.6.5

2828

2929extra-source-files:

3030 CHANGELOG.md

servant-foreign/servant-foreign.cabal+1−1

@@ -26,7 +26,7 @@ tested-with:

2626 GHC ==8.0.2

2727 || ==8.2.2

2828 || ==8.4.4

29− || ==8.6.4

29+ || ==8.6.5

3030

3131extra-source-files:

3232 CHANGELOG.md

servant-http-streams/servant-http-streams.cabal+1−1

@@ -25,7 +25,7 @@ tested-with:

2525 GHC ==8.0.2

2626 || ==8.2.2

2727 || ==8.4.4

28− || ==8.6.4

28+ || ==8.6.5

2929

3030extra-source-files:

3131 CHANGELOG.md

servant-machines/servant-machines.cabal+2−2

@@ -1,7 +1,7 @@

11cabal-version: >=1.10

22name: servant-machines

33version: 0.15

4−x-revision: 1

4+x-revision: 2

66synopsis: Servant Stream support for machines

77category: Servant, Web, Enumerator

@@ -21,7 +21,7 @@ tested-with:

2121 GHC ==8.0.2

2222 || ==8.2.2

2323 || ==8.4.4

24− || ==8.6.4

24+ || ==8.6.5

2525

2626extra-source-files:

2727 CHANGELOG.md

servant-pipes/servant-pipes.cabal+1−1

@@ -21,7 +21,7 @@ tested-with:

2121 GHC ==8.0.2

2222 || ==8.2.2

2323 || ==8.4.4

24− || ==8.6.4

24+ || ==8.6.5

2525

2626extra-source-files:

2727 CHANGELOG.md

servant-server/servant-server.cabal+3−4

@@ -1,7 +1,6 @@

11cabal-version: >=1.10

22name: servant-server

3−version: 0.16

4−x-revision: 1

3+version: 0.16.1

65synopsis: A family of combinators for defining webservices APIs and serving them

76category: Servant, Web

@@ -28,7 +27,7 @@ tested-with:

2827 GHC ==8.0.2

2928 || ==8.2.2

3029 || ==8.4.4

31− || ==8.6.4

30+ || ==8.6.5

3231

3332extra-source-files:

3433 CHANGELOG.md

@@ -80,7 +79,7 @@ library

8079 -- Servant dependencies

8180 -- strict dependency as we re-export 'servant' things.

8281 build-depends:

83− servant >= 0.16 && < 0.17.1

82+ servant >= 0.16.1 && < 0.16.2

8483 , http-api-data >= 0.4.1 && < 0.4.2

8584

8685 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.

servant/servant.cabal+2−2

@@ -1,6 +1,6 @@

11cabal-version: >=1.10

22name: servant

3−version: 0.16.0.1

3+version: 0.16.1

55synopsis: A family of combinators for defining webservices APIs

66category: Servant, Web

@@ -24,7 +24,7 @@ tested-with:

2424 GHC ==8.0.2

2525 || ==8.2.2

2626 || ==8.4.4

27− || ==8.6.4

27+ || ==8.6.5

2828

2929extra-source-files:

3030 CHANGELOG.md