0881c18 · typeable/servant

git.iko.soy/typeable/servant

on master help sign in

Merge pull request #925 from phadej/release-0.13-ghc-8.4.1

0881c18Oleg Grenrus9 years ago

.travis.yml+9−22

compare with master

unifiedsplit

@@ -46,6 +46,9 @@ matrix:

46 - compiler: "ghc-8.2.2"

47 # env: TEST=--disable-tests BENCH=--disable-benchmarks

48 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}

49+ - compiler: "ghc-8.4.1"

50+ # env: TEST=--disable-tests BENCH=--disable-benchmarks

51+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}

50before_install:

53before_install:

51 - HC=${CC}

54 - HC=${CC}

@@ -70,9 +73,9 @@ install:

70 - rm -fv cabal.project cabal.project.local

73 - rm -fv cabal.project cabal.project.local

71 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"

74 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"

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

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

73− - "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"

76+ - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/https\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/file-upload\"\\n' > cabal.project"

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

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

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

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

76 - cat cabal.project

79 - cat cabal.project

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

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

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

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

@@ -95,18 +98,6 @@ install:

95 - if [ -f "doc/tutorial/configure.ac" ]; then

98 - if [ -f "doc/tutorial/configure.ac" ]; then

96 (cd "doc/tutorial" && autoreconf -i);

99 (cd "doc/tutorial" && autoreconf -i);

97 fi

100 fi

98− - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then

99− (cd "doc/cookbook/db-postgres-pool" && autoreconf -i);

100− fi

101− - if [ -f "doc/cookbook/jwt-and-basic-auth/configure.ac" ]; then

102− (cd "doc/cookbook/jwt-and-basic-auth" && autoreconf -i);

103− fi

104− - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then

105− (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i);

106− fi

107− - if [ -f "doc/cookbook/basic-auth/configure.ac" ]; then

108− (cd "doc/cookbook/basic-auth" && autoreconf -i);

109− fi

110 - if [ -f "doc/cookbook/https/configure.ac" ]; then

101 - if [ -f "doc/cookbook/https/configure.ac" ]; then

111 (cd "doc/cookbook/https" && autoreconf -i);

102 (cd "doc/cookbook/https" && autoreconf -i);

112 fi

103 fi

@@ -120,7 +111,7 @@ install:

120 (cd "doc/cookbook/file-upload" && autoreconf -i);

111 (cd "doc/cookbook/file-upload" && autoreconf -i);

121 fi

112 fi

122 - rm -f cabal.project.freeze

113 - rm -f cabal.project.freeze

123− - rm -rf "servant"/.ghc.environment.* "servant-client"/.ghc.environment.* "servant-client-core"/.ghc.environment.* "servant-docs"/.ghc.environment.* "servant-foreign"/.ghc.environment.* "servant-server"/.ghc.environment.* "doc/tutorial"/.ghc.environment.* "doc/cookbook/db-postgres-pool"/.ghc.environment.* "doc/cookbook/jwt-and-basic-auth"/.ghc.environment.* "doc/cookbook/db-sqlite-simple"/.ghc.environment.* "doc/cookbook/basic-auth"/.ghc.environment.* "doc/cookbook/https"/.ghc.environment.* "doc/cookbook/structuring-apis"/.ghc.environment.* "doc/cookbook/using-custom-monad"/.ghc.environment.* "doc/cookbook/file-upload"/.ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/jwt-and-basic-auth"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/https"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/file-upload"/dist

114+ - rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "doc/cookbook/https"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/file-upload"/dist

124 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

115 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

125

116

126# Here starts the actual work to be performed for the package under test;

117# Here starts the actual work to be performed for the package under test;

@@ -135,22 +126,18 @@ script:

135 - (cd "servant-foreign" && cabal sdist)

126 - (cd "servant-foreign" && cabal sdist)

136 - (cd "servant-server" && cabal sdist)

127 - (cd "servant-server" && cabal sdist)

137 - (cd "doc/tutorial" && cabal sdist)

128 - (cd "doc/tutorial" && cabal sdist)

138− - (cd "doc/cookbook/db-postgres-pool" && cabal sdist)

139− - (cd "doc/cookbook/jwt-and-basic-auth" && cabal sdist)

140− - (cd "doc/cookbook/db-sqlite-simple" && cabal sdist)

141− - (cd "doc/cookbook/basic-auth" && cabal sdist)

142 - (cd "doc/cookbook/https" && cabal sdist)

129 - (cd "doc/cookbook/https" && cabal sdist)

143 - (cd "doc/cookbook/structuring-apis" && cabal sdist)

130 - (cd "doc/cookbook/structuring-apis" && cabal sdist)

144 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)

131 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)

145 - (cd "doc/cookbook/file-upload" && cabal sdist)

132 - (cd "doc/cookbook/file-upload" && cabal sdist)

146 - echo -en 'travis_fold:end:sdist\\r'

133 - echo -en 'travis_fold:end:sdist\\r'

147 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'

134 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'

148− - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/db-postgres-pool"/dist/cookbook-db-postgres-pool-*.tar.gz "doc/cookbook/jwt-and-basic-auth"/dist/cookbook-jwt-and-basic-auth-*.tar.gz "doc/cookbook/db-sqlite-simple"/dist/cookbook-db-sqlite-simple-*.tar.gz "doc/cookbook/basic-auth"/dist/cookbook-basic-auth-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz ${DISTDIR}/

135+ - mv "servant"/dist/servant-*.tar.gz "servant-client"/dist/servant-client-*.tar.gz "servant-client-core"/dist/servant-client-core-*.tar.gz "servant-docs"/dist/servant-docs-*.tar.gz "servant-foreign"/dist/servant-foreign-*.tar.gz "servant-server"/dist/servant-server-*.tar.gz "doc/tutorial"/dist/tutorial-*.tar.gz "doc/cookbook/https"/dist/cookbook-https-*.tar.gz "doc/cookbook/structuring-apis"/dist/cookbook-structuring-apis-*.tar.gz "doc/cookbook/using-custom-monad"/dist/cookbook-using-custom-monad-*.tar.gz "doc/cookbook/file-upload"/dist/cookbook-file-upload-*.tar.gz ${DISTDIR}/

149 - cd ${DISTDIR} || false

136 - cd ${DISTDIR} || false

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

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

151− - "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"

138+ - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-https-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-file-upload-*/*.cabal\\n' > cabal.project"

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

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

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

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

154 - cat cabal.project

141 - cat cabal.project

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

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

156

143

cabal.project+15−1

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

5 servant-foreign/

6 servant-server/

7 doc/tutorial/

8− doc/cookbook/*/*.cabal

9+ -- doc/cookbook/*/*.cabal

10+

11+ -- doc/cookbook/db-postgres-pool

12+ -- doc/cookbook/jwt-and-basic-auth

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

14+ -- doc/cookbook/basic-auth

15+ doc/cookbook/https

16+ doc/cookbook/structuring-apis

17+ doc/cookbook/using-custom-monad

18+ doc/cookbook/file-upload

19+

10allow-newer:

21allow-newer:

11 servant-js:servant,

22 servant-js:servant,

@@ -21,3 +32,6 @@ constraints:

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

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

22 foundation >=0.0.14,

33 foundation >=0.0.14,

23 memory <0.14.12 || >0.14.12

34 memory <0.14.12 || >0.14.12

35+

36+allow-newer:

37+ http-media:base

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

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

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

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2

11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1

13executable cookbook-file-upload

14 main-is: FileUpload.lhs

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

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

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

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2

11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1

13executable cookbook-https

14 main-is: Https.lhs

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

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

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

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2

11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1

13executable cookbook-structuring-apis

14 main-is: StructuringApis.lhs

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

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

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

9build-type: Simple

10cabal-version: >=1.10

11−tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2

11+tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1

13executable cookbook-using-custom-monad

14 main-is: UsingCustomMonad.lhs

doc/tutorial/tutorial.cabal+6−5

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

13build-type: Simple

14cabal-version: >=1.10

15tested-with:

16− GHC==7.8.4

16+ GHC==7.8.4,

17− GHC==7.10.3

17+ GHC==7.10.3,

18− GHC==8.0.2

18+ GHC==8.0.2,

19− GHC==8.2.2

19+ GHC==8.2.2,

20+ GHC==8.4.1

20extra-source-files:

21extra-source-files:

21 static/index.html

22 static/index.html

22 static/ui.js

23 static/ui.js

@@ -34,7 +35,7 @@ library

34 -- Packages `servant` depends on.

35 -- Packages `servant` depends on.

35 -- We don't need to specify bounds here as this package is never released.

36 -- We don't need to specify bounds here as this package is never released.

36 build-depends:

37 build-depends:

37− base >= 4.7 && <4.11

38+ base >= 4.7 && <4.12

38 , aeson

39 , aeson

39 , aeson-compat

40 , aeson-compat

40 , attoparsec

41 , attoparsec

servant-client-core/servant-client-core.cabal+9−8

@@ -19,10 +19,11 @@ extra-source-files:

19 CHANGELOG.md

20 README.md

21tested-with:

22− GHC==7.8.4

22+ GHC==7.8.4,

23− GHC==7.10.3

23+ GHC==7.10.3,

24− GHC==8.0.2

24+ GHC==8.0.2,

25− GHC==8.2.2

25+ GHC==8.2.2,

26+ GHC==8.4.1

27source-repository head

28source-repository head

28 type: git

29 type: git

@@ -45,7 +46,7 @@ library

45 --

46 --

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

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

47 build-depends:

48 build-depends:

48− base >= 4.7 && < 4.11

49+ base >= 4.7 && < 4.12

49 , bytestring >= 0.10.4.0 && < 0.11

50 , bytestring >= 0.10.4.0 && < 0.11

50 , containers >= 0.5.5.1 && < 0.6

51 , containers >= 0.5.5.1 && < 0.6

51 , mtl >= 2.1 && < 2.3

52 , mtl >= 2.1 && < 2.3

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

64 build-depends:

65 build-depends:

65 base-compat >= 0.9.3 && < 0.10

66 base-compat >= 0.9.3 && < 0.10

66 , base64-bytestring >= 1.0.0.1 && < 1.1

67 , base64-bytestring >= 1.0.0.1 && < 1.1

67− , exceptions >= 0.8.3 && < 0.9

68+ , exceptions >= 0.8.3 && < 0.11

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

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

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

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

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

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

@@ -95,8 +96,8 @@ test-suite spec

95 -- Additonal dependencies

96 -- Additonal dependencies

96 build-depends:

97 build-depends:

97 deepseq >= 1.3.0.2 && <1.5

98 deepseq >= 1.3.0.2 && <1.5

98− , hspec >= 2.4.4 && <2.5

99+ , hspec >= 2.4.4 && <2.6

99 , QuickCheck >= 2.10.1 && < 2.12

100 , QuickCheck >= 2.10.1 && < 2.12

100

101

101 build-tool-depends:

102 build-tool-depends:

102− hspec-discover:hspec-discover >= 2.4.4 && <2.5

103+ hspec-discover:hspec-discover >= 2.4.4 && <2.6

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

@@ -31,11 +31,11 @@ library

31 Servant.Client.Ghcjs

32 Servant.Client.Internal.XhrClient

33 build-depends:

34− base >= 4.7 && < 4.11

34+ base >= 4.7 && < 4.12

35 , bytestring >= 0.10 && < 0.11

36 , case-insensitive >= 1.2.0.0 && < 1.3.0.0

37 , containers >= 0.5 && < 0.6

38− , exceptions >= 0.8 && < 0.9

38+ , exceptions >= 0.8 && < 0.11

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

servant-client/servant-client.cabal+11−10

@@ -17,10 +17,11 @@ category: Servant, Web

17build-type: Simple

18cabal-version: >=1.10

19tested-with:

20− GHC==7.8.4

20+ GHC==7.8.4,

21− GHC==7.10.3

21+ GHC==7.10.3,

22− GHC==8.0.2

22+ GHC==8.0.2,

23− GHC==8.2.2

23+ GHC==8.2.2,

24+ GHC==8.4.1

24homepage: http://haskell-servant.readthedocs.org/

25homepage: http://haskell-servant.readthedocs.org/

25Bug-reports: http://github.com/haskell-servant/servant/issues

26Bug-reports: http://github.com/haskell-servant/servant/issues

26extra-source-files:

27extra-source-files:

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

41 --

42 --

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

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

43 build-depends:

44 build-depends:

44− base >= 4.7 && < 4.11

45+ base >= 4.7 && < 4.12

45 , bytestring >= 0.10.4.0 && < 0.11

46 , bytestring >= 0.10.4.0 && < 0.11

46 , containers >= 0.5.5.1 && < 0.6

47 , containers >= 0.5.5.1 && < 0.6

47 , mtl >= 2.1 && < 2.3

48 , mtl >= 2.1 && < 2.3

@@ -59,19 +60,19 @@ library

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

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

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

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

61 build-depends:

62 build-depends:

62− aeson >= 1.2.3.0 && < 1.3

63+ aeson >= 1.2.3.0 && < 1.4

63 , base-compat >= 0.9.3 && < 0.10

64 , base-compat >= 0.9.3 && < 0.10

64 , attoparsec >= 0.13.2.0 && < 0.14

65 , attoparsec >= 0.13.2.0 && < 0.14

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

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

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

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

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

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

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

69 , http-types >= 0.12 && < 0.13

69− , exceptions >= 0.8.3 && < 0.9

70+ , exceptions >= 0.8.3 && < 0.11

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

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

71 , semigroupoids >= 5.2.1 && < 5.3

72 , semigroupoids >= 5.2.1 && < 5.3

72 , stm >= 2.4.4.1 && < 2.5

73 , stm >= 2.4.4.1 && < 2.5

73 , transformers-base >= 0.4.4 && < 0.5

74 , transformers-base >= 0.4.4 && < 0.5

74− , transformers-compat >= 0.5.1 && < 0.6

75+ , transformers-compat >= 0.5.1 && < 0.7

76 hs-source-dirs: src

77 hs-source-dirs: src

77 default-language: Haskell2010

78 default-language: Haskell2010

@@ -114,7 +115,7 @@ test-suite spec

114 build-depends:

115 build-depends:

115 deepseq >= 1.3.0.2 && < 1.5

116 deepseq >= 1.3.0.2 && < 1.5

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

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

117− , hspec >= 2.4.4 && < 2.5

118+ , hspec >= 2.4.4 && < 2.6

118 , HUnit >= 1.6 && < 1.7

119 , HUnit >= 1.6 && < 1.7

119 , network >= 2.6.3.2 && < 2.7

120 , network >= 2.6.3.2 && < 2.7

120 , QuickCheck >= 2.10.1 && < 2.12

121 , QuickCheck >= 2.10.1 && < 2.12

@@ -122,4 +123,4 @@ test-suite spec

122 , servant-server == 0.13.*

123 , servant-server == 0.13.*

123

124

124 build-tool-depends:

125 build-tool-depends:

125− hspec-discover:hspec-discover >= 2.4.4 && < 2.5

126+ hspec-discover:hspec-discover >= 2.4.4 && < 2.6

servant-docs/servant-docs.cabal+9−8

@@ -16,10 +16,11 @@ category: Servant, Web

16build-type: Simple

17cabal-version: >=1.10

18tested-with:

19− GHC==7.8.4

19+ GHC==7.8.4,

20− GHC==7.10.3

20+ GHC==7.10.3,

21− GHC==8.0.2

21+ GHC==8.0.2,

22− GHC==8.2.2

22+ GHC==8.2.2,

23+ GHC==8.4.1

23homepage: http://haskell-servant.readthedocs.org/

24homepage: http://haskell-servant.readthedocs.org/

24Bug-reports: http://github.com/haskell-servant/servant/issues

25Bug-reports: http://github.com/haskell-servant/servant/issues

25extra-source-files:

26extra-source-files:

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

41 --

42 --

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

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

43 build-depends:

44 build-depends:

44− base >= 4.7 && < 4.11

45+ base >= 4.7 && < 4.12

45 , bytestring >= 0.10.4.0 && < 0.11

46 , bytestring >= 0.10.4.0 && < 0.11

46 , text >= 1.2.3.0 && < 1.3

47 , text >= 1.2.3.0 && < 1.3

@@ -56,7 +57,7 @@ library

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.

58 build-depends:

59 build-depends:

59− aeson >= 1.2.3.0 && < 1.3

60+ aeson >= 1.2.3.0 && < 1.4

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

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

61 , base-compat >= 0.9.3 && < 0.10

62 , base-compat >= 0.9.3 && < 0.10

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

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

@@ -108,7 +109,7 @@ test-suite spec

108

109

109 -- Additonal dependencies

110 -- Additonal dependencies

110 build-depends:

111 build-depends:

111− hspec >= 2.4.4 && < 2.5

112+ hspec >= 2.4.4 && < 2.6

112

113

113 build-tool-depends:

114 build-tool-depends:

114− hspec-discover:hspec-discover >=2.4.4 && <2.5

115+ hspec-discover:hspec-discover >=2.4.4 && <2.6

servant-foreign/CHANGELOG.md+5

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

1[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-foreign/CHANGELOG.md)

2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)

4+0.11.1

5+------

7+- Add missing `Semigroup` instances

40.11

90.11

5----

10----

servant-foreign/servant-foreign.cabal+13−8

@@ -1,5 +1,5 @@

1name: servant-foreign

2−version: 0.11

2+version: 0.11.1

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

4description:

5 Helper types and functions for generating client functions for servant APIs in any programming language

@@ -23,10 +23,11 @@ extra-source-files:

23 README.md

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

25tested-with:

26− GHC==7.8.4

26+ GHC==7.8.4,

27− GHC==7.10.3

27+ GHC==7.10.3,

28− GHC==8.0.2

28+ GHC==8.0.2,

29− GHC==8.2.2

29+ GHC==8.2.2,

30+ GHC==8.4.1

31source-repository head

32source-repository head

32 type: git

33 type: git

@@ -42,9 +43,13 @@ library

42 --

43 --

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

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

44 build-depends:

45 build-depends:

45− base >= 4.7 && <4.11

46+ base >= 4.7 && <4.12

46 , text >= 1.2.3.0 && < 1.3

47 , text >= 1.2.3.0 && < 1.3

49+ if !impl(ghc >= 8.0)

50+ build-depends:

51+ semigroups >=0.18.3 && <0.19

52+

48 -- Servant dependencies

53 -- Servant dependencies

49 build-depends:

54 build-depends:

50 servant == 0.13.*

55 servant == 0.13.*

@@ -79,8 +84,8 @@ test-suite spec

80 -- Additonal dependencies

85 -- Additonal dependencies

81 build-depends:

86 build-depends:

82− hspec >= 2.4.4 && <2.5

87+ hspec >= 2.4.4 && <2.6

84 build-tool-depends:

89 build-tool-depends:

85− hspec-discover:hspec-discover >=2.4.4 && <2.5

90+ hspec-discover:hspec-discover >=2.4.4 && <2.6

86 default-language: Haskell2010

91 default-language: Haskell2010

servant-foreign/src/Servant/Foreign/Internal.hs+3−2

@@ -27,6 +27,7 @@ import Control.Lens (makePrisms, makeLenses, Getter, (&), (<>~), (%~),

27 (.~))

28import Data.Data (Data)

29import Data.Proxy

30+import Data.Semigroup (Semigroup)

30import Data.String

31import Data.String

31import Data.Text

32import Data.Text

32import Data.Typeable (Typeable)

33import Data.Typeable (Typeable)

@@ -38,12 +39,12 @@ import Servant.API.TypeLevel

38import Servant.API.Modifiers (RequiredArgument)

39import Servant.API.Modifiers (RequiredArgument)

40newtype FunctionName = FunctionName { unFunctionName :: [Text] }

41newtype FunctionName = FunctionName { unFunctionName :: [Text] }

41− deriving (Data, Show, Eq, Monoid, Typeable)

42+ deriving (Data, Show, Eq, Semigroup, Monoid, Typeable)

43makePrisms ''FunctionName

44makePrisms ''FunctionName

45newtype PathSegment = PathSegment { unPathSegment :: Text }

46newtype PathSegment = PathSegment { unPathSegment :: Text }

46− deriving (Data, Show, Eq, IsString, Monoid, Typeable)

47+ deriving (Data, Show, Eq, IsString, Semigroup, Monoid, Typeable)

48makePrisms ''PathSegment

49makePrisms ''PathSegment

servant-server/servant-server.cabal+12−11

@@ -22,10 +22,11 @@ category: Servant, Web

22build-type: Custom

23cabal-version: >=1.10

24tested-with:

25− GHC==7.8.4

25+ GHC==7.8.4,

26− GHC==7.10.3

26+ GHC==7.10.3,

27− GHC==8.0.2

27+ GHC==8.0.2,

28− GHC==8.2.2

28+ GHC==8.2.2,

29+ GHC==8.4.1

29extra-source-files:

30extra-source-files:

30 include/*.h

31 include/*.h

31 CHANGELOG.md

32 CHANGELOG.md

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

60 --

61 --

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

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

62 build-depends:

63 build-depends:

63− base >= 4.7 && < 4.11

64+ base >= 4.7 && < 4.12

64 , bytestring >= 0.10.4.0 && < 0.11

65 , bytestring >= 0.10.4.0 && < 0.11

65 , containers >= 0.5.5.1 && < 0.6

66 , containers >= 0.5.5.1 && < 0.6

66 , mtl >= 2.1 && < 2.3

67 , mtl >= 2.1 && < 2.3

@@ -75,11 +76,11 @@ library

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

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

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

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

77 build-depends:

78 build-depends:

78− aeson >= 1.2.3.0 && < 1.3

79+ aeson >= 1.2.3.0 && < 1.4

79 , base-compat >= 0.9.3 && < 0.10

80 , base-compat >= 0.9.3 && < 0.10

80 , attoparsec >= 0.13.2.0 && < 0.14

81 , attoparsec >= 0.13.2.0 && < 0.14

81 , base64-bytestring >= 1.0.0.1 && < 1.1

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

82− , exceptions >= 0.8.3 && < 0.9

83+ , exceptions >= 0.8.3 && < 0.11

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

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

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

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

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

86 , http-types >= 0.12 && < 0.13

@@ -93,7 +94,7 @@ library

93 , resourcet >= 1.1.9 && < 1.3

94 , resourcet >= 1.1.9 && < 1.3

94 , tagged >= 0.8.5 && < 0.9

95 , tagged >= 0.8.5 && < 0.9

95 , transformers-base >= 0.4.4 && < 0.5

96 , transformers-base >= 0.4.4 && < 0.5

96− , transformers-compat >= 0.5.1 && < 0.6

97+ , transformers-compat >= 0.5.1 && < 0.7

97 , wai >= 3.2.1.1 && < 3.3

98 , wai >= 3.2.1.1 && < 3.3

98 , wai-app-static >= 3.1.6.1 && < 3.2

99 , wai-app-static >= 3.1.6.1 && < 3.2

99 , warp >= 3.2.13 && < 3.3

100 , warp >= 3.2.13 && < 3.3

@@ -164,7 +165,7 @@ test-suite spec

164 -- Additonal dependencies

165 -- Additonal dependencies

165 build-depends:

166 build-depends:

166 directory >= 1.2.1.0 && < 1.4

167 directory >= 1.2.1.0 && < 1.4

167− , hspec >= 2.4.4 && < 2.5

168+ , hspec >= 2.4.4 && < 2.6

168 , hspec-wai >= 0.9 && < 0.10

169 , hspec-wai >= 0.9 && < 0.10

169 , should-not-typecheck >= 2.1.0 && < 2.2

170 , should-not-typecheck >= 2.1.0 && < 2.2

170 , parsec >= 3.1.11 && < 3.2

171 , parsec >= 3.1.11 && < 3.2

@@ -173,13 +174,13 @@ test-suite spec

173 , temporary >= 1.2.0.3 && < 1.3

174 , temporary >= 1.2.0.3 && < 1.3

174

175

175 build-tool-depends:

176 build-tool-depends:

176− hspec-discover:hspec-discover >=2.4.4 && <2.5

177+ hspec-discover:hspec-discover >=2.4.4 && <2.6

177

178

178test-suite doctests

179test-suite doctests

179 build-depends:

180 build-depends:

180 base

181 base

181 , servant-server

182 , servant-server

182− , doctest >= 0.13.0 && <0.14

183+ , doctest >= 0.13.0 && <0.16

183 type: exitcode-stdio-1.0

184 type: exitcode-stdio-1.0

184 main-is: test/doctests.hs

185 main-is: test/doctests.hs

185 buildable: True

186 buildable: True

servant/servant.cabal+11−10

@@ -18,10 +18,11 @@ category: Servant, Web

18build-type: Custom

19cabal-version: >=1.10

20tested-with:

21− GHC==7.8.4

21+ GHC==7.8.4,

22− GHC==7.10.3

22+ GHC==7.10.3,

23− GHC==8.0.2

23+ GHC==8.0.2,

24− GHC==8.2.2

24+ GHC==8.2.2,

25+ GHC==8.4.1

25extra-source-files:

26extra-source-files:

26 include/*.h

27 include/*.h

27 CHANGELOG.md

28 CHANGELOG.md

@@ -69,7 +70,7 @@ library

69 --

70 --

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

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

71 build-depends:

72 build-depends:

72− base >= 4.7 && < 4.11

73+ base >= 4.7 && < 4.12

73 , bytestring >= 0.10.4.0 && < 0.11

74 , bytestring >= 0.10.4.0 && < 0.11

74 , mtl >= 2.1 && < 2.3

75 , mtl >= 2.1 && < 2.3

75 , text >= 1.2.3.0 && < 1.3

76 , text >= 1.2.3.0 && < 1.3

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

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

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

83 build-depends:

84 build-depends:

84 base-compat >= 0.9.3 && < 0.10

85 base-compat >= 0.9.3 && < 0.10

85− , aeson >= 1.2.3.0 && < 1.3

86+ , aeson >= 1.2.3.0 && < 1.4

86 , attoparsec >= 0.13.2.0 && < 0.14

87 , attoparsec >= 0.13.2.0 && < 0.14

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

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

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

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

@@ -153,22 +154,22 @@ test-suite spec

153 -- Additonal dependencies

154 -- Additonal dependencies

154 build-depends:

155 build-depends:

155 aeson-compat >= 0.3.3 && < 0.4

156 aeson-compat >= 0.3.3 && < 0.4

156− , hspec >= 2.4.4 && < 2.5

157+ , hspec >= 2.4.4 && < 2.6

157 , QuickCheck >= 2.10.1 && < 2.12

158 , QuickCheck >= 2.10.1 && < 2.12

158 , quickcheck-instances >= 0.3.16 && < 0.4

159 , quickcheck-instances >= 0.3.16 && < 0.4

159

160

160 build-tool-depends:

161 build-tool-depends:

161− hspec-discover:hspec-discover >= 2.4.4 && < 2.5

162+ hspec-discover:hspec-discover >= 2.4.4 && < 2.6

162

163

163test-suite doctests

164test-suite doctests

164 build-depends:

165 build-depends:

165 base

166 base

166 , servant

167 , servant

167− , doctest >= 0.13.0 && <0.14

168+ , doctest >= 0.13.0 && <0.16

168

169

169 -- We test Links failure with doctest, so we need extra dependencies

170 -- We test Links failure with doctest, so we need extra dependencies

170 build-depends:

171 build-depends:

171− hspec >= 2.4.4 && < 2.5

172+ hspec >= 2.4.4 && < 2.6

172

173

173 type: exitcode-stdio-1.0

174 type: exitcode-stdio-1.0

174 main-is: test/doctests.hs

175 main-is: test/doctests.hs