Update dune and merlin version

Summary: Bump dune and merlin version. This will allow to use the `enabled_if` stanza to correctly support `dune build all`. Reviewed By: CatherineGasnier Differential Revision: D15759205 fbshipit-source-id: c86b091f27b49d3a935cbda659839fb9a826d4d9
facebook · Jun 12, 2019 · 11f48fc · 11f48fc
1 parent 5fb924d
commit 11f48fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/hphp/hack/dune-project b/hphp/hack/dune-project
@@ -1 +1,2 @@
-(lang dune 1.7)
+(lang dune 1.9)
+(allow_approximate_merlin) ; see https://discuss.ocaml.org/t/ann-dune-1-10-0/3896
diff --git a/hphp/hack/opam_setup.sh b/hphp/hack/opam_setup.sh
@@ -84,11 +84,11 @@ eval "$(opam env)"
 opam install \
   core_kernel.v0.11.1 \
   dtoa.0.3.1 \
-  dune.1.9.3 \
+  dune.1.10.0 \
   lwt.4.1.0 \
   lwt_log.1.1.0 \
   lwt_ppx.1.2.1 \
-  merlin.3.2.2 \
+  merlin.3.3.0 \
   ocp-indent.1.7.0 \
   pcre.7.3.4 \
   ppx_deriving.4.2.1 \