Merge pull request mirage#467 from samoht/update-conduit-and-cohttp

Update to cohttp.0.99

CHANGES.md

@@ -1,3 +1,7 @@
+### 1.3.1 (2017-08-02)
+
+- irmin-http: update to cohttp.0.99 (#467, @samoht)
+
 ### 1.3.0 (2017-07-27)
 
 **irmin-chunk**

irmin-http.opam

@@ -18,7 +18,7 @@ depends: [
   "crunch"
   "webmachine" {>= "0.3.2"}
   "irmin"  {>= "1.2.0"}
-  "cohttp" {>= "0.18.3" & < "0.99.0"}
+  "cohttp-lwt" {>= "0.99.0"}
   "irmin-git" {test & >= "1.2.0"}
   "irmin-mem" {test & >= "1.2.0"}
   "alcotest"  {test}

irmin-unix.opam

@@ -14,16 +14,15 @@ build: [
 build-test: ["jbuilder" "runtest" "-p" name]
 
 depends: [
-  "jbuilder" {build & >= "1.0+beta10"}
+  "jbuilder"   {build & >= "1.0+beta10"}
   "irmin"      {>= "1.2.0"}
   "irmin-mem"  {>= "1.2.0"}
   "irmin-git"  {>= "1.2.0"}
   "irmin-http" {>= "1.2.0"}
   "irmin-fs"   {>= "1.2.0"}
   "git-unix"   {>= "1.11.0"}
   "irmin-watcher" {>= "0.2.0"}
-  "irmin-mirage" {test & >= "1.2.0"}
-  "alcotest"     {test}
-  "mtime"        {test & >= "1.0.0"}
+  "alcotest" {test}
+  "mtime"    {test & >= "1.0.0"}
 ]
 available: [ocaml-version >= "4.01.0"]

src/irmin-http/irmin_http.ml

@@ -115,7 +115,7 @@ let json_stream (stream: string Lwt_stream.t): Jsonm.lexeme list Lwt_stream.t =
 let of_json_string t str = T.decode_json t (Jsonm.decoder (`String str))
 let to_json_string t = Fmt.to_to_string (T.pp_json t)
 
-module Helper (Client: Cohttp_lwt.Client) = struct
+module Helper (Client: Cohttp_lwt.S.Client) = struct
 
   let err_bad_version v =
     invalid_arg "bad server version: expecting %s, but got %s"
@@ -183,7 +183,7 @@ module Helper (Client: Cohttp_lwt.Client) = struct
 
 end
 
-module RO (Client: Cohttp_lwt.Client)
+module RO (Client: Cohttp_lwt.S.Client)
     (K: Irmin.Contents.Conv)
     (V: Irmin.Contents.Conv)
 = struct
@@ -215,7 +215,7 @@ module RO (Client: Cohttp_lwt.Client)
 
 end
 
-module AO (Client: Cohttp_lwt.Client)
+module AO (Client: Cohttp_lwt.S.Client)
     (K: Irmin.Hash.S)
     (V: Irmin.Contents.Conv) =
 struct
@@ -225,7 +225,7 @@ struct
     HTTP.call `POST t.uri [t.items] ~body K.of_string
 end
 
-module RW (Client: Cohttp_lwt.Client)
+module RW (Client: Cohttp_lwt.S.Client)
     (K: Irmin.Contents.Conv)
     (V: Irmin.Contents.Conv)
 = struct
@@ -362,7 +362,7 @@ module RW (Client: Cohttp_lwt.Client)
 end
 
 module Make
-    (Client: Cohttp_lwt.Client)
+    (Client: Cohttp_lwt.S.Client)
     (M: Irmin.Metadata.S)
     (C: Irmin.Contents.S)
     (P: Irmin.Path.S)
@@ -439,7 +439,7 @@ struct
   include Irmin.Make_ext(X)
 end
 
-module KV (H: Cohttp_lwt.Client) (C: Irmin.Contents.S) =
+module KV (H: Cohttp_lwt.S.Client) (C: Irmin.Contents.S) =
   Make (H)
     (Irmin.Metadata.None)
     (C)

src/irmin-http/irmin_http.mli

@@ -20,5 +20,5 @@ val config: ?config:Irmin.config -> Uri.t -> Irmin.config
 
 val uri: Uri.t option Irmin.Private.Conf.key
 
-module Make (C: Cohttp_lwt.Client): Irmin.S_MAKER
-module KV (C: Cohttp_lwt.Client): Irmin.KV_MAKER
+module Make (C: Cohttp_lwt.S.Client): Irmin.S_MAKER
+module KV (C: Cohttp_lwt.S.Client): Irmin.KV_MAKER

src/irmin-http/irmin_http_server.ml

@@ -31,7 +31,7 @@ module type S = sig
   val v: ?strict:bool -> repo -> t
 end
 
-module Make (HTTP: Cohttp_lwt.Server) (S: Irmin.S) = struct
+module Make (HTTP: Cohttp_lwt.S.Server) (S: Irmin.S) = struct
 
   module Wm = struct
     module Rd = Webmachine.Rd

src/irmin-http/irmin_http_server.mli

@@ -32,7 +32,7 @@ module type S = sig
 
 end
 
-module Make (HTTP: Cohttp_lwt.Server) (S: Irmin.S): S with
+module Make (HTTP: Cohttp_lwt.S.Server) (S: Irmin.S): S with
   type repo = S.Repo.t and
   type t = HTTP.t
 (** Create an HTTP server, serving the contents of an Irmin database. *)

src/irmin-http/jbuild

@@ -4,4 +4,4 @@
  ((name        irmin_http)
   (public_name irmin-http)
   (wrapped     false)
-  (libraries   (irmin cohttp webmachine))))
+  (libraries   (irmin cohttp-lwt webmachine))))