Skip to content

chore: bump dune version to 3.18 #11478

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.

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

Merged
merged 3 commits into from
Apr 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions bench/monorepo/bench.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ RUN wget https://github.com/ocaml-dune/ocaml-monorepo-benchmark/archive/refs/tag
RUN opam init --disable-sandboxing --auto-setup

# make an opam switch for running benchmarks
RUN echo "Cache busting to update the opam cache which serves no additional purpose besides this"
RUN opam update && opam switch create bench 4.14.2
RUN opam install -y dune ocamlbuild

Expand Down
3 changes: 2 additions & 1 deletion chrome-trace.opam
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
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
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
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
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
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
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
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
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
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
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
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
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
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
3 changes: 2 additions & 1 deletion stdune.opam
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"}
"base-unix"
"dyn" {= version}
Expand All @@ -20,6 +20,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 xdg.opam
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"}
"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
Loading