From 30251e9426c9fb12c1ff02c63a7f1931810a5d99 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Tue, 10 Dec 2019 19:56:54 -0600 Subject: [PATCH] bump minimum version of OCaml to 4.03, drop deps {result,uchar} close #274 --- containers.opam | 4 +--- src/core/dune | 2 +- src/data/dune | 2 +- src/iter/dune | 2 +- src/sexp/dune | 2 +- src/unix/dune | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/containers.opam b/containers.opam index 173fcb7c..dfc6f5d9 100644 --- a/containers.opam +++ b/containers.opam @@ -10,10 +10,9 @@ build: [ ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] depends: [ + "ocaml" { >= "4.03.0" } "dune" { >= "1.1" } "dune-configurator" - "result" - "uchar" "seq" "qtest" { with-test } "qcheck" { with-test } @@ -23,7 +22,6 @@ depends: [ "uutf" { with-test } "mdx" { with-test & >= "1.5.0" & < "2.0.0" } "odoc" { with-doc } - "ocaml" { >= "4.02.0" } ] depopts: [ "base-unix" diff --git a/src/core/dune b/src/core/dune index e3a8d8ec..1e6479cc 100644 --- a/src/core/dune +++ b/src/core/dune @@ -59,4 +59,4 @@ CCMonomorphic) (ocamlopt_flags (:include ../flambda.flags)) - (libraries result uchar seq containers.monomorphic)) + (libraries seq containers.monomorphic)) diff --git a/src/data/dune b/src/data/dune index cda5e3ae..d260740a 100644 --- a/src/data/dune +++ b/src/data/dune @@ -5,4 +5,4 @@ (wrapped false) (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -open CCShims_) (ocamlopt_flags :standard (:include ../flambda.flags)) - (libraries result containers)) + (libraries containers)) diff --git a/src/iter/dune b/src/iter/dune index 795ddc8b..49633032 100644 --- a/src/iter/dune +++ b/src/iter/dune @@ -5,5 +5,5 @@ (wrapped false) (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string) (ocamlopt_flags :standard (:include ../flambda.flags)) - (libraries result) + (libraries dune) ) diff --git a/src/sexp/dune b/src/sexp/dune index bf1a6f9d..7d3320a1 100644 --- a/src/sexp/dune +++ b/src/sexp/dune @@ -5,6 +5,6 @@ (wrapped false) (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string) (ocamlopt_flags :standard (:include ../flambda.flags)) - (libraries result containers)) + (libraries containers)) (ocamllex (modules CCSexp_lex)) diff --git a/src/unix/dune b/src/unix/dune index 5bc04571..bebb4ead 100644 --- a/src/unix/dune +++ b/src/unix/dune @@ -6,5 +6,5 @@ (optional) (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string) (ocamlopt_flags :standard (:include ../flambda.flags)) - (libraries result unix) + (libraries unix) )