ff26894 · typeable/servant

.travis.yml+3−3

@@ -71,7 +71,7 @@ install:

71 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

72 - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/basic-auth\" \"doc/cookbook/https\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/file-upload\"\\n' > cabal.project"

73 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"

74− - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"

74+ - "echo 'allow-newer: servant-js:servant-foreign, servant-auth-server:http-types, servant-multipart:lens' >> cabal.project"

75 - cat cabal.project

76 - if [ -f "servant/configure.ac" ]; then

77 (cd "servant" && autoreconf -i);

@@ -149,14 +149,14 @@ script:

149 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

150 - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-https-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-file-upload-*/*.cabal\\n' > cabal.project"

151 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"

152− - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"

152+ - "echo 'allow-newer: servant-js:servant-foreign, servant-auth-server:http-types, servant-multipart:lens' >> cabal.project"

153 - cat cabal.project

154 - echo -en 'travis_fold:end:unpack\\r'

155

156

157 - echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'

158 # build & run tests, build benchmarks

159− - cabal new-build -w ${HC} ${TEST} ${BENCH} all --max-backjumps=20000

159+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all

160 - echo -en 'travis_fold:end:build-everything\\r'

161 - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi

162

cabal.project+1−1

@@ -7,7 +7,7 @@ packages: servant/

7 doc/tutorial/

8 doc/cookbook/*/*.cabal

9

10−allow-newer: servant-js:servant-foreign

10+allow-newer: servant-js:servant-foreign, servant-auth-server:http-types, servant-multipart:lens

11

12constraints:

13 -- see https://github.com/haskell-infra/hackage-trustees/issues/119

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

@@ -21,7 +21,7 @@ executable cookbook-basic-auth

21 , servant-server

22 , warp >= 3.2

23 , wai >= 3.2

24− , http-types >= 0.10

24+ , http-types >= 0.12

25 , markdown-unlit >= 0.4

26 , http-client >= 0.5

27 default-language: Haskell2010

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

@@ -21,7 +21,7 @@ executable cookbook-db-postgres-pool

21 , servant-server

22 , warp >= 3.2

23 , wai >= 3.2

24− , http-types >= 0.10

24+ , http-types >= 0.12

25 , markdown-unlit >= 0.4

26 , http-client >= 0.5

27 , postgresql-simple >= 0.5

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

@@ -20,7 +20,7 @@ executable cookbook-db-sqlite-simple

20 , servant-server

21 , warp >= 3.2

22 , wai >= 3.2

23− , http-types >= 0.10

23+ , http-types >= 0.12

24 , markdown-unlit >= 0.4

25 , http-client >= 0.5

26 , sqlite-simple >= 0.4

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

@@ -29,7 +29,7 @@ executable cookbook-jwt-and-basic-auth

29 , servant-auth-server >= 0.3.1.0

30 , warp >= 3.2

31 , wai >= 3.2

32− , http-types >= 0.10

32+ , http-types >= 0.12

33 , markdown-unlit >= 0.4

34 , http-client >= 0.5

35 , bytestring >= 0.10.4

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

@@ -68,7 +68,7 @@ library

68 , generics-sop >= 0.3.1.0 && < 0.4

69 , http-api-data >= 0.3.7.1 && < 0.4

70 , http-media >= 0.7.1.1 && < 0.8

71− , http-types >= 0.9.1 && < 0.12

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

72 , network-uri >= 2.6.1.0 && < 2.7

73 , safe >= 0.3.15 && < 0.4

74

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

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

39 , ghcjs-base >= 0.2.0.0 && < 0.3.0.0

40 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0

41 , http-media >= 0.6.2 && < 0.8

42− , http-types >= 0.8.6 && < 0.12

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

43 , monad-control >= 1.0.0.4 && < 1.1

44 , mtl >= 2.1 && < 2.3

45 , semigroupoids >= 4.3 && < 5.3

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

@@ -62,7 +62,7 @@ library

62 , http-client >= 0.5.7.1 && < 0.6

63 , http-client-tls >= 0.3.5.1 && < 0.4

64 , http-media >= 0.7.1.1 && < 0.8

65− , http-types >= 0.9.1 && < 0.12

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

66 , exceptions >= 0.8.3 && < 0.9

67 , monad-control >= 1.0.0.4 && < 1.1

68 , semigroupoids >= 5.2.1 && < 5.3

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

@@ -63,8 +63,8 @@ library

63 , control-monad-omega >= 0.3.1 && < 0.4

64 , hashable >= 1.2.6.1 && < 1.3

65 , http-media >= 0.7.1.1 && < 0.8

66− , http-types >= 0.9.1 && < 0.12

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

67− , lens >= 4.15.4 && < 4.16

67+ , lens >= 4.15.4 && < 4.17

68 , string-conversions >= 0.4.0.1 && < 0.5

69 , unordered-containers >= 0.2.8.0 && < 0.3

70

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

@@ -53,8 +53,8 @@ library

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

54 build-depends:

55 base-compat >= 0.9.3 && <0.10

56− , lens >= 4.15.4 && <4.16

56+ , lens >= 4.15.4 && <4.17

57− , http-types >= 0.9.1 && < 0.12

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

58

59 hs-source-dirs: src

60 default-language: Haskell2010

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

@@ -82,7 +82,7 @@ library

82 , exceptions >= 0.8.3 && < 0.9

83 , http-api-data >= 0.3.7.1 && < 0.4

84 , http-media >= 0.7.1.1 && < 0.8

85− , http-types >= 0.9.1 && < 0.12

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

86 , network-uri >= 2.6.1.0 && < 2.7

87 , monad-control >= 1.0.0.4 && < 1.1

88 , network >= 2.6.3.2 && < 2.7

servant-server/test/Servant/ServerSpec.hs−10

@@ -3,7 +3,6 @@

3{-# LANGUAGE DeriveGeneric #-}

4{-# LANGUAGE FlexibleContexts #-}

5{-# LANGUAGE FlexibleInstances #-}

6−{-# LANGUAGE FlexibleInstances #-}

7{-# LANGUAGE OverloadedStrings #-}

6{-# LANGUAGE OverloadedStrings #-}

8{-# LANGUAGE PolyKinds #-}

7{-# LANGUAGE PolyKinds #-}

9{-# LANGUAGE ScopedTypeVariables #-}

8{-# LANGUAGE ScopedTypeVariables #-}

@@ -33,11 +32,7 @@ import Network.HTTP.Types (Status (..), hAccept, hContentType,

33 methodDelete, methodGet,

32 methodDelete, methodGet,

34 methodHead, methodPatch,

33 methodHead, methodPatch,

35 methodPost, methodPut, ok200,

34 methodPost, methodPut, ok200,

36−#if MIN_VERSION_http_types(0,10,0)

37 imATeapot418,

35 imATeapot418,

38−#else

39− imATeaPot418,

40−#endif

41 parseQuery)

36 parseQuery)

42import Network.Wai (Application, Request, requestHeaders, pathInfo,

37import Network.Wai (Application, Request, requestHeaders, pathInfo,

43 queryString, rawQueryString,

38 queryString, rawQueryString,

@@ -74,11 +69,6 @@ import Servant.Server.Experimental.Auth

74import Servant.Server.Internal.Context

69import Servant.Server.Internal.Context

75 (NamedContext(..))

70 (NamedContext(..))

76

71

77−#if !MIN_VERSION_http_types(0,10,0)

78−imATeapot418 :: Status

79−imATeapot418 = imATeaPot418

80−#endif

81−

82-- * comprehensive api test

72-- * comprehensive api test

83

73

84-- This declaration simply checks that all instances are in place.

74-- This declaration simply checks that all instances are in place.

servant/servant.cabal+1−1

@@ -87,7 +87,7 @@ library

87 , case-insensitive >= 1.2.0.10 && < 1.3

88 , http-api-data >= 0.3.7.1 && < 0.4

89 , http-media >= 0.7.1.1 && < 0.8

90− , http-types >= 0.9.1 && < 0.12

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

91 , natural-transformation >= 0.4 && < 0.5

92 , mmorph >= 1.1.0 && < 1.2

93 , tagged >= 0.8.5 && < 0.9

stack.yaml+3

@@ -9,6 +9,9 @@ packages:

9- servant/

10

11extra-deps:

12+- cabal-doctest-1.0.6

13+- http-api-data-0.3.7.2

14+- http-types-0.12

12- text-1.2.3.0

15- text-1.2.3.0

13

16

14# allow-newer: true # ignores all bounds, that's a sledgehammer

17# allow-newer: true # ignores all bounds, that's a sledgehammer