diff --git a/dune-project b/dune-project index 27d55bb37f..37448f6218 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.7) +(lang dune 3.18) (name odoc) diff --git a/odoc-bench.opam b/odoc-bench.opam index 568143a8cf..6dc2d0df76 100644 --- a/odoc-bench.opam +++ b/odoc-bench.opam @@ -31,7 +31,7 @@ depends: [ "astring" "cmdliner" {>= "1.3.0"} "cppo" {build & >= "1.1.0"} - "dune" {>= "3.7.0"} + "dune" {>= "3.18.0"} "fpath" "ocaml" {>= "4.02.0"} "result" diff --git a/odoc-driver.opam b/odoc-driver.opam index fe2b160ce1..88cf393f6c 100644 --- a/odoc-driver.opam +++ b/odoc-driver.opam @@ -36,7 +36,7 @@ documentation for installed packages. depends: [ "ocaml" {>= "5.1.0"} "odoc" {= version} - "dune" {>= "3.7.0"} + "dune" {>= "3.18.0"} "odoc-md" "bos" "fpath" diff --git a/odoc-md.opam b/odoc-md.opam index d972810064..9711940046 100644 --- a/odoc-md.opam +++ b/odoc-md.opam @@ -29,7 +29,7 @@ This package provides support for generating documentation from Markdown files. depends: [ "ocaml" {>= "4.14.0"} "odoc" {= version} - "dune" {>= "3.7.0"} + "dune" {>= "3.18.0"} "cmarkit" ] diff --git a/odoc-parser.opam b/odoc-parser.opam index 1458575222..6d95b9dc04 100644 --- a/odoc-parser.opam +++ b/odoc-parser.opam @@ -14,7 +14,7 @@ dev-repo: "git+https://github.com/ocaml/odoc.git" doc: "https://ocaml.github.io/odoc/odoc_parser" flags: [ avoid-version ] depends: [ - "dune" {>= "3.7"} + "dune" {>= "3.18"} "ocaml" {>= "4.08.0" & < "5.4"} "astring" "result" diff --git a/odoc.opam b/odoc.opam index b6425ce4ae..d2c278c10c 100644 --- a/odoc.opam +++ b/odoc.opam @@ -44,7 +44,7 @@ depends: [ "astring" "cmdliner" {>= "1.3.0"} "cppo" {build & >= "1.1.0"} - "dune" {>= "3.7.0"} + "dune" {>= "3.18.0"} "fpath" "ocaml" {>= "4.08.0" & < "5.4"} "result" diff --git a/test/generators/dune b/test/generators/dune index 697a31775b..3dce227299 100644 --- a/test/generators/dune +++ b/test/generators/dune @@ -11,10 +11,11 @@ (>= %{ocaml_version} 4.04)) (action (with-stdout-to - link.dune.inc.gen - (pipe-stdout - (run gen_rules/gen_rules.exe) - (run dune format-dune-file))))) + link.dune.inc.gen.raw + (run gen_rules/gen_rules.exe)))) + +(rule + (format-dune-file link.dune.inc.gen.raw link.dune.inc.gen)) (rule (alias runtest)