From d1a1fcc0460542ea6ce58e45e262ad4768eea74c Mon Sep 17 00:00:00 2001 From: Etienne Millon Date: Fri, 24 Apr 2020 11:04:22 +0200 Subject: [PATCH] Fix dune 2.5 warning relative to menhir 2.1 `(using menhir 2.1)` implies `dune >= 2.2.0` (see #1330). Starting with dune 2.5.0, this triggers a warning. Using `(lang dune 2.2)` in the main project ensures consistent metadata. --- dune | 4 ++-- dune-project | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dune b/dune index 9165a7e836..725c42b609 100644 --- a/dune +++ b/dune @@ -21,8 +21,8 @@ %{targets} (run ocamlformat --help=plain)))) -(alias - (name runtest) +(rule + (alias runtest) (action (diff ocamlformat-help.txt ocamlformat-help.actual))) diff --git a/dune-project b/dune-project index 72ce991639..7ed73a1761 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 1.11) +(lang dune 2.2) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; ; @@ -12,5 +12,4 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (name ocamlformat) -(using fmt 1.2) (using menhir 2.1)