diff --git a/CHANGES.md b/CHANGES.md index a2a20b02bc..a98e1666fc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,6 @@ ## dev +- support uri.3.0.0 that has optional sexp support (@avsm) - use re.1.9.0 api to remove deprecation warnings (#664 @vbmithr) ## v2.1.2 (2019-04-09) diff --git a/cohttp-async.opam b/cohttp-async.opam index 4946733c4f..a4fe6a6f80 100644 --- a/cohttp-async.opam +++ b/cohttp-async.opam @@ -39,6 +39,7 @@ depends: [ "ppx_sexp_conv" {>= "v0.9.0"} "ounit" {with-test} "uri" {>= "2.0.0"} + "uri-sexp" ] build: [ ["dune" "subst"] {pinned} diff --git a/cohttp-async/src/dune b/cohttp-async/src/dune index 2277370154..e772076216 100644 --- a/cohttp-async/src/dune +++ b/cohttp-async/src/dune @@ -3,5 +3,5 @@ (synopsis "Async backend") (public_name cohttp-async) (libraries logs.fmt base fmt async_unix async_kernel async_extra uri - uri.services uri.sexp ipaddr.unix conduit-async magic-mime cohttp) + uri.services uri-sexp ipaddr.unix conduit-async magic-mime cohttp) (preprocess (pps ppx_sexp_conv))) diff --git a/cohttp.opam b/cohttp.opam index 371d3d0f50..0849b093c0 100644 --- a/cohttp.opam +++ b/cohttp.opam @@ -36,6 +36,7 @@ depends: [ "dune" {build & >= "1.1.0"} "re" {>= "1.9.0"} "uri" {>= "2.0.0"} + "uri-sexp" "fieldslib" "sexplib0" "ppx_fields_conv" {>= "v0.9.0"} diff --git a/cohttp/src/dune b/cohttp/src/dune index a69db3d3a3..107da89505 100644 --- a/cohttp/src/dune +++ b/cohttp/src/dune @@ -10,7 +10,7 @@ (public_name cohttp) (synopsis "Co-operative Client/Server HTTP library.") (preprocess (pps ppx_fields_conv ppx_sexp_conv)) - (libraries re stringext uri uri.sexp fieldslib sexplib0 bytes base64)) + (libraries re stringext uri uri-sexp fieldslib sexplib0 bytes base64)) (ocamllex accept_lexer) (ocamlyacc accept_parser)