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

chore: bump dune version to 3.18 #11478

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

chore: bump dune version to 3.18 #11478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2736a09
chore: bump dune version
maiste Feb 11, 2025
c909eba
chore: update fmt with new dune rules
maiste Feb 11, 2025
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
11 changes: 2 additions & 9 deletions bench/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
(executable
(name bench)
(modules bench metrics)
(libraries
dune_stats
dune_console
chrome_trace
stdune
fiber
dune_lang
dune_engine
dune_util))
(libraries dune_stats dune_console chrome_trace stdune fiber dune_lang
dune_engine dune_util))

(rule
(alias bench)
Expand Down
3 changes: 2 additions & 1 deletion chrome-trace.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"ocaml" {>= "4.08.0"}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion dune-action-plugin.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"dune-glob" {= version}
"csexp" {>= "1.5.0"}
"ppx_expect" {with-test}
Expand All @@ -28,6 +28,7 @@ depends: [
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion dune-build-info.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"ocaml" {>= "4.08"}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion dune-configurator.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"ocaml" {>= "4.08.0"}
"base-unix"
"csexp" {>= "1.5.0"}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion dune-glob.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"stdune" {= version}
"dyn"
"ordering"
"dune-private-libs" {= version}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion dune-private-libs.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"csexp" {>= "1.5.0"}
"pp" {>= "1.1.0"}
"dyn" {= version}
Expand All @@ -26,6 +26,7 @@ depends: [
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
2 changes: 1 addition & 1 deletion dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(lang dune 3.12)
(lang dune 3.18)
; ^^^^
; When changing the version, don't forget to regenerate *.opam files
; by running [dune build].
Expand Down
3 changes: 2 additions & 1 deletion dune-rpc-lwt.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"dune-rpc" {= version}
"csexp" {>= "1.5.0"}
"lwt" {>= "5.6.0"}
"base-unix"
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion dune-rpc.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"csexp"
"ordering"
"dyn"
Expand All @@ -19,6 +19,7 @@ depends: [
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion dune-site.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"dune-private-libs" {= version}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
1 change: 1 addition & 0 deletions dune.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ conflicts: [
"jbuilder" {= "transition"}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["ocaml" "boot/bootstrap.ml" "-j" jobs]
["./_boot/dune.exe" "build" "dune.install" "--release" "--profile" "dune-bootstrap" "-j" jobs]
Expand Down
3 changes: 2 additions & 1 deletion dyn.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"ocaml" {>= "4.08.0"}
"ordering" {= version}
"pp" {>= "1.1.0"}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion ocamlc-loc.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"ocaml" {>= "4.08.0"}
"dyn" {= version}
"odoc" {with-doc}
Expand All @@ -19,6 +19,7 @@ conflicts: [
"ocaml-lsp-server" {< "1.15.0"}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
3 changes: 2 additions & 1 deletion ordering.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ homepage: "https://github.com/ocaml/dune"
doc: "https://dune.readthedocs.io/"
bug-reports: "https://github.com/ocaml/dune/issues"
depends: [
"dune" {>= "3.12"}
"dune" {>= "3.18"}
"ocaml" {>= "4.08.0"}
"odoc" {with-doc}
]
dev-repo: "git+https://github.com/ocaml/dune.git"
x-maintenance-intent: ["(latest)"]
build: [
["dune" "subst"] {dev}
["rm" "-rf" "vendor/csexp"]
Expand Down
12 changes: 2 additions & 10 deletions src/dune_cache/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
(library
(name dune_cache)
(synopsis "[Internal] Dune's local and cloud build cache")
(libraries
csexp
dune_digest
dune_cache_storage
dune_util
dune_console
dune_targets
fiber
stdune
unix)
(libraries csexp dune_digest dune_cache_storage dune_util dune_console
dune_targets fiber stdune unix)
(instrumentation
(backend bisect_ppx)))
18 changes: 3 additions & 15 deletions src/dune_config_file/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
(library
(name dune_config_file)
(libraries
stdune
xdg
dune_config
dune_console
dune_threaded_console
dune_lang
dune_cache
dune_cache_storage
dune_engine
dune_rpc_private
dune_stats
dune_tui
dune_util
spawn)
(libraries stdune xdg dune_config dune_console dune_threaded_console
dune_lang dune_cache dune_cache_storage dune_engine dune_rpc_private
dune_stats dune_tui dune_util spawn)
(synopsis "Internal Dune library, do not use!")
(instrumentation
(backend bisect_ppx)))
38 changes: 6 additions & 32 deletions src/dune_engine/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,12 @@

(library
(name dune_engine)
(libraries
unix
csexp
stdune
dune_config
dune_console
dyn
fiber
memo
dune_async_io
threads.posix
predicate_lang
dune_cache
dune_cache_storage
dune_glob
dune_targets
chrome_trace
dune_stats
dune_action_plugin
dune_util
build_path_prefix_map
dune_output_truncation
csexp_rpc
dune_rpc_private
dune_rpc_client
dune_thread_pool
spawn
ocamlc_loc
dune_file_watcher
dune_filesystem_stubs
dune_digest
dune_metrics)
(libraries unix csexp stdune dune_config dune_console dyn fiber memo
dune_async_io threads.posix predicate_lang dune_cache dune_cache_storage
dune_glob dune_targets chrome_trace dune_stats dune_action_plugin dune_util
build_path_prefix_map dune_output_truncation csexp_rpc dune_rpc_private
dune_rpc_client dune_thread_pool spawn ocamlc_loc dune_file_watcher
dune_filesystem_stubs dune_digest dune_metrics)
(synopsis "Internal Dune library, do not use!")
(instrumentation
(backend bisect_ppx)))
13 changes: 2 additions & 11 deletions src/dune_file_watcher/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
(library
(name dune_file_watcher)
(libraries
spawn
fsevents
dune_console
unix
stdune
threads.posix
ocaml_inotify
async_inotify_for_dune
dune_re
fswatch_win)
(libraries spawn fsevents dune_console unix stdune threads.posix
ocaml_inotify async_inotify_for_dune dune_re fswatch_win)
(synopsis "Internal Dune library, do not use!")
(instrumentation
(backend bisect_ppx)))
22 changes: 3 additions & 19 deletions src/dune_pkg/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
(library
(name dune_pkg)
(synopsis "[Internal] Dune's packaging support")
(libraries
stdune
fiber
fiber_util
chrome_trace
dune_engine
dune_digest
dune_util
dune_stats
dune_lang
dune_console
dune_re
dune_vcs
dune_config
opam_core
opam_format
build_info
sat
xdg)
(libraries stdune fiber fiber_util chrome_trace dune_engine dune_digest
dune_util dune_stats dune_lang dune_console dune_re dune_vcs dune_config
opam_core opam_format build_info sat xdg)
(instrumentation
(backend bisect_ppx)))
4 changes: 2 additions & 2 deletions src/dune_pkg/opam_solver.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ module Context = struct
let packages pkg (formula : OpamTypes.formula) =
OpamFormula.iter
(fun (name, _) ->
let name = Package_name.of_opam_package_name name in
Table.Multi.cons acc name pkg)
let name = Package_name.of_opam_package_name name in
Table.Multi.cons acc name pkg)
formula
in
Lazy.force local_packages
Expand Down
15 changes: 2 additions & 13 deletions src/dune_rpc_impl/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
(library
(name dune_rpc_impl)
(libraries
stdune
promote
unix
fiber
csexp_rpc
dune_stats
dune_rpc_client
dune_console
dune_util
dune_rpc_private
dune_rpc_server
dune_engine)
(libraries stdune promote unix fiber csexp_rpc dune_stats dune_rpc_client
dune_console dune_util dune_rpc_private dune_rpc_server dune_engine)
(synopsis "Dune's rpc server + a usable client")
(instrumentation
(backend bisect_ppx)))
Loading
Loading