git.iko.soy/typeable/servant
on master help sign in
http-api-data-0.4
commit3b8db040f3b5916bcacce4473c099c8643b53cd7 authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 13 Nov 2018, 16:51 (8 years ago) parente0e0674
7 files changed+21−22
compare with master
unifiedsplit
.travis.yml+2−2 cabal.project+1−1 servant-client-core/servant-client-core.cabal−1 servant-client-core/src/Servant/Client/Core/Internal/Request.hs+1−1 servant-server/servant-server.cabal+9−9 servant/servant.cabal+7−7 stack.yaml+1−1
.travis.yml+2−2
@@ -71,7 +71,7 @@ install:
7171 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7272 - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"servant-machines\" \"servant-conduit\" \"servant-pipes\" \"doc/cookbook/basic-auth\" \"doc/cookbook/curl-mock\" \"doc/cookbook/basic-streaming\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/file-upload\" \"doc/cookbook/generic\" \"doc/cookbook/hoist-server-with-context\" \"doc/cookbook/https\" \"doc/cookbook/jwt-and-basic-auth\" \"doc/cookbook/sentry\" \"doc/cookbook/testing\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\" \"doc/cookbook/using-free-client\"\\n' > cabal.project"
7373 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
74− - "echo 'allow-newer: servant-js:base, servant-pagination:servant, servant-pagination:servant-server,servant-multipart:servant, servant-multipart:servant-server,servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-auth-server:servant, servant-auth-server:servant-server,servant-js:servant, servant-js:servant-foreign,servant-quickcheck:hspec' >> cabal.project"
74+ - "echo 'allow-newer: servant-js:base, servant-pagination:servant, servant-pagination:servant-server,servant-multipart:servant, servant-multipart:servant-server,servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,servant-js:servant, servant-js:servant-foreign,servant-quickcheck:hspec' >> cabal.project"
7575 - touch cabal.project.local
7676 - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-sentry | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
7777 - cat cabal.project || true
@@ -168,7 +168,7 @@ script:
168168 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
169169 - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal servant-machines-*/*.cabal servant-conduit-*/*.cabal servant-pipes-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-curl-mock-*/*.cabal cookbook-basic-streaming-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-file-upload-*/*.cabal cookbook-generic-*/*.cabal cookbook-hoist-server-with-context-*/*.cabal cookbook-https-*/*.cabal cookbook-jwt-and-basic-auth-*/*.cabal cookbook-sentry-*/*.cabal cookbook-testing-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal cookbook-using-free-client-*/*.cabal\\n' > cabal.project"
170170 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
171− - "echo 'allow-newer: servant-js:base, servant-pagination:servant, servant-pagination:servant-server,servant-multipart:servant, servant-multipart:servant-server,servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-auth-server:servant, servant-auth-server:servant-server,servant-js:servant, servant-js:servant-foreign,servant-quickcheck:hspec' >> cabal.project"
171+ - "echo 'allow-newer: servant-js:base, servant-pagination:servant, servant-pagination:servant-server,servant-multipart:servant, servant-multipart:servant-server,servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,servant-js:servant, servant-js:servant-foreign,servant-quickcheck:hspec' >> cabal.project"
172172 - touch cabal.project.local
173173 - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant | grep -vw -- servant-client | grep -vw -- servant-client-core | grep -vw -- servant-docs | grep -vw -- servant-foreign | grep -vw -- servant-server | grep -vw -- tutorial | grep -vw -- servant-machines | grep -vw -- servant-conduit | grep -vw -- servant-pipes | grep -vw -- cookbook-basic-auth | grep -vw -- cookbook-curl-mock | grep -vw -- cookbook-basic-streaming | grep -vw -- cookbook-db-postgres-pool | grep -vw -- cookbook-db-sqlite-simple | grep -vw -- cookbook-file-upload | grep -vw -- cookbook-generic | grep -vw -- cookbook-hoist-server-with-context | grep -vw -- cookbook-https | grep -vw -- cookbook-jwt-and-basic-auth | grep -vw -- cookbook-sentry | grep -vw -- cookbook-testing | grep -vw -- cookbook-structuring-apis | grep -vw -- cookbook-using-custom-monad | grep -vw -- cookbook-using-free-client | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
174174 - cat cabal.project || true
cabal.project+1−1
@@ -41,6 +41,6 @@ allow-newer:
4141 servant-pagination:servant, servant-pagination:servant-server,
4242 servant-multipart:servant, servant-multipart:servant-server,
4343 servant-quickcheck:servant, servant-quickcheck:servant-client, servant-quickcheck:servant-server,
44− servant-auth-server:servant, servant-auth-server:servant-server,
44+ servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,
4545 servant-js:servant, servant-js:servant-foreign,
4646 servant-quickcheck:hspec
servant-client-core/servant-client-core.cabal−1
@@ -71,7 +71,6 @@ library
7171 , exceptions >= 0.10.0 && < 0.11
7272 , free >= 5.1 && < 5.2
7373 , generics-sop >= 0.4.0.1 && < 0.5
74− , http-api-data >= 0.3.10 && < 0.4
7574 , http-media >= 0.7.1.3 && < 0.8
7675 , http-types >= 0.12.2 && < 0.13
7776 , network-uri >= 2.6.1.0 && < 2.7
servant-client-core/src/Servant/Client/Core/Internal/Request.hs+1−1
@@ -40,7 +40,7 @@ import Network.HTTP.Media
4040import Network.HTTP.Types
4141 (Header, HeaderName, HttpVersion (..), Method, QueryItem,
4242 Status (..), http11, methodGet)
43−import Web.HttpApiData
43+import Servant.API
4444 (ToHttpApiData, toEncodedUrlPiece, toHeader)
4545
4646-- | A type representing possible errors in a request
servant-server/servant-server.cabal+9−9
@@ -65,18 +65,19 @@ library
6565 -- Bundled with GHC: Lower bound to not force re-installs
6666 -- text and mtl are bundled starting with GHC-8.4
6767 build-depends:
68− base >= 4.9 && < 4.13
69− , bytestring >= 0.10.8.1 && < 0.11
70− , containers >= 0.5.7.1 && < 0.7
71− , mtl >= 2.2.2 && < 2.3
72− , text >= 1.2.3.0 && < 1.3
73− , transformers >= 0.5.2.0 && < 0.6
74− , filepath >= 1.4.1.1 && < 1.5
68+ base >= 4.9 && < 4.13
69+ , bytestring >= 0.10.8.1 && < 0.11
70+ , containers >= 0.5.7.1 && < 0.7
71+ , mtl >= 2.2.2 && < 2.3
72+ , text >= 1.2.3.0 && < 1.3
73+ , transformers >= 0.5.2.0 && < 0.6
74+ , filepath >= 1.4.1.1 && < 1.5
7575
7676 -- Servant dependencies
7777 -- strict dependency as we re-export 'servant' things.
7878 build-depends:
79− servant >= 0.15 && < 0.15.1
79+ servant >= 0.15 && < 0.15.1
80+ , http-api-data >= 0.4 && < 0.4.1
8081
8182 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
8283 -- Here can be exceptions if we really need features from the newer versions.
@@ -84,7 +85,6 @@ library
8485 base-compat >= 0.10.5 && < 0.11
8586 , base64-bytestring >= 1.0.0.1 && < 1.1
8687 , exceptions >= 0.10.0 && < 0.11
87− , http-api-data >= 0.3.10 && < 0.4
8888 , http-media >= 0.7.1.3 && < 0.8
8989 , http-types >= 0.12.2 && < 0.13
9090 , network-uri >= 2.6.1.0 && < 2.7
servant/servant.cabal+7−7
@@ -88,18 +88,18 @@ library
8888 --
8989 -- note: mtl lower bound is so low because of GHC-7.8
9090 build-depends:
91− base >= 4.9 && < 4.13
92− , bytestring >= 0.10.8.1 && < 0.11
93− , mtl >= 2.2.2 && < 2.3
94− , transformers >= 0.5.2.0 && < 0.6
95− , text >= 1.2.3.0 && < 1.3
91+ base >= 4.9 && < 4.13
92+ , bytestring >= 0.10.8.1 && < 0.11
93+ , mtl >= 2.2.2 && < 2.3
94+ , transformers >= 0.5.2.0 && < 0.6
95+ , text >= 1.2.3.0 && < 1.3
9696
9797
9898 -- We depend (heavily) on the API of these packages:
9999 -- i.e. re-export, or allow using without direct dependency
100100 build-depends:
101− http-api-data >= 0.3.10 && < 0.3.11
102− , singleton-bool >= 0.1.4 && < 0.1.5
101+ http-api-data >= 0.4 && < 0.4.1
102+ , singleton-bool >= 0.1.4 && < 0.1.5
103103
104104 -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
105105 -- Here can be exceptions if we really need features from the newer versions.
stack.yaml+1−1
@@ -22,7 +22,7 @@ extra-deps:
2222- hspec-2.6.0
2323- hspec-core-2.6.0
2424- hspec-discover-2.6.0
25−- http-api-data-0.3.10
25+- http-api-data-0.4
2626- http-media-0.7.1.3
2727- network-2.8.0.0
2828- pipes-safe-2.3.1