Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Dune lang version to 3.18 #11175

Merged
merged 5 commits into from
Dec 2, 2024
Merged

Bump Dune lang version to 3.18 #11175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be76052
Bump Dune lang version to 3.18
nojb Dec 2, 2024
80c7328
Fix versioning of Dune formatting change
nojb Dec 2, 2024
ed9c163
Accept
nojb Dec 2, 2024
d372478
Adapt doc
nojb Dec 2, 2024
1f63f3a
Revert "Accept"
nojb Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/coq.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ lang<coq-lang>` stanza present:

.. code:: dune

(lang dune 3.17)
(lang dune 3.18)
(using coq 0.8)

Next we need a :doc:`/reference/dune/index` file with a :ref:`coq-theory`
Expand Down Expand Up @@ -687,7 +687,7 @@ the plugin to sit in, otherwise Coq will not be able to find it.

.. code:: dune

(lang dune 3.17)
(lang dune 3.18)
(using coq 0.8)

(package
Expand Down
2 changes: 1 addition & 1 deletion doc/foreign-code.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ file:

.. code:: dune

(lang dune 3.17)
(lang dune 3.18)
(using ctypes 0.3)


Expand Down
2 changes: 1 addition & 1 deletion doc/hacking.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ Such languages must be enabled in the ``dune`` project file separately:

.. code:: dune

(lang dune 3.17)
(lang dune 3.18)
(using coq 0.8)

If such extensions are experimental, it's recommended that they pass
Expand Down
4 changes: 2 additions & 2 deletions doc/instrumentation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ To enable an instrumentation backend globally, type the following in your

.. code:: dune
(lang dune 3.17)
(lang dune 3.18)
(instrument_with bisect_ppx)
or for each context individually:

.. code:: dune
(lang dune 3.17)
(lang dune 3.18)
(context default)
(context (default (name coverage) (instrument_with bisect_ppx)))
(context (default (name profiling) (instrument_with landmarks)))
Expand Down
2 changes: 1 addition & 1 deletion doc/melange.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ is enabled:

.. code:: dune

(lang dune 3.17)
(lang dune 3.18)
(using melange 0.1)

Next, write a :doc:`/reference/dune/index` file with a
Expand Down
6 changes: 3 additions & 3 deletions doc/sites.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ will be installed as a sub-directory.

.. code:: dune

(lang dune 3.17)
(lang dune 3.18)
(using dune_site 0.1)
(name mygui)

Expand Down Expand Up @@ -235,7 +235,7 @@ Main Executable (C)

.. code:: dune

(lang dune 3.17)
(lang dune 3.18)
(using dune_site 0.1)
(name app)

Expand Down Expand Up @@ -295,7 +295,7 @@ The Plugin "plugin1"

.. code:: dune

(lang dune 3.17)
(lang dune 3.18)
(using dune_site 0.1)

(generate_opam_files true)
Expand Down
2 changes: 1 addition & 1 deletion otherlibs/dune-rpc/private/types.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end
module Version = struct
type t = int * int

let latest = 3, 17
let latest = 3, 18

let sexp : t Conv.value =
let open Conv in
Expand Down
2 changes: 1 addition & 1 deletion src/dune_lang/format.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let print_wrapped_list ~version x =
if version < (2, 8)
then Pp.char '(' ++ Pp.hovbox ~indent:1 inner ++ Pp.char ')'
else
(if version < (3, 17) then Pp.hvbox else Pp.hovbox)
(if version < (3, 18) then Pp.hvbox else Pp.hovbox)
~indent:1
(Pp.char '(' ++ inner ++ Pp.char ')')
;;
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox-tests/test-cases/directory-targets/installed-dependency.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Allow directories to be installable
Leaving directory 'a'

$ cat a/_build/install/default/lib/foo/dune-package
(lang dune 3.17)
(lang dune 3.18)
(name foo)
(sections (lib .) (share ../../share/foo))
(files (lib (META dune-package)) (share ((dir bar) x y)))
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox-tests/test-cases/dune-init.t/run.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ And the opam file will be generated as expected
doc: "https://url/to/documentation"
bug-reports: "https://github.com/username/reponame/issues"
depends: [
$dune {>= "3.17"}
$dune {>= "3.18"}
"ocaml"
"odoc" {with-doc}
]
Expand Down Expand Up @@ -494,7 +494,7 @@ And the opam file will be generated as expected
doc: "https://url/to/documentation"
bug-reports: "https://github.com/username/reponame/issues"
depends: [
"dune" {>= "3.17"}
"dune" {>= "3.18"}
"ocaml"
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox-tests/test-cases/install/install-stublibs.t/run.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Begin by installing a library with C stubs.
Installing install/lib/libA/libA.cmxs
Installing install/lib/stublibs/dlllibA_stubs.so
$ cat ./install/lib/libA/dune-package
(lang dune 3.17)
(lang dune 3.18)
(name libA)
(sections
(lib
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox-tests/test-cases/melange/basic-install.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Test that we can install melange mode libraries
]

$ cat ./_build/install/default/lib/foo/dune-package
(lang dune 3.17)
(lang dune 3.18)
(name foo)
(sections (lib .))
(files
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox-tests/test-cases/pkg/implicit-dune-constraint.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ dependency.
Couldn't solve the package dependency formula.
Selected candidates: foo.0.0.1 x.dev
- dune -> (problem)
User requested = 3.17
User requested = 3.18
Rejected candidates:
dune.3.11.0: Incompatible with restriction: = 3.17
dune.3.11.0: Incompatible with restriction: = 3.18
[1]
$ test "4.0.0"
Solution for dune.lock:
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox-tests/test-cases/pkg/pin-stanza/unknown-dune-version.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ We are unable to pin projects that the version of dune doesn't understand.
Supported versions of this extension in version 100.1 of the dune language:
- 1.0 to 1.12
- 2.0 to 2.9
- 3.0 to 3.17
- 3.0 to 3.18
[1]
Loading