Merge PR #545 (@smondet, Recent Cohttp & JSOO)

.travis.yml

@@ -5,4 +5,4 @@ os:
 - osx
 env:
   - OCAML_VERSION=4.03.0
-  - OCAML_VERSION=4.04.0
+  - OCAML_VERSION=4.04.2

myocamlbuild.ml

@@ -4,7 +4,7 @@ let (//) = Filename.concat
 let failwithf fmt = ksprintf failwith fmt
 
 let project_name = "ketrew"
-let version = "3.2.0"
+let version = "3.2.0+dev"
 
 let build_tests =
   try Sys.getenv "WITH_TESTS" = "true" with _ -> false
@@ -32,13 +32,13 @@ let lwt_react =
   else "lwt.react"
 
 let lwt_unix_lib_packages = pure_lib_packages @ [
-    "threads"; "pvem_lwt_unix"; "cmdliner"; "cohttp.lwt"; "conduit";
+    "threads"; "pvem_lwt_unix"; "cmdliner"; "cohttp-lwt-unix"; "conduit";
     "dynlink"; "findlib"; lwt_react;
   ]
   @ (if with_postgresql then ["postgresql"] else [])
 
 let joo_packages = pure_lib_packages @ [
-    "js_of_ocaml"; "js_of_ocaml.ppx"; "js_of_ocaml.tyxml";
+    "js_of_ocaml"; "js_of_ocaml-lwt"; "js_of_ocaml-ppx"; "js_of_ocaml-tyxml";
   ]
 
 let ocaml_options (f : _ Project.with_options) =

opam/opam

@@ -27,10 +27,16 @@ depends: [
   "yojson" "uri"
   "ppx_deriving"
   "ppx_deriving_yojson" {>= "3.0"}
-  "cohttp" {>= "0.21.0" & <= "0.22.0"} "lwt"
+  "cohttp-lwt-unix" {>= "0.99.0"}
+  "lwt"
   "conduit"
   "lwt_react"
-  "js_of_ocaml" {>= "2.6" & <= "2.8.4" } "tyxml" {>= "4.0.0"} "reactiveData" {>= "0.2"}
+  "js_of_ocaml" {>= "3.0"}
+  "js_of_ocaml-ppx" {>= "3.0"}
+  "js_of_ocaml-tyxml" {>= "3.0"}
+  "js_of_ocaml-lwt" {>= "3.0"}
+  "tyxml" {>= "4.0.0"}
+  "reactiveData" {>= "0.2"}
   ]
 depopts: [
   "postgresql"

src/client-joo/protocol_client.ml

@@ -178,7 +178,7 @@ let call ?(timeout = 20.) t msg =
       Lwt.(fun () ->
           pick [
             begin
-              Jsonp.call_custom_url (jsonp_call url msg)
+              Lwt_jsonp.call_custom_url (jsonp_call url msg)
               >>= fun msg ->
               return (`String msg)
             end;