Skip to content

Commit

Permalink
Update version constants, bump stanza version to 2.4
Browse files Browse the repository at this point in the history
Signed-off-by: Jules Aguillon <juloo.dsi@gmail.com>
  • Loading branch information
Julow committed Feb 21, 2020
1 parent 3c406f6 commit bf43f8c
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ OPAMYES="true"; export OPAMYES
OPAM_VERSION="2.0.5"

# This allows a specific version of odoc to be selected if necessary
ODOC="odoc>=1.4.2"
ODOC="odoc>=1.5.0"

TARGET="$1"; shift

Expand Down
2 changes: 1 addition & 1 deletion doc/documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,6 @@ See :ref:`dune-env` for more details on the ``(env ...)`` stanza.
- ``(warnings <mode>)`` specifies how warnings should be handled.
``<mode>`` can be: ``fatal`` or ``nonfatal``.
The default value is ``nonfatal``.
This field is available since Dune 2.2 and requires Odoc 1.4.3.
This field is available since Dune 2.4.0 and requires Odoc 1.5.0.

.. _odoc: https://github.com/ocaml-doc/odoc
2 changes: 1 addition & 1 deletion src/dune/dune_env.ml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ module Stanza = struct

let odoc_field =
field "odoc" ~default:Odoc.empty
(Dune_lang.Syntax.since Stanza.syntax (2, 2) >>> Odoc.decode)
(Dune_lang.Syntax.since Stanza.syntax (2, 4) >>> Odoc.decode)

let config =
let+ flags = Ocaml_flags.Spec.decode
Expand Down
2 changes: 1 addition & 1 deletion src/dune/stanza.ml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Parser = struct
type nonrec t = string * t list Dune_lang.Decoder.t
end

let latest_version = (2, 2)
let latest_version = (2, 4)

let syntax =
Dune_lang.Syntax.create ~name:"dune" ~desc:"the dune language"
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox-tests/test-cases/odoc/warnings/dune-project
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(lang dune 2.2)
(lang dune 2.4)

0 comments on commit bf43f8c

Please sign in to comment.