17e3eb1 · typeable/servant

.github/workflows/master.yml+1

compare with master

unifiedsplit

@@ -19,6 +19,7 @@ jobs:

19 - "8.8.4"

20 - "8.10.7"

21 - "9.0.2"

22+ - "9.2.2"

22

23

23 steps:

24 steps:

24 - uses: actions/checkout@v2

25 - uses: actions/checkout@v2

cabal.project+3

@@ -55,3 +55,6 @@ optimization: False

55-- https://github.com/chordify/haskell-servant-pagination/pull/12

56allow-newer: servant-pagination-2.2.2:servant

57allow-newer: servant-pagination-2.2.2:servant-server

58+

59+allow-newer: servant-multipart:bytestring

60+allow-newer: servant-multipart-api:bytestring

doc/cookbook/curl-mock/curl-mock.cabal+2

@@ -11,6 +11,8 @@ build-type: Simple

11tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7

12

13executable cookbock-curl-mock

14+ if impl(ghc >= 9.2)

15+ buildable: False

14 main-is: CurlMock.lhs

16 main-is: CurlMock.lhs

15 build-depends: base == 4.*

17 build-depends: base == 4.*

16 , aeson

18 , aeson

doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal+2

@@ -14,6 +14,8 @@ build-type: Simple

14tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7

15

16executable cookbook-hoist-server-with-context

17+ if impl(ghc >= 9.2)

18+ buildable: False

17 main-is: HoistServerWithContext.lhs

19 main-is: HoistServerWithContext.lhs

18 build-depends: base == 4.*

20 build-depends: base == 4.*

19 , base-compat

21 , base-compat

doc/cookbook/https/https.cabal+2

@@ -11,6 +11,8 @@ build-type: Simple

11tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7

12

13executable cookbook-https

14+ if impl(ghc >= 9.2)

15+ buildable: False

14 main-is: Https.lhs

16 main-is: Https.lhs

15 build-depends: base == 4.*

17 build-depends: base == 4.*

16 , servant

18 , servant

doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal+2

@@ -14,6 +14,8 @@ build-type: Simple

14tested-with: GHC==8.6.5, GHC==8.8.3, GHC ==8.10.7

15

16executable cookbook-jwt-and-basic-auth

17+ if impl(ghc >= 9.2)

18+ buildable: False

17 main-is: JWTAndBasicAuth.lhs

19 main-is: JWTAndBasicAuth.lhs

18 build-depends: base == 4.*

20 build-depends: base == 4.*

19 , text >= 1.2

21 , text >= 1.2

doc/tutorial/tutorial.cabal+1−1

@@ -64,7 +64,7 @@ library

64 , blaze-markup >= 0.8.0.0 && < 0.9

65 , cookie >= 0.4.3 && < 0.5

66 , js-jquery >= 3.3.1 && < 3.4

67− , lucid >= 2.9.11 && < 2.10

67+ , lucid >= 2.9.11 && < 2.12

68 , random >= 1.1 && < 1.3

69 , servant-js >= 0.9 && < 0.10

70 , time >= 1.6.0.1 && < 1.13

servant-auth/servant-auth-client/servant-auth-client.cabal+4

@@ -26,6 +26,8 @@ source-repository head

26 location: https://github.com/haskell-servant/servant

27

28library

29+ if impl(ghc >= 9.2)

30+ buildable: False

29 hs-source-dirs:

31 hs-source-dirs:

30 src

32 src

31 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

33 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

@@ -44,6 +46,8 @@ library

44 default-language: Haskell2010

46 default-language: Haskell2010

45

47

46test-suite spec

48test-suite spec

49+ if impl(ghc >= 9.2)

50+ buildable: False

47 type: exitcode-stdio-1.0

51 type: exitcode-stdio-1.0

48 main-is: Spec.hs

52 main-is: Spec.hs

49 hs-source-dirs:

53 hs-source-dirs:

servant-auth/servant-auth-docs/servant-auth-docs.cabal+6

@@ -30,6 +30,8 @@ source-repository head

30 location: https://github.com/haskell-servant/servant

31

32library

33+ if impl(ghc >= 9.2)

34+ buildable: False

33 hs-source-dirs:

35 hs-source-dirs:

34 src

36 src

35 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

37 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

@@ -45,6 +47,8 @@ library

45 default-language: Haskell2010

47 default-language: Haskell2010

46

48

47test-suite doctests

49test-suite doctests

50+ if impl(ghc >= 9.2)

51+ buildable: False

48 type: exitcode-stdio-1.0

52 type: exitcode-stdio-1.0

49 main-is: doctests.hs

53 main-is: doctests.hs

50 build-depends:

54 build-depends:

@@ -58,6 +62,8 @@ test-suite doctests

58 default-language: Haskell2010

62 default-language: Haskell2010

59

63

60test-suite spec

64test-suite spec

65+ if impl(ghc >= 9.2)

66+ buildable: False

61 type: exitcode-stdio-1.0

67 type: exitcode-stdio-1.0

62 main-is: Spec.hs

68 main-is: Spec.hs

63 hs-source-dirs:

69 hs-source-dirs:

servant-auth/servant-auth-server/servant-auth-server.cabal+6

@@ -26,6 +26,8 @@ source-repository head

26 location: https://github.com/haskell-servant/servant

27

28library

29+ if impl(ghc >= 9.2)

30+ buildable: False

29 hs-source-dirs:

31 hs-source-dirs:

30 src

32 src

31 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

33 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

@@ -78,6 +80,8 @@ library

78 default-language: Haskell2010

80 default-language: Haskell2010

79

81

80test-suite readme

82test-suite readme

83+ if impl(ghc >= 9.2)

84+ buildable: False

81 type: exitcode-stdio-1.0

85 type: exitcode-stdio-1.0

82 main-is: README.lhs

86 main-is: README.lhs

83 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

87 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

@@ -96,6 +100,8 @@ test-suite readme

96 buildable: False

100 buildable: False

97

101

98test-suite spec

102test-suite spec

103+ if impl(ghc >= 9.2)

104+ buildable: False

99 type: exitcode-stdio-1.0

105 type: exitcode-stdio-1.0

100 main-is: Spec.hs

106 main-is: Spec.hs

101 hs-source-dirs:

107 hs-source-dirs:

servant-auth/servant-auth/servant-auth.cabal+2

@@ -28,6 +28,8 @@ source-repository head

28 location: https://github.com/haskell-servant/servant

29

30library

31+ if impl(ghc >= 9.2)

32+ buildable: False

31 hs-source-dirs:

33 hs-source-dirs:

32 src

34 src

33 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

35 default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators

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

@@ -50,14 +50,14 @@ library

50 --

51 -- note: mtl lower bound is so low because of GHC-7.8

52 build-depends:

53− base >= 4.9 && < 4.16

53+ base >= 4.9 && < 4.17

54 , bytestring >= 0.10.8.1 && < 0.12

55 , constraints >= 0.2 && < 0.14

56 , containers >= 0.5.7.1 && < 0.7

57 , deepseq >= 1.4.2.0 && < 1.5

58 , text >= 1.2.3.0 && < 2.1

59 , transformers >= 0.5.2.0 && < 0.6

60− , template-haskell >= 2.11.1.0 && < 2.18

60+ , template-haskell >= 2.11.1.0 && < 2.19

61

62 if !impl(ghc >= 8.2)

63 build-depends:

@@ -71,7 +71,7 @@ library

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

72 build-depends:

73 aeson >= 1.4.1.0 && < 3

74− , base-compat >= 0.10.5 && < 0.12

74+ , base-compat >= 0.10.5 && < 0.13

75 , base64-bytestring >= 1.0.0.1 && < 1.3

76 , exceptions >= 0.10.0 && < 0.11

77 , free >= 5.1 && < 5.2

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

@@ -41,14 +41,14 @@ library

41 -- Bundled with GHC: Lower bound to not force re-installs

42 -- text and mtl are bundled starting with GHC-8.4

43 build-depends:

44− base >= 4.9 && < 4.16

44+ base >= 4.9 && < 4.17

45 , bytestring >= 0.10.8.1 && < 0.12

46 , containers >= 0.5.7.1 && < 0.7

47 , deepseq >= 1.4.2.0 && < 1.5

48 , mtl >= 2.2.2 && < 2.3

49 , stm >= 2.4.5.1 && < 2.6

50 , text >= 1.2.3.0 && < 2.1

51− , time >= 1.6.0.1 && < 1.10

51+ , time >= 1.6.0.1 && < 1.12

52 , transformers >= 0.5.2.0 && < 0.6

53

54 if !impl(ghc >= 8.2)

@@ -64,7 +64,7 @@ library

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.

66 build-depends:

67− base-compat >= 0.10.5 && < 0.12

67+ base-compat >= 0.10.5 && < 0.13

68 , http-client >= 0.5.13.1 && < 0.8

69 , http-media >= 0.7.1.3 && < 0.9

70 , http-types >= 0.12.2 && < 0.13

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

@@ -41,7 +41,7 @@ library

41 --

42 -- note: mtl lower bound is so low because of GHC-7.8

43 build-depends:

44− base >= 4.9 && < 4.16

44+ base >= 4.9 && < 4.17

45 , bytestring >= 0.10.8.1 && < 0.12

46 , text >= 1.2.3.0 && < 2.1

47

@@ -54,7 +54,7 @@ library

54 build-depends:

55 aeson >= 1.4.1.0 && < 3

56 , aeson-pretty >= 0.8.5 && < 0.9

57− , base-compat >= 0.10.5 && < 0.12

57+ , base-compat >= 0.10.5 && < 0.13

58 , case-insensitive >= 1.2.0.11 && < 1.3

59 , hashable >= 1.2.7.0 && < 1.5

60 , http-media >= 0.7.1.3 && < 0.9

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

@@ -41,7 +41,7 @@ library

41 --

42 -- note: mtl lower bound is so low because of GHC-7.8

43 build-depends:

44− base >= 4.9 && < 4.16

44+ base >= 4.9 && < 4.17

45 , text >= 1.2.3.0 && < 2.1

46

47 -- Servant dependencies

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

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

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

53 build-depends:

54− base-compat >= 0.10.5 && < 0.12

54+ base-compat >= 0.10.5 && < 0.13

55 , lens >= 4.17 && < 5.2

56 , http-types >= 0.12.2 && < 0.13

57

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

@@ -38,13 +38,13 @@ library

38 -- Bundled with GHC: Lower bound to not force re-installs

39 -- text and mtl are bundled starting with GHC-8.4

40 build-depends:

41− base >= 4.9 && < 4.16

41+ base >= 4.9 && < 4.17

42 , bytestring >= 0.10.8.1 && < 0.12

43 , containers >= 0.5.7.1 && < 0.7

44 , deepseq >= 1.4.2.0 && < 1.5

45 , mtl >= 2.2.2 && < 2.3

46 , text >= 1.2.3.0 && < 2.1

47− , time >= 1.6.0.1 && < 1.10

47+ , time >= 1.6.0.1 && < 1.12

48 , transformers >= 0.5.2.0 && < 0.6

49

50 if !impl(ghc >= 8.2)

@@ -60,13 +60,13 @@ library

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

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

62 build-depends:

63− base-compat >= 0.10.5 && < 0.12

63+ base-compat >= 0.10.5 && < 0.13

64 , case-insensitive

65 , http-streams >= 0.8.6.1 && < 0.9

66 , http-media >= 0.7.1.3 && < 0.9

67 , io-streams >= 1.5.0.1 && < 1.6

68 , http-types >= 0.12.2 && < 0.13

69− , http-common >= 0.8.2.0 && < 0.8.3

69+ , http-common >= 0.8.2.0 && < 0.9

70 , exceptions >= 0.10.0 && < 0.11

71 , kan-extensions >= 5.2 && < 5.3

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

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

@@ -60,7 +60,7 @@ library

60 -- Bundled with GHC: Lower bound to not force re-installs

61 -- text and mtl are bundled starting with GHC-8.4

62 build-depends:

63− base >= 4.9 && < 4.16

63+ base >= 4.9 && < 4.17

64 , bytestring >= 0.10.8.1 && < 0.12

65 , constraints >= 0.2 && < 0.14

66 , containers >= 0.5.7.1 && < 0.7

@@ -78,7 +78,7 @@ library

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

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

80 build-depends:

81− base-compat >= 0.10.5 && < 0.12

81+ base-compat >= 0.10.5 && < 0.13

82 , base64-bytestring >= 1.0.0.1 && < 1.3

83 , exceptions >= 0.10.0 && < 0.11

84 , http-media >= 0.7.1.3 && < 0.9

servant-swagger/servant-swagger.cabal+3−3

@@ -50,7 +50,7 @@ source-repository head

50custom-setup

51 setup-depends:

52 base >=4.9 && <5,

53− Cabal >= 1.24 && < 3.5,

53+ Cabal >= 1.24,

54 cabal-doctest >=1.0.6 && <1.1

55

56library

@@ -72,8 +72,8 @@ library

72 build-depends: aeson >=1.4.2.0 && <3

73 , aeson-pretty >=0.8.7 && <0.9

74 , base >=4.9.1.0 && <5

75− , base-compat >=0.10.5 && <0.12

75+ , base-compat >=0.10.5 && <0.13

76− , bytestring >=0.10.8.1 && <0.11

76+ , bytestring >=0.10.8.1 && <0.12

77 , http-media >=0.7.1.3 && <0.9

78 , insert-ordered-containers >=0.2.1.0 && <0.3

79 , lens >=4.17 && <6

servant/servant.cabal+2−2

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

80 --

81 -- note: mtl lower bound is so low because of GHC-7.8

82 build-depends:

83− base >= 4.9 && < 4.16

83+ base >= 4.9 && < 4.17

84 , bytestring >= 0.10.8.1 && < 0.12

85 , constraints >= 0.2

86 , mtl >= 2.2.2 && < 2.3

@@ -98,7 +98,7 @@ library

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

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

100 build-depends:

101− base-compat >= 0.10.5 && < 0.12

101+ base-compat >= 0.10.5 && < 0.13

102 , aeson >= 1.4.1.0 && < 3

103 , attoparsec >= 0.13.2.2 && < 0.15

104 , bifunctors >= 5.5.3 && < 5.6