Merge pull request #45 from jmid/use-dunes-maintenance-intent

jmid · web-flow · commit cf593f1577bf · 2025-09-16T22:40:22.000+02:00
Use dune's built-in maintenance-intent support
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,7 @@
 Next release
 ------------
 
+- Use dune.3.18 support to generate `x-maintenance-intent` entry
 - Patch `ppx_yojson_conv` dependency which was missing a `v`-prefix
 - Introduce a `mutaml.opam.template` to avoid opam linting failure #41
 - Adjust RE to support `runtest` on OpenBSD too #40
diff --git a/dune-project b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.0)
+(lang dune 3.18)
 
 (name mutaml)
 
@@ -27,7 +27,7 @@
  (depends
   (ocaml (>= 4.12.0))
   (ppxlib (>= 0.28.0))
-  (ppx_yojson_conv (>= 0.14.0))
+  (ppx_yojson_conv (>= v0.14.0))
   stdlib-random
   conf-timeout
   conf-diffutils
@@ -36,4 +36,6 @@
   (ppx_derivers (>= 1.2.1))
   (yojson (>= 2.0.0))
   (ppx_deriving :with-test)
-  (ounit2 :with-test)))
+  (ounit2 :with-test))
+ (maintenance_intent "(latest)")
+)
diff --git a/mutaml.opam b/mutaml.opam
@@ -17,7 +17,7 @@ homepage: "https://github.com/jmid/mutaml"
 doc: "https://github.com/jmid/mutaml"
 bug-reports: "https://github.com/jmid/mutaml/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.18"}
   "ocaml" {>= "4.12.0"}
   "ppxlib" {>= "0.28.0"}
   "ppx_yojson_conv" {>= "v0.14.0"}
@@ -32,6 +32,7 @@ depends: [
   "odoc" {with-doc}
 ]
 dev-repo: "git+https://github.com/jmid/mutaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   ["dune" "subst"] {dev}
   [
@@ -46,4 +47,3 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-x-maintenance-intent: ["(latest)"]
diff --git a/mutaml.opam.template b/mutaml.opam.template
@@ -12,4 +12,3 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-x-maintenance-intent: ["(latest)"]

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ homepage: "https://github.com/jmid/mutaml"`
`17`	`17`	`doc: "https://github.com/jmid/mutaml"`
`18`	`18`	`bug-reports: "https://github.com/jmid/mutaml/issues"`
`19`	`19`	`depends: [`
`20`		`- "dune" {>= "3.0"}`
	`20`	`+ "dune" {>= "3.18"}`
`21`	`21`	`"ocaml" {>= "4.12.0"}`
`22`	`22`	`"ppxlib" {>= "0.28.0"}`
`23`	`23`	`"ppx_yojson_conv" {>= "v0.14.0"}`
`@@ -32,6 +32,7 @@ depends: [`
`32`	`32`	`"odoc" {with-doc}`
`33`	`33`	`]`
`34`	`34`	`dev-repo: "git+https://github.com/jmid/mutaml.git"`
	`35`	`+x-maintenance-intent: ["(latest)"]`
`35`	`36`	`build: [`
`36`	`37`	`["dune" "subst"] {dev}`
`37`	`38`	`[`
`@@ -46,4 +47,3 @@ build: [`
`46`	`47`	`"@doc" {with-doc}`
`47`	`48`	`]`
`48`	`49`	`]`
`49`		`-x-maintenance-intent: ["(latest)"]`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,3 @@ build: [`
`12`	`12`	`"@doc" {with-doc}`
`13`	`13`	`]`
`14`	`14`	`]`
`15`		`-x-maintenance-intent: ["(latest)"]`