update Libraries versions

 * ocaml version minimum is 4.07
 * git-ocaml is now 2.0
 * patience-diff is 0.11. (version 0.12 is not compatible with windows)

Author: jnavila

.appveyor.yml

@@ -6,7 +6,7 @@ environment:
   FORK_BRANCH: master
   CYG_ROOT: C:\cygwin64
   PACKAGE: plotkicadsch
-  OPAM_SWITCH: 4.06.0+mingw64c
+  OPAM_SWITCH: 4.07.0+mingw64c
   PINS: kicadsch:. plotkicadsch:.
 
 install:

.travis.yml

@@ -5,5 +5,5 @@ services:
 install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh
 script: bash -ex ./.travis-docker.sh
 env:
-  - OCAML_VERSION=4.06 DISTRO="ubuntu-16.04" PACKAGE=kicadsch
-  - PINS="kicadsch:." OCAML_VERSION=4.06 DISTRO="ubuntu-16.04" PACKAGE=plotkicadsch
+  - OCAML_VERSION=4.07 DISTRO="ubuntu-16.04" PACKAGE=kicadsch
+  - PINS="kicadsch:." OCAML_VERSION=4.07 DISTRO="ubuntu-16.04" PACKAGE=plotkicadsch

plotkicadsch.opam

@@ -24,10 +24,10 @@ depends: [
   "lwt"
   "lwt_ppx" {build}
   "sha"
-  "git" {< "2.0.0"}
+  "git" {>= "2.0.0"}
   "git-unix"
   "base64" {>= "3.0.0"}
-  "patience_diff" { >= "v0.10.0" }
+  "patience_diff" { < "v0.12.0" }
   "core_kernel"
   "cmdliner"
 ]

plotkicadsch/src/plotgitsch.ml

@@ -22,12 +22,12 @@ exception InternalGitError of string
 let git_fs commitish =
   ( module struct
     open Git_unix
-    module Search = Git.Search.Make (FS)
+    module Search = Git.Search.Make (Store)
 
     let rev_parse r =
       SysAbst.pread "git" [|"rev-parse"; r ^ "^{commit}"|]
       >>= fun s ->
-      try Lwt.return @@ Git_unix.Hash_IO.of_hex @@ String.prefix s 40
+      try Lwt.return @@ Store.Hash.of_hex @@ String.prefix s 40
       with _ -> Lwt.fail (InternalGitError ("cannot parse rev " ^ r))
 
     let doc = "Git rev " ^ commitish
@@ -56,7 +56,13 @@ let git_fs commitish =
       in
       recurse @@ (Sys.getcwd (), [])
 
-    let fs = git_root >>= fun (root, _) -> FS.create ~root ()
+    let fs =
+      let%lwt root, _ = git_root in
+      match%lwt Store.v (Fpath.v root) with
+      | Ok s ->
+          Lwt.return s
+      | Error e ->
+          Lwt.fail (InternalGitError (Fmt.strf "%a" Store.pp_error e))
 
     let theref = rev_parse commitish
 
@@ -72,30 +78,31 @@ let git_fs commitish =
             (InternalGitError
                ("path not found: /" ^ String.concat ~sep:Filename.dir_sep path))
       | Some sha -> (
-          match%lwt FS.read t sha with
-          | Some a ->
+          match%lwt Store.read t sha with
+          | Ok a ->
               action a
-          | None ->
-              Lwt.fail (InternalGitError "sha not found") )
+          | Error e ->
+              Lwt.fail (InternalGitError (Fmt.strf "%a" Store.pp_error e)) )
 
     let get_content filename =
       with_path filename
       @@ function
-      | Git.Value.Blob b ->
-          Lwt.return (Git.Blob.to_raw b)
+      | Store.Value.Blob b ->
+          Lwt.return (Store.Value.Blob.to_string b)
       | _ ->
           Lwt.fail (InternalGitError "not a valid path")
 
     let find_file filter t =
-      let open Git.Tree in
-      t
-      |> List.filter ~f:(fun e -> filter e.name)
-      |> List.map ~f:(fun e -> (e.name, Git.Hash.to_hex e.node))
+      let open Store.Value.Tree in
+      to_list t
+      |> List.filter_map ~f:(fun {name; node; _} ->
+             if filter name then Some (name, Store.Hash.to_hex node) else None
+         )
 
     let list_files pattern =
       with_path []
       @@ function
-      | Git.Value.Tree t ->
+      | Store.Value.Tree t ->
           Lwt.return @@ find_file pattern t
       | _ ->
           Lwt.fail (InternalGitError "not a tree!")

plotkicadsch/src/sysAbst.ml

@@ -68,10 +68,10 @@ let build_tmp_svg_name ~keep aprefix aschname =
   in
   match detect_os () with
   | MacOS | Linux ->
-      Filename.temp_file root_prefix ".svg"
+      Stdlib.Filename.temp_file root_prefix ".svg"
   | Cygwin | Windows ->
       if keep then root_prefix ^ ".svg"
-      else Filename.temp_file root_prefix ".svg"
+      else Stdlib.Filename.temp_file root_prefix ".svg"
 
 let finalize_tmp_file fnl ~keep_as =
   match detect_os () with