Skip to content

use namespaced jsoo interfaces #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avsm merged 2 commits into from
Feb 3, 2019
Merged

use namespaced jsoo interfaces #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3768aaf
use namespaces jsoo interfaces
avsm Feb 3, 2019
2bd6c0f
constrain base64 version
avsm Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions cohttp-lwt-jsoo.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@ depends: [
"cohttp" {>= "1.0.0"}
"cohttp-lwt" {>= "1.0.0"}
"lwt" {>= "3.0.0"}
"js_of_ocaml" {>= "3.0"}
"js_of_ocaml-ppx" {>= "3.0"}
"js_of_ocaml-lwt"
]
conflicts: [
"lwt" {< "2.5.0"}
"js_of_ocaml" {< "2.8"}
"js_of_ocaml" {>= "3.3.0"}
"js_of_ocaml-ppx" {>= "3.3.0"}
"js_of_ocaml-lwt" {>= "3.3.0"}
]
build: [
["dune" "subst"] {pinned}
Expand Down
1 change: 1 addition & 0 deletions cohttp-lwt-jsoo/src/cohttp_lwt_xhr.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
}}}*)

open Js_of_ocaml
module C = Cohttp
module CLB = Cohttp_lwt.Body

Expand Down
2 changes: 1 addition & 1 deletion cohttp-lwt-jsoo/src/cohttp_lwt_xhr.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module type Params = sig

(** JavaScript string to OCaml conversion. [Js.to_bytestring] or
[Js.to_string] *)
val convert_body_string : Js.js_string Js.t -> string
val convert_body_string : Js_of_ocaml.Js.js_string Js_of_ocaml.Js.t -> string

(** Whether withCredentials property of XHR is set. *)
val with_credentials : bool
Expand Down
2 changes: 1 addition & 1 deletion cohttp.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ depends: [
"ppx_fields_conv" {>= "v0.9.0"}
"ppx_sexp_conv" {>= "v0.9.0"}
"stringext"
"base64" {>= "2.0.0"}
"base64" {>= "2.0.0" & <"3.0.0"}
"fmt" {with-test}
"jsonm" {build}
"alcotest" {with-test}
Expand Down