6111117 · typeable/servant

.github/workflows/master.yml+2−1

compare with master

unifiedsplit

@@ -13,7 +13,7 @@ jobs:

13 strategy:

14 matrix:

15 os: [ubuntu-latest]

16− cabal: ["3.2"]

16+ cabal: ["3.4"]

17 ghc:

18 - "8.0.2"

19 - "8.2.2"

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

21 - "8.6.5"

22 - "8.8.4"

23 - "8.10.2"

24+ - "9.0.1"

24

25

25 steps:

26 steps:

26 - uses: actions/checkout@v2

27 - uses: actions/checkout@v2

cabal.project+8−8

@@ -3,8 +3,7 @@ packages:

3 servant-client/

4 servant-client-core/

5 servant-http-streams/

6−-- Tests failing with Cabal (TODO: investigate)

7−-- servant-docs/

6+ servant-docs/

8 servant-foreign/

7 servant-foreign/

9 servant-server/

8 servant-server/

10 doc/tutorial/

9 doc/tutorial/

@@ -26,7 +25,8 @@ packages:

26 doc/cookbook/custom-errors

25 doc/cookbook/custom-errors

27 doc/cookbook/basic-streaming

26 doc/cookbook/basic-streaming

28 doc/cookbook/db-postgres-pool

27 doc/cookbook/db-postgres-pool

29− doc/cookbook/db-sqlite-simple

28+ --doc/cookbook/db-sqlite-simple

29+ -- ^ BROKEN blaze-textual

30 doc/cookbook/file-upload

31 doc/cookbook/generic

32 doc/cookbook/hoist-server-with-context

@@ -36,7 +36,8 @@ packages:

36 -- doc/cookbook/sentry

37 -- Commented out because servant-quickcheck currently doesn't build.

38 -- doc/cookbook/testing

39− doc/cookbook/uverb

39+ --doc/cookbook/uverb

40+ -- ^ BROKEN servant-swagger -> optics-th

40 doc/cookbook/structuring-apis

41 doc/cookbook/structuring-apis

41 doc/cookbook/using-custom-monad

42 doc/cookbook/using-custom-monad

42 doc/cookbook/using-free-client

43 doc/cookbook/using-free-client

@@ -64,8 +65,7 @@ write-ghc-environment-files: always

64allow-newer: servant-pagination-2.2.2:servant

65allow-newer: servant-pagination-2.2.2:servant

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

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

66

67

67−-- https://github.com/haskell-servant/servant-multipart/pull/41

68−allow-newer: servant-multipart:servant

69−allow-newer: servant-multipart:servant-server

70−allow-newer: servant-multipart:servant-client-core

71allow-newer: servant-js:servant

68allow-newer: servant-js:servant

69+

70+-- ghc 9

71+allow-newer: tdigest:base

doc/tutorial/tutorial.cabal+2−2

@@ -68,9 +68,9 @@ library

68 , cookie >= 0.4.3 && < 0.5

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

70 , lucid >= 2.9.11 && < 2.10

71− , random >= 1.1 && < 1.2

71+ , random >= 1.1 && < 1.3

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

73− , time >= 1.6.0.1 && < 1.10

73+ , time >= 1.6.0.1 && < 1.13

74

75 -- For legacy tools, we need to specify build-depends too

76 build-depends: markdown-unlit >= 0.5.0 && <0.6

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

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

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

17copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

18build-type: Simple

19−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

19+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

20 , GHCJS == 8.4

21

22extra-source-files:

@@ -50,13 +50,13 @@ library

50 --

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

52 build-depends:

53− base >= 4.9 && < 4.15

53+ base >= 4.9 && < 4.16

54 , bytestring >= 0.10.8.1 && < 0.12

55 , containers >= 0.5.7.1 && < 0.7

56 , deepseq >= 1.4.2.0 && < 1.5

57 , text >= 1.2.3.0 && < 1.3

58 , transformers >= 0.5.2.0 && < 0.6

59− , template-haskell >= 2.11.1.0 && < 2.17

59+ , template-haskell >= 2.11.1.0 && < 2.18

60

61 if !impl(ghc >= 8.2)

62 build-depends:

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

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

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

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

22build-type: Simple

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

23+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

24

25extra-source-files:

26 CHANGELOG.md

@@ -40,7 +40,7 @@ library

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

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

42 build-depends:

43− base >= 4.9 && < 4.15

43+ base >= 4.9 && < 4.16

44 , bytestring >= 0.10.8.1 && < 0.12

45 , containers >= 0.5.7.1 && < 0.7

46 , deepseq >= 1.4.2.0 && < 1.5

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

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

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

20copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

21build-type: Simple

22−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

22+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

23

24extra-source-files:

25 CHANGELOG.md

@@ -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.15

44+ base >= 4.9 && < 4.16

45 , bytestring >= 0.10.8.1 && < 0.12

46 , text >= 1.2.3.0 && < 1.3

47

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

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

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

22copyright: 2015-2019 Servant Contributors

23build-type: Simple

24−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

24+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

25

26extra-source-files:

27 CHANGELOG.md

@@ -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.15

44+ base >= 4.9 && < 4.16

45 , text >= 1.2.3.0 && < 1.3

46

47 -- Servant dependencies

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

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

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

21copyright: 2019 Servant Contributors

22build-type: Simple

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

23+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

24

25extra-source-files:

26 CHANGELOG.md

@@ -38,7 +38,7 @@ 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.15

41+ base >= 4.9 && < 4.16

42 , bytestring >= 0.10.8.1 && < 0.12

43 , containers >= 0.5.7.1 && < 0.7

44 , deepseq >= 1.4.2.0 && < 1.5

servant-pipes/example/Main.hs+1−1

@@ -64,7 +64,7 @@ server = fast :<|> slow :<|> readme :<|> proxy

64

65 readme = liftIO $ do

66 putStrLn "/readme"

67− return $ P.withFile "README.md" ReadMode PBS.fromHandle

67+ return $ P.withFile "README.md" ReadMode $ \h -> PBS.fromHandle h

68

69 proxy c = liftIO $ do

70 putStrLn "/proxy"

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

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

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

24copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

25build-type: Simple

26−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

26+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

27

28extra-source-files:

29 CHANGELOG.md

@@ -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.15

63+ base >= 4.9 && < 4.16

64 , bytestring >= 0.10.8.1 && < 0.12

65 , containers >= 0.5.7.1 && < 0.7

66 , mtl >= 2.2.2 && < 2.3

@@ -72,7 +72,7 @@ library

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

73 build-depends:

74 servant >= 0.18.2 && < 0.18.3

75− , http-api-data >= 0.4.1 && < 0.4.3

75+ , http-api-data >= 0.4.1 && < 0.4.4

76

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

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

servant/servant.cabal+4−4

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

1cabal-version: >=1.10

2name: servant

3−version: 0.18.2

3+version: 0.18.2.1

4

5synopsis: A family of combinators for defining webservices APIs

6category: Servant, Web

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

20copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors

21build-type: Simple

22

23−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2

23+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1

24 , GHCJS == 8.4

25

26extra-source-files:

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

78 --

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

80 build-depends:

81− base >= 4.9 && < 4.15

81+ base >= 4.9 && < 4.16

82 , bytestring >= 0.10.8.1 && < 0.12

83 , mtl >= 2.2.2 && < 2.3

84 , sop-core >= 0.4.0.0 && < 0.6

@@ -89,7 +89,7 @@ library

89 -- We depend (heavily) on the API of these packages:

90 -- i.e. re-export, or allow using without direct dependency

91 build-depends:

92− http-api-data >= 0.4.1 && < 0.4.3

92+ http-api-data >= 0.4.1 && < 0.4.4

93 , singleton-bool >= 0.1.4 && < 0.1.7

94

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

servant/src/Servant/API/UVerb/Union.hs+1−1

@@ -144,4 +144,4 @@ _testNubbed :: ( ( Nubbed '[Bool, Int, Int] ~ 'False

144 , Nubbed '[Int, Bool] ~ 'True

145 )

146 => a) -> a

147−_testNubbed = id

147+_testNubbed a = a

servant/test/Servant/API/StreamSpec.hs+1−1

@@ -90,7 +90,7 @@ runRenderFrames :: (SourceT Identity a -> SourceT Identity LBS.ByteString) -> [a

90runRenderFrames f = fmap mconcat . runExcept . runSourceT . f . source

91

92runUnrenderFrames :: (SourceT Identity b -> SourceT Identity a) -> [b] -> [Either String a]

93−runUnrenderFrames f = go . Effect . flip unSourceT return . f . source where

93+runUnrenderFrames f = go . Effect . (\x -> unSourceT x return) . f . source where

94 go :: StepT Identity a -> [Either String a]

95 go Stop = []

96 go (Error err) = [Left err]