git.iko.soy/typeable/servant
on master help sign in
Support GHC-8.4.1 and newer deps
c34bd1cOleg Grenrus
.travis.yml+6−22
compare with master
unifiedsplit
@@ -70,9 +70,9 @@ install:
70 - rm -fv cabal.project cabal.project.local
70 - 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"
71 - "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*$'
72 - 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"
73+ - "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"
74 - "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"
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, http-media:base' >> cabal.project"
76 - cat cabal.project
76 - cat cabal.project
77 - if [ -f "servant/configure.ac" ]; then
77 - if [ -f "servant/configure.ac" ]; then
78 (cd "servant" && autoreconf -i);
78 (cd "servant" && autoreconf -i);
@@ -95,18 +95,6 @@ install:
95 - if [ -f "doc/tutorial/configure.ac" ]; then
95 - if [ -f "doc/tutorial/configure.ac" ]; then
96 (cd "doc/tutorial" && autoreconf -i);
96 (cd "doc/tutorial" && autoreconf -i);
97 fi
97 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
98 - if [ -f "doc/cookbook/https/configure.ac" ]; then
111 (cd "doc/cookbook/https" && autoreconf -i);
99 (cd "doc/cookbook/https" && autoreconf -i);
112 fi
100 fi
@@ -120,7 +108,7 @@ install:
120 (cd "doc/cookbook/file-upload" && autoreconf -i);
108 (cd "doc/cookbook/file-upload" && autoreconf -i);
121 fi
109 fi
122 - rm -f cabal.project.freeze
110 - 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
111+ - 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)
112 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
125
113
126# Here starts the actual work to be performed for the package under test;
114# Here starts the actual work to be performed for the package under test;
@@ -135,22 +123,18 @@ script:
135 - (cd "servant-foreign" && cabal sdist)
123 - (cd "servant-foreign" && cabal sdist)
136 - (cd "servant-server" && cabal sdist)
124 - (cd "servant-server" && cabal sdist)
137 - (cd "doc/tutorial" && cabal sdist)
125 - (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)
126 - (cd "doc/cookbook/https" && cabal sdist)
143 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
127 - (cd "doc/cookbook/structuring-apis" && cabal sdist)
144 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
128 - (cd "doc/cookbook/using-custom-monad" && cabal sdist)
145 - (cd "doc/cookbook/file-upload" && cabal sdist)
129 - (cd "doc/cookbook/file-upload" && cabal sdist)
146 - echo -en 'travis_fold:end:sdist\\r'
130 - echo -en 'travis_fold:end:sdist\\r'
147 - echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
131 - 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}/
132+ - 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
133 - cd ${DISTDIR} || false
150 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
134 - 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"
135+ - "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"
136 - "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"
137+ - "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
138 - cat cabal.project
155 - echo -en 'travis_fold:end:unpack\\r'
139 - echo -en 'travis_fold:end:unpack\\r'
156
140
cabal.project+15−1
@@ -5,7 +5,18 @@ packages: servant/
5 servant-foreign/
5 servant-foreign/
6 servant-server/
6 servant-server/
7 doc/tutorial/
7 doc/tutorial/
8+
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+
9
20
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/tutorial/tutorial.cabal+1−1
@@ -34,7 +34,7 @@ library
34 -- Packages `servant` depends on.
34 -- Packages `servant` depends on.
35 -- We don't need to specify bounds here as this package is never released.
35 -- We don't need to specify bounds here as this package is never released.
36 build-depends:
36 build-depends:
37− base >= 4.7 && <4.11
37+ base >= 4.7 && <4.12
38 , aeson
38 , aeson
39 , aeson-compat
39 , aeson-compat
40 , attoparsec
40 , attoparsec
servant-client-core/servant-client-core.cabal+4−4
@@ -45,7 +45,7 @@ library
45 --
45 --
46 -- note: mtl lower bound is so low because of GHC-7.8
46 -- note: mtl lower bound is so low because of GHC-7.8
47 build-depends:
47 build-depends:
48− base >= 4.7 && < 4.11
48+ base >= 4.7 && < 4.12
49 , bytestring >= 0.10.4.0 && < 0.11
49 , bytestring >= 0.10.4.0 && < 0.11
50 , containers >= 0.5.5.1 && < 0.6
50 , containers >= 0.5.5.1 && < 0.6
51 , mtl >= 2.1 && < 2.3
51 , mtl >= 2.1 && < 2.3
@@ -64,7 +64,7 @@ library
64 build-depends:
64 build-depends:
65 base-compat >= 0.9.3 && < 0.10
65 base-compat >= 0.9.3 && < 0.10
66 , base64-bytestring >= 1.0.0.1 && < 1.1
66 , base64-bytestring >= 1.0.0.1 && < 1.1
67− , exceptions >= 0.8.3 && < 0.9
67+ , exceptions >= 0.8.3 && < 0.11
68 , generics-sop >= 0.3.1.0 && < 0.4
68 , generics-sop >= 0.3.1.0 && < 0.4
69 , http-api-data >= 0.3.7.1 && < 0.4
69 , http-api-data >= 0.3.7.1 && < 0.4
70 , http-media >= 0.7.1.1 && < 0.8
70 , http-media >= 0.7.1.1 && < 0.8
@@ -95,8 +95,8 @@ test-suite spec
95 -- Additonal dependencies
95 -- Additonal dependencies
96 build-depends:
96 build-depends:
97 deepseq >= 1.3.0.2 && <1.5
97 deepseq >= 1.3.0.2 && <1.5
98− , hspec >= 2.4.4 && <2.5
98+ , hspec >= 2.4.4 && <2.6
99 , QuickCheck >= 2.10.1 && < 2.12
99 , QuickCheck >= 2.10.1 && < 2.12
100
100
101 build-tool-depends:
101 build-tool-depends:
102− hspec-discover:hspec-discover >= 2.4.4 && <2.5
102+ 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
31 Servant.Client.Ghcjs
32 Servant.Client.Internal.XhrClient
32 Servant.Client.Internal.XhrClient
33 build-depends:
33 build-depends:
34− base >= 4.7 && < 4.11
34+ base >= 4.7 && < 4.12
35 , bytestring >= 0.10 && < 0.11
35 , bytestring >= 0.10 && < 0.11
36 , case-insensitive >= 1.2.0.0 && < 1.3.0.0
36 , case-insensitive >= 1.2.0.0 && < 1.3.0.0
37 , containers >= 0.5 && < 0.6
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
39 , ghcjs-base >= 0.2.0.0 && < 0.3.0.0
40 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0
40 , ghcjs-prim >= 0.1.0.0 && < 0.2.0.0
41 , http-media >= 0.6.2 && < 0.8
41 , http-media >= 0.6.2 && < 0.8
servant-client/servant-client.cabal+6−6
@@ -41,7 +41,7 @@ library
41 --
41 --
42 -- note: mtl lower bound is so low because of GHC-7.8
42 -- note: mtl lower bound is so low because of GHC-7.8
43 build-depends:
43 build-depends:
44− base >= 4.7 && < 4.11
44+ base >= 4.7 && < 4.12
45 , bytestring >= 0.10.4.0 && < 0.11
45 , bytestring >= 0.10.4.0 && < 0.11
46 , containers >= 0.5.5.1 && < 0.6
46 , containers >= 0.5.5.1 && < 0.6
47 , mtl >= 2.1 && < 2.3
47 , mtl >= 2.1 && < 2.3
@@ -59,19 +59,19 @@ library
59 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
59 -- 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.
60 -- Here can be exceptions if we really need features from the newer versions.
61 build-depends:
61 build-depends:
62− aeson >= 1.2.3.0 && < 1.3
62+ aeson >= 1.2.3.0 && < 1.4
63 , base-compat >= 0.9.3 && < 0.10
63 , base-compat >= 0.9.3 && < 0.10
64 , attoparsec >= 0.13.2.0 && < 0.14
64 , attoparsec >= 0.13.2.0 && < 0.14
65 , http-client >= 0.5.7.1 && < 0.6
65 , http-client >= 0.5.7.1 && < 0.6
66 , http-client-tls >= 0.3.5.1 && < 0.4
66 , http-client-tls >= 0.3.5.1 && < 0.4
67 , http-media >= 0.7.1.1 && < 0.8
67 , http-media >= 0.7.1.1 && < 0.8
68 , http-types >= 0.12 && < 0.13
68 , http-types >= 0.12 && < 0.13
69− , exceptions >= 0.8.3 && < 0.9
69+ , exceptions >= 0.8.3 && < 0.11
70 , monad-control >= 1.0.0.4 && < 1.1
70 , monad-control >= 1.0.0.4 && < 1.1
71 , semigroupoids >= 5.2.1 && < 5.3
71 , semigroupoids >= 5.2.1 && < 5.3
72 , stm >= 2.4.4.1 && < 2.5
72 , stm >= 2.4.4.1 && < 2.5
73 , transformers-base >= 0.4.4 && < 0.5
73 , transformers-base >= 0.4.4 && < 0.5
74− , transformers-compat >= 0.5.1 && < 0.6
74+ , transformers-compat >= 0.5.1 && < 0.7
75
75
76 hs-source-dirs: src
76 hs-source-dirs: src
77 default-language: Haskell2010
77 default-language: Haskell2010
@@ -114,7 +114,7 @@ test-suite spec
114 build-depends:
114 build-depends:
115 deepseq >= 1.3.0.2 && < 1.5
115 deepseq >= 1.3.0.2 && < 1.5
116 , generics-sop >= 0.3.1.0 && < 0.4
116 , generics-sop >= 0.3.1.0 && < 0.4
117− , hspec >= 2.4.4 && < 2.5
117+ , hspec >= 2.4.4 && < 2.6
118 , HUnit >= 1.6 && < 1.7
118 , HUnit >= 1.6 && < 1.7
119 , network >= 2.6.3.2 && < 2.7
119 , network >= 2.6.3.2 && < 2.7
120 , QuickCheck >= 2.10.1 && < 2.12
120 , QuickCheck >= 2.10.1 && < 2.12
@@ -122,4 +122,4 @@ test-suite spec
122 , servant-server == 0.13.*
122 , servant-server == 0.13.*
123
123
124 build-tool-depends:
124 build-tool-depends:
125− hspec-discover:hspec-discover >= 2.4.4 && < 2.5
125+ hspec-discover:hspec-discover >= 2.4.4 && < 2.6
servant-docs/servant-docs.cabal+4−4
@@ -41,7 +41,7 @@ library
41 --
41 --
42 -- note: mtl lower bound is so low because of GHC-7.8
42 -- note: mtl lower bound is so low because of GHC-7.8
43 build-depends:
43 build-depends:
44− base >= 4.7 && < 4.11
44+ base >= 4.7 && < 4.12
45 , bytestring >= 0.10.4.0 && < 0.11
45 , bytestring >= 0.10.4.0 && < 0.11
46 , text >= 1.2.3.0 && < 1.3
46 , text >= 1.2.3.0 && < 1.3
47
47
@@ -56,7 +56,7 @@ library
56 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
56 -- 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.
57 -- Here can be exceptions if we really need features from the newer versions.
58 build-depends:
58 build-depends:
59− aeson >= 1.2.3.0 && < 1.3
59+ aeson >= 1.2.3.0 && < 1.4
60 , aeson-pretty >= 0.8.5 && < 0.9
60 , aeson-pretty >= 0.8.5 && < 0.9
61 , base-compat >= 0.9.3 && < 0.10
61 , base-compat >= 0.9.3 && < 0.10
62 , case-insensitive >= 1.2.0.10 && < 1.3
62 , case-insensitive >= 1.2.0.10 && < 1.3
@@ -108,7 +108,7 @@ test-suite spec
108
108
109 -- Additonal dependencies
109 -- Additonal dependencies
110 build-depends:
110 build-depends:
111− hspec >= 2.4.4 && < 2.5
111+ hspec >= 2.4.4 && < 2.6
112
112
113 build-tool-depends:
113 build-tool-depends:
114− hspec-discover:hspec-discover >=2.4.4 && <2.5
114+ 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)
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)
2[Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
3
3
4+0.11.1
5+------
6+
7+- Add missing `Semigroup` instances
8+
40.11
90.11
5----
10----
6
11
servant-foreign/servant-foreign.cabal+8−4
@@ -1,5 +1,5 @@
1name: servant-foreign
1name: servant-foreign
2−version: 0.11
2+version: 0.11.1
3synopsis: Helpers for generating clients for servant APIs in any programming language
3synopsis: Helpers for generating clients for servant APIs in any programming language
4description:
4description:
5 Helper types and functions for generating client functions for servant APIs in any programming language
5 Helper types and functions for generating client functions for servant APIs in any programming language
@@ -42,9 +42,13 @@ library
42 --
42 --
43 -- 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
44 build-depends:
44 build-depends:
45− base >= 4.7 && <4.11
45+ base >= 4.7 && <4.12
46 , text >= 1.2.3.0 && < 1.3
46 , text >= 1.2.3.0 && < 1.3
47
47
48+ if !impl(ghc >= 8.0)
49+ build-depends:
50+ semigroups >=0.18.3 && <0.19
51+
48 -- Servant dependencies
52 -- Servant dependencies
49 build-depends:
53 build-depends:
50 servant == 0.13.*
54 servant == 0.13.*
@@ -79,8 +83,8 @@ test-suite spec
79
83
80 -- Additonal dependencies
84 -- Additonal dependencies
81 build-depends:
85 build-depends:
82− hspec >= 2.4.4 && <2.5
86+ hspec >= 2.4.4 && <2.6
83
87
84 build-tool-depends:
88 build-tool-depends:
85− hspec-discover:hspec-discover >=2.4.4 && <2.5
89+ hspec-discover:hspec-discover >=2.4.4 && <2.6
86 default-language: Haskell2010
90 default-language: Haskell2010
servant-foreign/src/Servant/Foreign/Internal.hs+3−2
@@ -27,6 +27,7 @@ import Control.Lens (makePrisms, makeLenses, Getter, (&), (<>~), (%~),
27 (.~))
27 (.~))
28import Data.Data (Data)
28import Data.Data (Data)
29import Data.Proxy
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)
39
40
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)
42
43
43makePrisms ''FunctionName
44makePrisms ''FunctionName
44
45
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)
47
48
48makePrisms ''PathSegment
49makePrisms ''PathSegment
49
50
servant-server/servant-server.cabal+7−7
@@ -60,7 +60,7 @@ library
60 --
60 --
61 -- note: mtl lower bound is so low because of GHC-7.8
61 -- note: mtl lower bound is so low because of GHC-7.8
62 build-depends:
62 build-depends:
63− base >= 4.7 && < 4.11
63+ base >= 4.7 && < 4.12
64 , bytestring >= 0.10.4.0 && < 0.11
64 , bytestring >= 0.10.4.0 && < 0.11
65 , containers >= 0.5.5.1 && < 0.6
65 , containers >= 0.5.5.1 && < 0.6
66 , mtl >= 2.1 && < 2.3
66 , mtl >= 2.1 && < 2.3
@@ -75,11 +75,11 @@ library
75 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
75 -- 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.
76 -- Here can be exceptions if we really need features from the newer versions.
77 build-depends:
77 build-depends:
78− aeson >= 1.2.3.0 && < 1.3
78+ aeson >= 1.2.3.0 && < 1.4
79 , base-compat >= 0.9.3 && < 0.10
79 , base-compat >= 0.9.3 && < 0.10
80 , attoparsec >= 0.13.2.0 && < 0.14
80 , attoparsec >= 0.13.2.0 && < 0.14
81 , base64-bytestring >= 1.0.0.1 && < 1.1
81 , base64-bytestring >= 1.0.0.1 && < 1.1
82− , exceptions >= 0.8.3 && < 0.9
82+ , exceptions >= 0.8.3 && < 0.11
83 , http-api-data >= 0.3.7.1 && < 0.4
83 , http-api-data >= 0.3.7.1 && < 0.4
84 , http-media >= 0.7.1.1 && < 0.8
84 , http-media >= 0.7.1.1 && < 0.8
85 , http-types >= 0.12 && < 0.13
85 , http-types >= 0.12 && < 0.13
@@ -93,7 +93,7 @@ library
93 , resourcet >= 1.1.9 && < 1.3
93 , resourcet >= 1.1.9 && < 1.3
94 , tagged >= 0.8.5 && < 0.9
94 , tagged >= 0.8.5 && < 0.9
95 , transformers-base >= 0.4.4 && < 0.5
95 , transformers-base >= 0.4.4 && < 0.5
96− , transformers-compat >= 0.5.1 && < 0.6
96+ , transformers-compat >= 0.5.1 && < 0.7
97 , wai >= 3.2.1.1 && < 3.3
97 , wai >= 3.2.1.1 && < 3.3
98 , wai-app-static >= 3.1.6.1 && < 3.2
98 , wai-app-static >= 3.1.6.1 && < 3.2
99 , warp >= 3.2.13 && < 3.3
99 , warp >= 3.2.13 && < 3.3
@@ -164,7 +164,7 @@ test-suite spec
164 -- Additonal dependencies
164 -- Additonal dependencies
165 build-depends:
165 build-depends:
166 directory >= 1.2.1.0 && < 1.4
166 directory >= 1.2.1.0 && < 1.4
167− , hspec >= 2.4.4 && < 2.5
167+ , hspec >= 2.4.4 && < 2.6
168 , hspec-wai >= 0.9 && < 0.10
168 , hspec-wai >= 0.9 && < 0.10
169 , should-not-typecheck >= 2.1.0 && < 2.2
169 , should-not-typecheck >= 2.1.0 && < 2.2
170 , parsec >= 3.1.11 && < 3.2
170 , parsec >= 3.1.11 && < 3.2
@@ -173,13 +173,13 @@ test-suite spec
173 , temporary >= 1.2.0.3 && < 1.3
173 , temporary >= 1.2.0.3 && < 1.3
174
174
175 build-tool-depends:
175 build-tool-depends:
176− hspec-discover:hspec-discover >=2.4.4 && <2.5
176+ hspec-discover:hspec-discover >=2.4.4 && <2.6
177
177
178test-suite doctests
178test-suite doctests
179 build-depends:
179 build-depends:
180 base
180 base
181 , servant-server
181 , servant-server
182− , doctest >= 0.13.0 && <0.14
182+ , doctest >= 0.13.0 && <0.16
183 type: exitcode-stdio-1.0
183 type: exitcode-stdio-1.0
184 main-is: test/doctests.hs
184 main-is: test/doctests.hs
185 buildable: True
185 buildable: True
servant/servant.cabal+6−6
@@ -69,7 +69,7 @@ library
69 --
69 --
70 -- note: mtl lower bound is so low because of GHC-7.8
70 -- note: mtl lower bound is so low because of GHC-7.8
71 build-depends:
71 build-depends:
72− base >= 4.7 && < 4.11
72+ base >= 4.7 && < 4.12
73 , bytestring >= 0.10.4.0 && < 0.11
73 , bytestring >= 0.10.4.0 && < 0.11
74 , mtl >= 2.1 && < 2.3
74 , mtl >= 2.1 && < 2.3
75 , text >= 1.2.3.0 && < 1.3
75 , text >= 1.2.3.0 && < 1.3
@@ -82,7 +82,7 @@ library
82 -- Here can be exceptions if we really need features from the newer versions.
82 -- Here can be exceptions if we really need features from the newer versions.
83 build-depends:
83 build-depends:
84 base-compat >= 0.9.3 && < 0.10
84 base-compat >= 0.9.3 && < 0.10
85− , aeson >= 1.2.3.0 && < 1.3
85+ , aeson >= 1.2.3.0 && < 1.4
86 , attoparsec >= 0.13.2.0 && < 0.14
86 , attoparsec >= 0.13.2.0 && < 0.14
87 , case-insensitive >= 1.2.0.10 && < 1.3
87 , case-insensitive >= 1.2.0.10 && < 1.3
88 , http-api-data >= 0.3.7.1 && < 0.4
88 , http-api-data >= 0.3.7.1 && < 0.4
@@ -153,22 +153,22 @@ test-suite spec
153 -- Additonal dependencies
153 -- Additonal dependencies
154 build-depends:
154 build-depends:
155 aeson-compat >= 0.3.3 && < 0.4
155 aeson-compat >= 0.3.3 && < 0.4
156− , hspec >= 2.4.4 && < 2.5
156+ , hspec >= 2.4.4 && < 2.6
157 , QuickCheck >= 2.10.1 && < 2.12
157 , QuickCheck >= 2.10.1 && < 2.12
158 , quickcheck-instances >= 0.3.16 && < 0.4
158 , quickcheck-instances >= 0.3.16 && < 0.4
159
159
160 build-tool-depends:
160 build-tool-depends:
161− hspec-discover:hspec-discover >= 2.4.4 && < 2.5
161+ hspec-discover:hspec-discover >= 2.4.4 && < 2.6
162
162
163test-suite doctests
163test-suite doctests
164 build-depends:
164 build-depends:
165 base
165 base
166 , servant
166 , servant
167− , doctest >= 0.13.0 && <0.14
167+ , doctest >= 0.13.0 && <0.16
168
168
169 -- We test Links failure with doctest, so we need extra dependencies
169 -- We test Links failure with doctest, so we need extra dependencies
170 build-depends:
170 build-depends:
171− hspec >= 2.4.4 && < 2.5
171+ hspec >= 2.4.4 && < 2.6
172
172
173 type: exitcode-stdio-1.0
173 type: exitcode-stdio-1.0
174 main-is: test/doctests.hs
174 main-is: test/doctests.hs