git.iko.soy/typeable/servant
on master help sign in
Merge pull request #925 from phadej/release-0.13-ghc-8.4.1

Support GHC-8.4.1 and newer deps

commit0881c1822a66ca33e08b7fd98086cd08bc24cd19 authorOleg Grenrus <oleg.grenrus@iki.fi> dateThu 15 Mar 2018, 13:16 (9 years ago) parent1d5542967698db
16 files changed+109−91
compare with master
unifiedsplit
.travis.yml+9−22 cabal.project+15−1 doc/cookbook/file-upload/file-upload.cabal+1−1 doc/cookbook/https/https.cabal+1−1 doc/cookbook/structuring-apis/structuring-apis.cabal+1−1 doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1 doc/tutorial/tutorial.cabal+6−5 servant-client-core/servant-client-core.cabal+9−8 servant-client-ghcjs/servant-client-ghcjs.cabal+2−2 servant-client/servant-client.cabal+11−10 servant-docs/servant-docs.cabal+9−8 servant-foreign/CHANGELOG.md+5 servant-foreign/servant-foreign.cabal+13−8 servant-foreign/src/Servant/Foreign/Internal.hs+3−2 servant-server/servant-server.cabal+12−11 servant/servant.cabal+11−10
.travis.yml+9−22
@@ -46,6 +46,9 @@ matrix:
4646 - compiler: "ghc-8.2.2"
4747 # env: TEST=--disable-tests BENCH=--disable-benchmarks
4848 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]}}
4952
5053before_install:
5154 - HC=${CC}
@@ -70,9 +73,9 @@ install:
7073 - rm -fv cabal.project cabal.project.local
7174 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
7275 - 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"
7477 - "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"
7679 - cat cabal.project
7780 - if [ -f "servant/configure.ac" ]; then
7881 (cd "servant" && autoreconf -i);
@@ -95,18 +98,6 @@ install:
9598 - if [ -f "doc/tutorial/configure.ac" ]; then
9699 (cd "doc/tutorial" && autoreconf -i);
97100 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
110101 - if [ -f "doc/cookbook/https/configure.ac" ]; then
111102 (cd "doc/cookbook/https" && autoreconf -i);
112103 fi
@@ -120,7 +111,7 @@ install:
120111 (cd "doc/cookbook/file-upload" && autoreconf -i);
121112 fi
122113 - 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
124115 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
125116
126117# Here starts the actual work to be performed for the package under test;
@@ -135,22 +126,18 @@ script:
135126 - (cd "servant-foreign" && cabal sdist)
136127 - (cd "servant-server" && cabal sdist)
137128 - (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)
142129 - (cd "doc/cookbook/https" && cabal sdist)
143130 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
144131 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
145132 - (cd "doc/cookbook/file-upload" && cabal sdist)
146133 - echo -en 'travis_fold:end:sdist\\r'
147134 - 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}/
149136 - cd ${DISTDIR} || false
150137 - 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"
152139 - "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"
154141 - cat cabal.project
155142 - echo -en 'travis_fold:end:unpack\\r'
156143
cabal.project+15−1
@@ -5,7 +5,18 @@ packages: servant/
55 servant-foreign/
66 servant-server/
77 doc/tutorial/
8− doc/cookbook/*/*.cabal
8+
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+
920
1021allow-newer:
1122 servant-js:servant,
@@ -21,3 +32,6 @@ constraints:
2132 -- see https://github.com/haskell-infra/hackage-trustees/issues/119
2233 foundation >=0.0.14,
2334 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
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-file-upload
1414 main-is: FileUpload.lhs
doc/cookbook/https/https.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-https
1414 main-is: Https.lhs
doc/cookbook/structuring-apis/structuring-apis.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-structuring-apis
1414 main-is: StructuringApis.lhs
doc/cookbook/using-custom-monad/using-custom-monad.cabal+1−1
@@ -8,7 +8,7 @@ author: Servant Contributors
88maintainer: haskell-servant-maintainers@googlegroups.com
99build-type: Simple
1010cabal-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
1212
1313executable cookbook-using-custom-monad
1414 main-is: UsingCustomMonad.lhs
doc/tutorial/tutorial.cabal+6−5
@@ -13,10 +13,11 @@ maintainer: haskell-servant-maintainers@googlegroups.com
1313build-type: Simple
1414cabal-version: >=1.10
1515tested-with:
16− GHC==7.8.4
17− GHC==7.10.3
18− GHC==8.0.2
19− GHC==8.2.2
16+ GHC==7.8.4,
17+ GHC==7.10.3,
18+ GHC==8.0.2,
19+ GHC==8.2.2,
20+ GHC==8.4.1
2021extra-source-files:
2122 static/index.html
2223 static/ui.js
@@ -34,7 +35,7 @@ library
3435 -- Packages `servant` depends on.
3536 -- We don't need to specify bounds here as this package is never released.
3637 build-depends:
37− base >= 4.7 && <4.11
38+ base >= 4.7 && <4.12
3839 , aeson
3940 , aeson-compat
4041 , attoparsec
servant-client-core/servant-client-core.cabal+9−8
@@ -19,10 +19,11 @@ extra-source-files:
1919 CHANGELOG.md
2020 README.md
2121tested-with:
22− GHC==7.8.4
23− GHC==7.10.3
24− GHC==8.0.2
25− GHC==8.2.2
22+ GHC==7.8.4,
23+ GHC==7.10.3,
24+ GHC==8.0.2,
25+ GHC==8.2.2,
26+ GHC==8.4.1
2627
2728source-repository head
2829 type: git
@@ -45,7 +46,7 @@ library
4546 --
4647 -- note: mtl lower bound is so low because of GHC-7.8
4748 build-depends:
48− base >= 4.7 && < 4.11
49+ base >= 4.7 && < 4.12
4950 , bytestring >= 0.10.4.0 && < 0.11
5051 , containers >= 0.5.5.1 && < 0.6
5152 , mtl >= 2.1 && < 2.3
@@ -64,7 +65,7 @@ library
6465 build-depends:
6566 base-compat >= 0.9.3 && < 0.10
6667 , base64-bytestring >= 1.0.0.1 && < 1.1
67− , exceptions >= 0.8.3 && < 0.9
68+ , exceptions >= 0.8.3 && < 0.11
6869 , generics-sop >= 0.3.1.0 && < 0.4
6970 , http-api-data >= 0.3.7.1 && < 0.4
7071 , http-media >= 0.7.1.1 && < 0.8
@@ -95,8 +96,8 @@ test-suite spec
9596 -- Additonal dependencies
9697 build-depends:
9798 deepseq >= 1.3.0.2 && <1.5
98− , hspec >= 2.4.4 && <2.5
99+ , hspec >= 2.4.4 && <2.6
99100 , QuickCheck >= 2.10.1 && < 2.12
100101
101102 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
3131 Servant.Client.Ghcjs
3232 Servant.Client.Internal.XhrClient
3333 build-depends:
34− base >= 4.7 && < 4.11
34+ base >= 4.7 && < 4.12
3535 , bytestring >= 0.10 && < 0.11
3636 , case-insensitive >= 1.2.0.0 && < 1.3.0.0
3737 , containers >= 0.5 && < 0.6
38− , exceptions >= 0.8 && < 0.9
38+ , exceptions >= 0.8 && < 0.11
3939 , ghcjs-base >= 0.2.0.0 && < 0.3.0.0
4040 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0
4141 , http-media >= 0.6.2 && < 0.8
servant-client/servant-client.cabal+11−10
@@ -17,10 +17,11 @@ category: Servant, Web
1717build-type: Simple
1818cabal-version: >=1.10
1919tested-with:
20− GHC==7.8.4
21− GHC==7.10.3
22− GHC==8.0.2
23− GHC==8.2.2
20+ GHC==7.8.4,
21+ GHC==7.10.3,
22+ GHC==8.0.2,
23+ GHC==8.2.2,
24+ GHC==8.4.1
2425homepage: http://haskell-servant.readthedocs.org/
2526Bug-reports: http://github.com/haskell-servant/servant/issues
2627extra-source-files:
@@ -41,7 +42,7 @@ library
4142 --
4243 -- note: mtl lower bound is so low because of GHC-7.8
4344 build-depends:
44− base >= 4.7 && < 4.11
45+ base >= 4.7 && < 4.12
4546 , bytestring >= 0.10.4.0 && < 0.11
4647 , containers >= 0.5.5.1 && < 0.6
4748 , mtl >= 2.1 && < 2.3
@@ -59,19 +60,19 @@ library
5960 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
6061 -- Here can be exceptions if we really need features from the newer versions.
6162 build-depends:
62− aeson >= 1.2.3.0 && < 1.3
63+ aeson >= 1.2.3.0 && < 1.4
6364 , base-compat >= 0.9.3 && < 0.10
6465 , attoparsec >= 0.13.2.0 && < 0.14
6566 , http-client >= 0.5.7.1 && < 0.6
6667 , http-client-tls >= 0.3.5.1 && < 0.4
6768 , http-media >= 0.7.1.1 && < 0.8
6869 , http-types >= 0.12 && < 0.13
69− , exceptions >= 0.8.3 && < 0.9
70+ , exceptions >= 0.8.3 && < 0.11
7071 , monad-control >= 1.0.0.4 && < 1.1
7172 , semigroupoids >= 5.2.1 && < 5.3
7273 , stm >= 2.4.4.1 && < 2.5
7374 , transformers-base >= 0.4.4 && < 0.5
74− , transformers-compat >= 0.5.1 && < 0.6
75+ , transformers-compat >= 0.5.1 && < 0.7
7576
7677 hs-source-dirs: src
7778 default-language: Haskell2010
@@ -114,7 +115,7 @@ test-suite spec
114115 build-depends:
115116 deepseq >= 1.3.0.2 && < 1.5
116117 , generics-sop >= 0.3.1.0 && < 0.4
117− , hspec >= 2.4.4 && < 2.5
118+ , hspec >= 2.4.4 && < 2.6
118119 , HUnit >= 1.6 && < 1.7
119120 , network >= 2.6.3.2 && < 2.7
120121 , QuickCheck >= 2.10.1 && < 2.12
@@ -122,4 +123,4 @@ test-suite spec
122123 , servant-server == 0.13.*
123124
124125 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
1616build-type: Simple
1717cabal-version: >=1.10
1818tested-with:
19− GHC==7.8.4
20− GHC==7.10.3
21− GHC==8.0.2
22− GHC==8.2.2
19+ GHC==7.8.4,
20+ GHC==7.10.3,
21+ GHC==8.0.2,
22+ GHC==8.2.2,
23+ GHC==8.4.1
2324homepage: http://haskell-servant.readthedocs.org/
2425Bug-reports: http://github.com/haskell-servant/servant/issues
2526extra-source-files:
@@ -41,7 +42,7 @@ library
4142 --
4243 -- note: mtl lower bound is so low because of GHC-7.8
4344 build-depends:
44− base >= 4.7 && < 4.11
45+ base >= 4.7 && < 4.12
4546 , bytestring >= 0.10.4.0 && < 0.11
4647 , text >= 1.2.3.0 && < 1.3
4748
@@ -56,7 +57,7 @@ library
5657 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
5758 -- Here can be exceptions if we really need features from the newer versions.
5859 build-depends:
59− aeson >= 1.2.3.0 && < 1.3
60+ aeson >= 1.2.3.0 && < 1.4
6061 , aeson-pretty >= 0.8.5 && < 0.9
6162 , base-compat >= 0.9.3 && < 0.10
6263 , case-insensitive >= 1.2.0.10 && < 1.3
@@ -108,7 +109,7 @@ test-suite spec
108109
109110 -- Additonal dependencies
110111 build-depends:
111− hspec >= 2.4.4 && < 2.5
112+ hspec >= 2.4.4 && < 2.6
112113
113114 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 @@
11[The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-foreign/CHANGELOG.md)
22[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
33
4+0.11.1
5+------
6+
7+- Add missing `Semigroup` instances
8+
490.11
510----
611
servant-foreign/servant-foreign.cabal+13−8
@@ -1,5 +1,5 @@
11name: servant-foreign
2−version: 0.11
2+version: 0.11.1
33synopsis: Helpers for generating clients for servant APIs in any programming language
44description:
55 Helper types and functions for generating client functions for servant APIs in any programming language
@@ -23,10 +23,11 @@ extra-source-files:
2323 README.md
2424bug-reports: http://github.com/haskell-servant/servant/issues
2525tested-with:
26− GHC==7.8.4
27− GHC==7.10.3
28− GHC==8.0.2
29− GHC==8.2.2
26+ GHC==7.8.4,
27+ GHC==7.10.3,
28+ GHC==8.0.2,
29+ GHC==8.2.2,
30+ GHC==8.4.1
3031
3132source-repository head
3233 type: git
@@ -42,9 +43,13 @@ library
4243 --
4344 -- note: mtl lower bound is so low because of GHC-7.8
4445 build-depends:
45− base >= 4.7 && <4.11
46+ base >= 4.7 && <4.12
4647 , text >= 1.2.3.0 && < 1.3
4748
49+ if !impl(ghc >= 8.0)
50+ build-depends:
51+ semigroups >=0.18.3 && <0.19
52+
4853 -- Servant dependencies
4954 build-depends:
5055 servant == 0.13.*
@@ -79,8 +84,8 @@ test-suite spec
7984
8085 -- Additonal dependencies
8186 build-depends:
82− hspec >= 2.4.4 && <2.5
87+ hspec >= 2.4.4 && <2.6
8388
8489 build-tool-depends:
85− hspec-discover:hspec-discover >=2.4.4 && <2.5
90+ hspec-discover:hspec-discover >=2.4.4 && <2.6
8691 default-language: Haskell2010
servant-foreign/src/Servant/Foreign/Internal.hs+3−2
@@ -27,6 +27,7 @@ import Control.Lens (makePrisms, makeLenses, Getter, (&), (<>~), (%~),
2727 (.~))
2828import Data.Data (Data)
2929import Data.Proxy
30+import Data.Semigroup (Semigroup)
3031import Data.String
3132import Data.Text
3233import Data.Typeable (Typeable)
@@ -38,12 +39,12 @@ import Servant.API.TypeLevel
3839import Servant.API.Modifiers (RequiredArgument)
3940
4041newtype FunctionName = FunctionName { unFunctionName :: [Text] }
41− deriving (Data, Show, Eq, Monoid, Typeable)
42+ deriving (Data, Show, Eq, Semigroup, Monoid, Typeable)
4243
4344makePrisms ''FunctionName
4445
4546newtype PathSegment = PathSegment { unPathSegment :: Text }
46− deriving (Data, Show, Eq, IsString, Monoid, Typeable)
47+ deriving (Data, Show, Eq, IsString, Semigroup, Monoid, Typeable)
4748
4849makePrisms ''PathSegment
4950
servant-server/servant-server.cabal+12−11
@@ -22,10 +22,11 @@ category: Servant, Web
2222build-type: Custom
2323cabal-version: >=1.10
2424tested-with:
25− GHC==7.8.4
26− GHC==7.10.3
27− GHC==8.0.2
28− GHC==8.2.2
25+ GHC==7.8.4,
26+ GHC==7.10.3,
27+ GHC==8.0.2,
28+ GHC==8.2.2,
29+ GHC==8.4.1
2930extra-source-files:
3031 include/*.h
3132 CHANGELOG.md
@@ -60,7 +61,7 @@ library
6061 --
6162 -- note: mtl lower bound is so low because of GHC-7.8
6263 build-depends:
63− base >= 4.7 && < 4.11
64+ base >= 4.7 && < 4.12
6465 , bytestring >= 0.10.4.0 && < 0.11
6566 , containers >= 0.5.5.1 && < 0.6
6667 , mtl >= 2.1 && < 2.3
@@ -75,11 +76,11 @@ library
7576 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
7677 -- Here can be exceptions if we really need features from the newer versions.
7778 build-depends:
78− aeson >= 1.2.3.0 && < 1.3
79+ aeson >= 1.2.3.0 && < 1.4
7980 , base-compat >= 0.9.3 && < 0.10
8081 , attoparsec >= 0.13.2.0 && < 0.14
8182 , base64-bytestring >= 1.0.0.1 && < 1.1
82− , exceptions >= 0.8.3 && < 0.9
83+ , exceptions >= 0.8.3 && < 0.11
8384 , http-api-data >= 0.3.7.1 && < 0.4
8485 , http-media >= 0.7.1.1 && < 0.8
8586 , http-types >= 0.12 && < 0.13
@@ -93,7 +94,7 @@ library
9394 , resourcet >= 1.1.9 && < 1.3
9495 , tagged >= 0.8.5 && < 0.9
9596 , transformers-base >= 0.4.4 && < 0.5
96− , transformers-compat >= 0.5.1 && < 0.6
97+ , transformers-compat >= 0.5.1 && < 0.7
9798 , wai >= 3.2.1.1 && < 3.3
9899 , wai-app-static >= 3.1.6.1 && < 3.2
99100 , warp >= 3.2.13 && < 3.3
@@ -164,7 +165,7 @@ test-suite spec
164165 -- Additonal dependencies
165166 build-depends:
166167 directory >= 1.2.1.0 && < 1.4
167− , hspec >= 2.4.4 && < 2.5
168+ , hspec >= 2.4.4 && < 2.6
168169 , hspec-wai >= 0.9 && < 0.10
169170 , should-not-typecheck >= 2.1.0 && < 2.2
170171 , parsec >= 3.1.11 && < 3.2
@@ -173,13 +174,13 @@ test-suite spec
173174 , temporary >= 1.2.0.3 && < 1.3
174175
175176 build-tool-depends:
176− hspec-discover:hspec-discover >=2.4.4 && <2.5
177+ hspec-discover:hspec-discover >=2.4.4 && <2.6
177178
178179test-suite doctests
179180 build-depends:
180181 base
181182 , servant-server
182− , doctest >= 0.13.0 && <0.14
183+ , doctest >= 0.13.0 && <0.16
183184 type: exitcode-stdio-1.0
184185 main-is: test/doctests.hs
185186 buildable: True
servant/servant.cabal+11−10
@@ -18,10 +18,11 @@ category: Servant, Web
1818build-type: Custom
1919cabal-version: >=1.10
2020tested-with:
21− GHC==7.8.4
22− GHC==7.10.3
23− GHC==8.0.2
24− GHC==8.2.2
21+ GHC==7.8.4,
22+ GHC==7.10.3,
23+ GHC==8.0.2,
24+ GHC==8.2.2,
25+ GHC==8.4.1
2526extra-source-files:
2627 include/*.h
2728 CHANGELOG.md
@@ -69,7 +70,7 @@ library
6970 --
7071 -- note: mtl lower bound is so low because of GHC-7.8
7172 build-depends:
72− base >= 4.7 && < 4.11
73+ base >= 4.7 && < 4.12
7374 , bytestring >= 0.10.4.0 && < 0.11
7475 , mtl >= 2.1 && < 2.3
7576 , text >= 1.2.3.0 && < 1.3
@@ -82,7 +83,7 @@ library
8283 -- Here can be exceptions if we really need features from the newer versions.
8384 build-depends:
8485 base-compat >= 0.9.3 && < 0.10
85− , aeson >= 1.2.3.0 && < 1.3
86+ , aeson >= 1.2.3.0 && < 1.4
8687 , attoparsec >= 0.13.2.0 && < 0.14
8788 , case-insensitive >= 1.2.0.10 && < 1.3
8889 , http-api-data >= 0.3.7.1 && < 0.4
@@ -153,22 +154,22 @@ test-suite spec
153154 -- Additonal dependencies
154155 build-depends:
155156 aeson-compat >= 0.3.3 && < 0.4
156− , hspec >= 2.4.4 && < 2.5
157+ , hspec >= 2.4.4 && < 2.6
157158 , QuickCheck >= 2.10.1 && < 2.12
158159 , quickcheck-instances >= 0.3.16 && < 0.4
159160
160161 build-tool-depends:
161− hspec-discover:hspec-discover >= 2.4.4 && < 2.5
162+ hspec-discover:hspec-discover >= 2.4.4 && < 2.6
162163
163164test-suite doctests
164165 build-depends:
165166 base
166167 , servant
167− , doctest >= 0.13.0 && <0.14
168+ , doctest >= 0.13.0 && <0.16
168169
169170 -- We test Links failure with doctest, so we need extra dependencies
170171 build-depends:
171− hspec >= 2.4.4 && < 2.5
172+ hspec >= 2.4.4 && < 2.6
172173
173174 type: exitcode-stdio-1.0
174175 main-is: test/doctests.hs