From be76052447c43b217e0c3ae8b5c611f22706f50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Ojeda=20B=C3=A4r?= Date: Mon, 2 Dec 2024 09:29:29 +0100 Subject: [PATCH 1/5] Bump Dune lang version to 3.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicolás Ojeda Bär --- otherlibs/dune-rpc/private/types.ml | 2 +- .../test-cases/directory-targets/installed-dependency.t | 2 +- test/blackbox-tests/test-cases/dune-init.t/run.t | 4 ++-- .../test-cases/install/install-stublibs.t/run.t | 2 +- test/blackbox-tests/test-cases/melange/basic-install.t | 2 +- test/blackbox-tests/test-cases/pkg/implicit-dune-constraint.t | 4 ++-- .../test-cases/pkg/pin-stanza/unknown-dune-version.t | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/otherlibs/dune-rpc/private/types.ml b/otherlibs/dune-rpc/private/types.ml index 470907aed74..403399787ce 100644 --- a/otherlibs/dune-rpc/private/types.ml +++ b/otherlibs/dune-rpc/private/types.ml @@ -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 diff --git a/test/blackbox-tests/test-cases/directory-targets/installed-dependency.t b/test/blackbox-tests/test-cases/directory-targets/installed-dependency.t index 3eedcef7e4a..6fd29a569b1 100644 --- a/test/blackbox-tests/test-cases/directory-targets/installed-dependency.t +++ b/test/blackbox-tests/test-cases/directory-targets/installed-dependency.t @@ -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))) diff --git a/test/blackbox-tests/test-cases/dune-init.t/run.t b/test/blackbox-tests/test-cases/dune-init.t/run.t index d874281a37f..3fe686d4b53 100644 --- a/test/blackbox-tests/test-cases/dune-init.t/run.t +++ b/test/blackbox-tests/test-cases/dune-init.t/run.t @@ -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} ] @@ -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} ] diff --git a/test/blackbox-tests/test-cases/install/install-stublibs.t/run.t b/test/blackbox-tests/test-cases/install/install-stublibs.t/run.t index 47d308fcce0..d351bc2b945 100644 --- a/test/blackbox-tests/test-cases/install/install-stublibs.t/run.t +++ b/test/blackbox-tests/test-cases/install/install-stublibs.t/run.t @@ -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 diff --git a/test/blackbox-tests/test-cases/melange/basic-install.t b/test/blackbox-tests/test-cases/melange/basic-install.t index 361f794ad23..06c7879c45b 100644 --- a/test/blackbox-tests/test-cases/melange/basic-install.t +++ b/test/blackbox-tests/test-cases/melange/basic-install.t @@ -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 diff --git a/test/blackbox-tests/test-cases/pkg/implicit-dune-constraint.t b/test/blackbox-tests/test-cases/pkg/implicit-dune-constraint.t index aa977585869..4721ac80608 100644 --- a/test/blackbox-tests/test-cases/pkg/implicit-dune-constraint.t +++ b/test/blackbox-tests/test-cases/pkg/implicit-dune-constraint.t @@ -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: diff --git a/test/blackbox-tests/test-cases/pkg/pin-stanza/unknown-dune-version.t b/test/blackbox-tests/test-cases/pkg/pin-stanza/unknown-dune-version.t index c9a98ce4e04..a1c58e60107 100644 --- a/test/blackbox-tests/test-cases/pkg/pin-stanza/unknown-dune-version.t +++ b/test/blackbox-tests/test-cases/pkg/pin-stanza/unknown-dune-version.t @@ -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] From 80c7328936c825c5323e7c910ecbfb7a25d83665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Ojeda=20B=C3=A4r?= Date: Mon, 2 Dec 2024 09:29:53 +0100 Subject: [PATCH 2/5] Fix versioning of Dune formatting change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicolás Ojeda Bär --- src/dune_lang/format.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dune_lang/format.ml b/src/dune_lang/format.ml index 00a4996c119..611de0bcd8c 100644 --- a/src/dune_lang/format.ml +++ b/src/dune_lang/format.ml @@ -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 ')') ;; From ed9c16320fe4b77dec57da4b5ce579d4f7cdd4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Ojeda=20B=C3=A4r?= Date: Mon, 2 Dec 2024 17:16:29 +0100 Subject: [PATCH 3/5] Accept MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicolás Ojeda Bär --- doc/test/run.t | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/test/run.t b/doc/test/run.t index b233af79c47..d993b8c161a 100644 --- a/doc/test/run.t +++ b/doc/test/run.t @@ -8,5 +8,15 @@ is fine, but you then need to update the list of such exceptions below. $ DUNE_LANG=$(dune internal latest-lang-version) $ grep '(lang dune' ../*.rst | grep -v "$DUNE_LANG" + ../coq.rst: (lang dune 3.17) + ../coq.rst: (lang dune 3.17) + ../foreign-code.rst: (lang dune 3.17) ../hacking.rst:``(lang dune 2.7)`` in their ``dune`` project file to use it. + ../hacking.rst: (lang dune 3.17) + ../instrumentation.rst: (lang dune 3.17) + ../instrumentation.rst: (lang dune 3.17) + ../melange.rst: (lang dune 3.17) + ../sites.rst: (lang dune 3.17) + ../sites.rst: (lang dune 3.17) + ../sites.rst: (lang dune 3.17) ../tests.rst: (lang dune 2.7) From d37247806ea87a60f5512507323729a966d41b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Ojeda=20B=C3=A4r?= Date: Mon, 2 Dec 2024 18:28:37 +0100 Subject: [PATCH 4/5] Adapt doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicolás Ojeda Bär --- doc/coq.rst | 4 ++-- doc/foreign-code.rst | 2 +- doc/hacking.rst | 2 +- doc/instrumentation.rst | 4 ++-- doc/melange.rst | 2 +- doc/sites.rst | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/coq.rst b/doc/coq.rst index 6ddb391358d..a812b271e96 100644 --- a/doc/coq.rst +++ b/doc/coq.rst @@ -456,7 +456,7 @@ 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` @@ -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 diff --git a/doc/foreign-code.rst b/doc/foreign-code.rst index e33827621bc..1db02cdff1d 100644 --- a/doc/foreign-code.rst +++ b/doc/foreign-code.rst @@ -103,7 +103,7 @@ file: .. code:: dune - (lang dune 3.17) + (lang dune 3.18) (using ctypes 0.3) diff --git a/doc/hacking.rst b/doc/hacking.rst index 1a962588baf..b5c027188cb 100644 --- a/doc/hacking.rst +++ b/doc/hacking.rst @@ -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 diff --git a/doc/instrumentation.rst b/doc/instrumentation.rst index f22ee81f11a..3cbf9bae292 100644 --- a/doc/instrumentation.rst +++ b/doc/instrumentation.rst @@ -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))) diff --git a/doc/melange.rst b/doc/melange.rst index dfc11949d27..b24379ba3e0 100644 --- a/doc/melange.rst +++ b/doc/melange.rst @@ -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 diff --git a/doc/sites.rst b/doc/sites.rst index eb57eaad9e1..21ce71331ec 100644 --- a/doc/sites.rst +++ b/doc/sites.rst @@ -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) @@ -235,7 +235,7 @@ Main Executable (C) .. code:: dune - (lang dune 3.17) + (lang dune 3.18) (using dune_site 0.1) (name app) @@ -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) From 1f63f3a6c90302e5cbe6d6fedf70e8f1ec21ca11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Ojeda=20B=C3=A4r?= Date: Mon, 2 Dec 2024 18:29:06 +0100 Subject: [PATCH 5/5] Revert "Accept" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ed9c16320fe4b77dec57da4b5ce579d4f7cdd4cb. Signed-off-by: Nicolás Ojeda Bär --- doc/test/run.t | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/doc/test/run.t b/doc/test/run.t index d993b8c161a..b233af79c47 100644 --- a/doc/test/run.t +++ b/doc/test/run.t @@ -8,15 +8,5 @@ is fine, but you then need to update the list of such exceptions below. $ DUNE_LANG=$(dune internal latest-lang-version) $ grep '(lang dune' ../*.rst | grep -v "$DUNE_LANG" - ../coq.rst: (lang dune 3.17) - ../coq.rst: (lang dune 3.17) - ../foreign-code.rst: (lang dune 3.17) ../hacking.rst:``(lang dune 2.7)`` in their ``dune`` project file to use it. - ../hacking.rst: (lang dune 3.17) - ../instrumentation.rst: (lang dune 3.17) - ../instrumentation.rst: (lang dune 3.17) - ../melange.rst: (lang dune 3.17) - ../sites.rst: (lang dune 3.17) - ../sites.rst: (lang dune 3.17) - ../sites.rst: (lang dune 3.17) ../tests.rst: (lang dune 2.7)