diff --git a/Makefile b/Makefile index f4893de..f771a31 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,7 @@ clean: coverage: clean @BISECT_ENABLE=YES dune runtest --force - @bisect-ppx-report -I _build/default/ -html _coverage/ \ - `find . -name 'bisect*.out'` + @bisect-ppx-report html test: @dune runtest --force diff --git a/easy_xlsx/src/dune b/easy_xlsx/src/dune index 7807dd7..ccd57f0 100644 --- a/easy_xlsx/src/dune +++ b/easy_xlsx/src/dune @@ -2,4 +2,4 @@ (name easy_xlsx) (public_name easy_xlsx) (libraries camlzip ptime spreadsheetml str) - (preprocess (pps ppx_jane bisect_ppx -conditional))) + (preprocess (pps ppx_jane bisect_ppx))) diff --git a/easy_xlsx/test/test_easy_xlsx_docs.ml b/easy_xlsx/test/test_easy_xlsx_docs.ml index 0f41e7c..feadee4 100644 --- a/easy_xlsx/test/test_easy_xlsx_docs.ml +++ b/easy_xlsx/test/test_easy_xlsx_docs.ml @@ -27,7 +27,7 @@ let pp_diff fmt (exp, real) = | exp, real -> let exp_row = List.hd exp in let real_row = List.hd real in - if Option.equal (List.equal ~equal:String.equal) exp_row real_row then + if Option.equal (List.equal String.equal) exp_row real_row then print_opt_row ' ' exp_row else begin print_opt_row '-' exp_row; diff --git a/open_packaging.opam b/open_packaging.opam index 7cf19f0..65e7aa0 100644 --- a/open_packaging.opam +++ b/open_packaging.opam @@ -12,7 +12,7 @@ build: [ ] depends: [ - "base" {= "v0.11.1"} + "base" {= "v0.14.1"} "ocaml" {>= "4.04.2"} "ppx_jane" "sexplib" diff --git a/open_packaging/src/dune b/open_packaging/src/dune index a84b06b..c5fec7b 100644 --- a/open_packaging/src/dune +++ b/open_packaging/src/dune @@ -3,4 +3,4 @@ (public_name open_packaging) (libraries base sexplib stdint xml-light) (flags (:standard -w -47)) - (preprocess (pps ppx_jane bisect_ppx -conditional))) + (preprocess (pps ppx_jane bisect_ppx))) diff --git a/spreadsheetml/src/dune b/spreadsheetml/src/dune index 52f3821..284cdb2 100644 --- a/spreadsheetml/src/dune +++ b/spreadsheetml/src/dune @@ -3,4 +3,4 @@ (public_name spreadsheetml) (libraries open_packaging) (flags (:standard -w -47)) - (preprocess (pps ppx_jane bisect_ppx -conditional))) + (preprocess (pps ppx_jane bisect_ppx)))