58b4015 · typeable/servant

.travis.yml+18

compare with master

unifiedsplit

@@ -96,6 +96,15 @@ install:

96 - "echo 'constraints: foundation >=0.0.14' >> cabal.project"

97 - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"

98 - "echo 'allow-newer: servant-js:base' >> cabal.project"

99+ - "echo 'allow-newer: servant-pagination:servant' >> cabal.project"

100+ - "echo 'allow-newer: servant-pagination:servant-server' >> cabal.project"

101+ - "echo 'allow-newer: servant-multipart:servant' >> cabal.project"

102+ - "echo 'allow-newer: servant-multipart:servant-server' >> cabal.project"

103+ - "echo 'allow-newer: servant-auth-server:servant' >> cabal.project"

104+ - "echo 'allow-newer: servant-auth-server:servant-server' >> cabal.project"

105+ - "echo 'allow-newer: servant-auth-server:http-api-data' >> cabal.project"

106+ - "echo 'allow-newer: servant-js:servant' >> cabal.project"

107+ - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"

99 - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"

108 - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"

100 - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"

109 - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"

101 - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"

110 - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"

@@ -174,6 +183,15 @@ script:

174 - "echo 'constraints: foundation >=0.0.14' >> cabal.project"

183 - "echo 'constraints: foundation >=0.0.14' >> cabal.project"

175 - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"

184 - "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"

176 - "echo 'allow-newer: servant-js:base' >> cabal.project"

185 - "echo 'allow-newer: servant-js:base' >> cabal.project"

186+ - "echo 'allow-newer: servant-pagination:servant' >> cabal.project"

187+ - "echo 'allow-newer: servant-pagination:servant-server' >> cabal.project"

188+ - "echo 'allow-newer: servant-multipart:servant' >> cabal.project"

189+ - "echo 'allow-newer: servant-multipart:servant-server' >> cabal.project"

190+ - "echo 'allow-newer: servant-auth-server:servant' >> cabal.project"

191+ - "echo 'allow-newer: servant-auth-server:servant-server' >> cabal.project"

192+ - "echo 'allow-newer: servant-auth-server:http-api-data' >> cabal.project"

193+ - "echo 'allow-newer: servant-js:servant' >> cabal.project"

194+ - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"

177 - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"

195 - "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"

178 - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"

196 - "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"

179 - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"

197 - "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"

Makefile+10−1

@@ -1,10 +1,19 @@

1# With common maintenance tasks

2

3+HC ?= ghc-8.4.4

4+

3all :

5all :

4 @echo "Don't try to make all at once!"

6 @echo "Don't try to make all at once!"

5

7

8+really-all :

9+ $(MAKE) build-ghc

10+ $(MAKE) build-ghc HC=ghc-8.0.2

11+ $(MAKE) build-ghc HC=ghc-8.2.2

12+ $(MAKE) build-ghc HC=ghc-8.6.3

13+ $(MAKE) build-ghcjs

14+

6build-ghc :

15build-ghc :

7− cabal v2-build all

16+ cabal v2-build -w $(HC) all

8

17

9build-ghcjs :

18build-ghcjs :

10 cabal v2-build --builddir=dist-newstyle-ghcjs --project-file=cabal.ghcjs.project all

19 cabal v2-build --builddir=dist-newstyle-ghcjs --project-file=cabal.ghcjs.project all

cabal.project+4−4

@@ -44,10 +44,10 @@ constraints:

44 memory <0.14.12 || >0.14.12

45

46allow-newer:

47−-- servant-pagination:servant, servant-pagination:servant-server,

47+ servant-pagination:servant, servant-pagination:servant-server,

48−-- servant-multipart:servant, servant-multipart:servant-server,

48+ servant-multipart:servant, servant-multipart:servant-server,

49−-- servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,

49+ servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,

50−-- servant-js:servant, servant-js:servant-foreign,

50+ servant-js:servant, servant-js:servant-foreign

51

52-- servant-quickcheck

53allow-newer:

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

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

1cabal-version: >=1.10

2name: servant-client-core

3−version: 0.15

3+version: 0.16

4

5synopsis: Core functionality and class for client function generation for servant APIs

6category: Servant, Web

@@ -67,7 +67,7 @@ library

67

68 -- Servant dependencies

69 build-depends:

70− servant >= 0.15 && <0.16

70+ servant >= 0.16 && <0.17

71

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

73 -- Here can be exceptions if we really need features from the newer versions.

servant-client-ghcjs/servant-client-ghcjs.cabal+37−36

@@ -1,9 +1,10 @@

1−cabal-version: >=1.10

1+cabal-version: >=1.10

2−name: servant-client-ghcjs

2+name: servant-client-ghcjs

3−version: 0.14

3+version: 0.16

4+synopsis:

5+ Automatic derivation of querying functions for servant webservices for GHCJS

4

6

5−synopsis: Automatic derivation of querying functions for servant webservices for GHCJS

6−category: Servant, Web

7+category: Servant, Web

7description:

8description:

8 This library lets you automatically derive Haskell functions that

9 This library lets you automatically derive Haskell functions that

9 let you query each endpoint of a <http://hackage.haskell.org/package/servant servant> webservice.

10 let you query each endpoint of a <http://hackage.haskell.org/package/servant servant> webservice.

@@ -12,52 +13,52 @@ description:

12 .

13 .

13 <https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md CHANGELOG>

14 <https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md CHANGELOG>

14

15

15−homepage: http://haskell-servant.readthedocs.org/

16+homepage: http://haskell-servant.readthedocs.org/

16−bug-reports: http://github.com/haskell-servant/servant/issues

17+bug-reports: http://github.com/haskell-servant/servant/issues

17−license: BSD3

18+license: BSD3

18−license-file: LICENSE

19+license-file: LICENSE

19−author: Servant Contributors

20+author: Servant Contributors

20−maintainer: haskell-servant-maintainers@googlegroups.com

21+maintainer: haskell-servant-maintainers@googlegroups.com

22+copyright:

21−copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2018 Servant Contributors

23+ 2014-2016 Zalora South East Asia Pte Ltd, 2016-2018 Servant Contributors

22−build-type: Simple

23−tested-with:

24− GHC >= 7.8

25

24

25+build-type: Simple

26+tested-with: ghc >=7.8

26extra-source-files:

27extra-source-files:

27 CHANGELOG.md

28 CHANGELOG.md

28 README.md

29 README.md

29

30

30source-repository head

31source-repository head

31− type: git

32+ type: git

32 location: http://github.com/haskell-servant/servant.git

33 location: http://github.com/haskell-servant/servant.git

33

34

34library

35library

35 exposed-modules:

36 exposed-modules:

36 Servant.Client.Ghcjs

37 Servant.Client.Ghcjs

37 Servant.Client.Internal.XhrClient

38 Servant.Client.Internal.XhrClient

38− build-depends:

39− base >= 4.11 && < 4.12

40− , bytestring >= 0.10 && < 0.11

41− , case-insensitive >= 1.2.0.0 && < 1.3.0.0

42− , containers >= 0.5 && < 0.7

43− , exceptions >= 0.8 && < 0.11

44− , ghcjs-base >= 0.2.0.0 && < 0.3.0.0

45− , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0

46− , http-media >= 0.6.2 && < 0.8

47− , http-types >= 0.12 && < 0.13

48− , monad-control >= 1.0.0.4 && < 1.1

49− , mtl >= 2.2.2 && < 2.3

50− , semigroupoids >= 5.3 && < 5.4

51− , string-conversions >= 0.3 && < 0.5

52− , transformers >= 0.3 && < 0.6

53− , transformers-base >= 0.4.4 && < 0.5

54

39

40+ build-depends:

41+ base >=4.11 && <4.12

42+ , bytestring >=0.10 && <0.11

43+ , case-insensitive >=1.2.0.0 && <1.3.0.0

44+ , containers >=0.5 && <0.7

45+ , exceptions >=0.8 && <0.11

46+ , ghcjs-base >=0.2.0.0 && <0.3.0.0

47+ , ghcjs-prim >=0.1.0.0 && <0.2.0.0

48+ , http-media >=0.6.2 && <0.8

49+ , http-types >=0.12 && <0.13

50+ , monad-control >=1.0.0.4 && <1.1

51+ , mtl >=2.2.2 && <2.3

52+ , semigroupoids >=5.3 && <5.4

53+ , string-conversions >=0.3 && <0.5

54+ , transformers >=0.3 && <0.6

55+ , transformers-base >=0.4.4 && <0.5

55

56

56 -- strict, as we re-export stuff

57 -- strict, as we re-export stuff

57 build-depends:

58 build-depends:

58− servant == 0.15.*,

59+ servant >=0.16 && <0.17

59− servant-client-core == 0.15.*

60+ , servant-client-core >=0.16 && <0.16.1

60

61

61− hs-source-dirs: src

62+ hs-source-dirs: src

62 default-language: Haskell2010

63 default-language: Haskell2010

63− ghc-options: -Wall -Wno-redundant-constraints

64+ ghc-options: -Wall -Wno-redundant-constraints

servant-client/servant-client.cabal+5−6

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

1cabal-version: >=1.10

2name: servant-client

3−version: 0.15

3+version: 0.16

4−x-revision: 1

5

4

6synopsis: Automatic derivation of querying functions for servant

5synopsis: Automatic derivation of querying functions for servant

7category: Servant, Web

6category: Servant, Web

@@ -62,8 +61,8 @@ library

62 -- Servant dependencies.

61 -- Servant dependencies.

63 -- Strict dependency on `servant-client-core` as we re-export things.

62 -- Strict dependency on `servant-client-core` as we re-export things.

64 build-depends:

63 build-depends:

65− servant == 0.15.*

64+ servant == 0.16.*

66− , servant-client-core >= 0.15 && <0.15.1

65+ , servant-client-core >= 0.16 && <0.16.1

67

66

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

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

69 -- Here can be exceptions if we really need features from the newer versions.

68 -- Here can be exceptions if we really need features from the newer versions.

@@ -120,8 +119,8 @@ test-suite spec

120 , HUnit >= 1.6.0.0 && < 1.7

119 , HUnit >= 1.6.0.0 && < 1.7

121 , network >= 2.8.0.0 && < 3.1

120 , network >= 2.8.0.0 && < 3.1

122 , QuickCheck >= 2.12.6.1 && < 2.13

121 , QuickCheck >= 2.12.6.1 && < 2.13

123− , servant == 0.15.*

122+ , servant == 0.16.*

124− , servant-server == 0.15.*

123+ , servant-server == 0.16.*

125 , tdigest >= 0.2 && < 0.3

124 , tdigest >= 0.2 && < 0.3

126

125

127 build-tool-depends:

126 build-tool-depends:

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

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

1cabal-version: >=1.10

2name: servant-conduit

3version: 0.15

4+x-revision: 1

4

5

5synopsis: Servant Stream support for conduit.

6synopsis: Servant Stream support for conduit.

6category: Servant, Web, Enumerator

7category: Servant, Web, Enumerator

@@ -37,7 +38,7 @@ library

37 , conduit >=1.3.1 && <1.4

38 , conduit >=1.3.1 && <1.4

38 , mtl >=2.2.2 && <2.3

39 , mtl >=2.2.2 && <2.3

39 , resourcet >=1.2.2 && <1.3

40 , resourcet >=1.2.2 && <1.3

40− , servant >=0.15 && <0.16

41+ , servant >=0.15 && <0.17

41 , unliftio-core >=0.1.2.0 && <0.2

42 , unliftio-core >=0.1.2.0 && <0.2

42 hs-source-dirs: src

43 hs-source-dirs: src

43 default-language: Haskell2010

44 default-language: Haskell2010

@@ -58,8 +59,8 @@ test-suite example

58 , resourcet

59 , resourcet

59 , servant

60 , servant

60 , servant-conduit

61 , servant-conduit

61− , servant-server >=0.15 && <0.16

62+ , servant-server >=0.15 && <0.17

62− , servant-client >=0.15 && <0.16

63+ , servant-client >=0.15 && <0.17

63 , wai >=3.2.1.2 && <3.3

64 , wai >=3.2.1.2 && <3.3

64 , warp >=3.2.25 && <3.3

65 , warp >=3.2.25 && <3.3

65 , http-client

66 , http-client

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

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

1cabal-version: >=1.10

2name: servant-docs

3version: 0.11.3

4+x-revision: 1

4

5

5synopsis: generate API docs for your servant webservice

6synopsis: generate API docs for your servant webservice

6category: Servant, Web

7category: Servant, Web

@@ -51,7 +52,7 @@ library

51

52

52 -- Servant dependencies

53 -- Servant dependencies

53 build-depends:

54 build-depends:

54− servant == 0.15.*

55+ servant >= 0.15 && <0.17

55

56

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

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

57 -- Here can be exceptions if we really need features from the newer versions.

58 -- Here can be exceptions if we really need features from the newer versions.

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

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

1cabal-version: >=1.10

2name: servant-foreign

3version: 0.15

4+x-revision: 1

4

5

5synopsis: Helpers for generating clients for servant APIs in any programming language

6synopsis: Helpers for generating clients for servant APIs in any programming language

6category: Servant, Web

7category: Servant, Web

@@ -50,7 +51,7 @@ library

50

51

51 -- Servant dependencies

52 -- Servant dependencies

52 build-depends:

53 build-depends:

53− servant == 0.15.*

54+ servant >=0.15 && <0.17

54

55

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

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

56 -- Here can be exceptions if we really need features from the newer versions.

57 -- Here can be exceptions if we really need features from the newer versions.

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

@@ -58,8 +58,8 @@ library

58 -- Servant dependencies.

59 -- Strict dependency on `servant-client-core` as we re-export things.

60 build-depends:

61− servant == 0.15.*

61+ servant == 0.16.*

62− , servant-client-core >= 0.15 && <0.15.1

62+ , servant-client-core >= 0.16 && <0.16.1

63

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

65 -- Here can be exceptions if we really need features from the newer versions.

@@ -120,8 +120,8 @@ test-suite spec

120 , HUnit >= 1.6.0.0 && < 1.7

121 , network >= 2.8.0.0 && < 3.1

122 , QuickCheck >= 2.12.6.1 && < 2.13

123− , servant == 0.15.*

123+ , servant == 0.16.*

124− , servant-server == 0.15.*

124+ , servant-server == 0.16.*

125 , tdigest >= 0.2 && < 0.3

126

127 build-tool-depends:

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

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

1cabal-version: >=1.10

2name: servant-machines

3version: 0.15

4+x-revision: 1

4

5

5synopsis: Servant Stream support for machines

6synopsis: Servant Stream support for machines

6category: Servant, Web, Enumerator

7category: Servant, Web, Enumerator

@@ -36,7 +37,7 @@ library

36 , bytestring >=0.10.8.1 && <0.11

37 , bytestring >=0.10.8.1 && <0.11

37 , machines >=0.6.4 && <0.7

38 , machines >=0.6.4 && <0.7

38 , mtl >=2.2.2 && <2.3

39 , mtl >=2.2.2 && <2.3

39− , servant >=0.15 && <0.16

40+ , servant >=0.15 && <0.17

40 hs-source-dirs: src

41 hs-source-dirs: src

41 default-language: Haskell2010

42 default-language: Haskell2010

42 ghc-options: -Wall

43 ghc-options: -Wall

@@ -55,8 +56,8 @@ test-suite example

55 , servant

56 , servant

56 , machines

57 , machines

57 , servant-machines

58 , servant-machines

58− , servant-server >=0.15 && <0.16

59+ , servant-server >=0.15 && <0.17

59− , servant-client >=0.15 && <0.16

60+ , servant-client >=0.15 && <0.17

60 , wai >=3.2.1.2 && <3.3

61 , wai >=3.2.1.2 && <3.3

61 , warp >=3.2.25 && <3.3

62 , warp >=3.2.25 && <3.3

62 , http-client

63 , http-client

servant-pipes/servant-pipes.cabal+5−4

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

1+cabal-version: >=1.10

1name: servant-pipes

2name: servant-pipes

2version: 0.15

3version: 0.15

3−cabal-version: >=1.10

4+x-revision: 1

4

5

5synopsis: Servant Stream support for pipes

6synopsis: Servant Stream support for pipes

6category: Servant, Web, Pipes

7category: Servant, Web, Pipes

@@ -38,7 +39,7 @@ library

38 , pipes-safe >=2.3.1 && <2.4

39 , pipes-safe >=2.3.1 && <2.4

39 , mtl >=2.2.2 && <2.3

40 , mtl >=2.2.2 && <2.3

40 , monad-control >=1.0.2.3 && <1.1

41 , monad-control >=1.0.2.3 && <1.1

41− , servant >=0.15 && <0.16

42+ , servant >=0.15 && <0.17

42 hs-source-dirs: src

43 hs-source-dirs: src

43 default-language: Haskell2010

44 default-language: Haskell2010

44 ghc-options: -Wall

45 ghc-options: -Wall

@@ -59,8 +60,8 @@ test-suite example

59 , pipes-safe

60 , pipes-safe

60 , servant-pipes

61 , servant-pipes

61 , pipes-bytestring >=2.1.6 && <2.2

62 , pipes-bytestring >=2.1.6 && <2.2

62− , servant-server >=0.15 && <0.16

63+ , servant-server >=0.15 && <0.17

63− , servant-client >=0.15 && <0.16

64+ , servant-client >=0.15 && <0.17

64 , wai >=3.2.1.2 && <3.3

65 , wai >=3.2.1.2 && <3.3

65 , warp >=3.2.25 && <3.3

66 , warp >=3.2.25 && <3.3

66 , http-client

67 , http-client

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

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

1cabal-version: >=1.10

2name: servant-server

3−version: 0.15

3+version: 0.16

4

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

6category: Servant, Web

@@ -76,7 +76,7 @@ library

76 -- Servant dependencies

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

78 build-depends:

79− servant >= 0.15 && < 0.15.1

79+ servant >= 0.16 && < 0.17.1

80 , http-api-data >= 0.4 && < 0.4.1

81

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

servant/servant.cabal+1−1

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

1cabal-version: >=1.10

2name: servant

3−version: 0.15

3+version: 0.16

4

5synopsis: A family of combinators for defining webservices APIs

6category: Servant, Web