Skip to content

Commit 7b155a0

Browse files
committed
Simplify the maintenance of opam packages
Now, all the atd packages depend on the same version of the other atd packages. This is overconstrained but simplifies opam-repository releases and it's not expected to cause problems for users.
1 parent c5822d2 commit 7b155a0

10 files changed

Lines changed: 35 additions & 35 deletions

File tree

atd-yamlx.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ bug-reports: "https://github.com/ahrefs/atd/issues"
9292
depends: [
9393
"dune" {>= "3.18"}
9494
"ocaml" {>= "4.14"}
95-
"atd-jsonlike"
95+
"atd-jsonlike" {= version}
9696
"yamlx" {>= "0.1.0"}
9797
"testo" {>= "0.3.0" & with-test}
9898
"odoc" {with-doc}

atdcpp.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bug-reports: "https://github.com/ahrefs/atd/issues"
8888
depends: [
8989
"dune" {>= "3.18"}
9090
"ocaml" {>= "4.14"}
91-
"atd" {>= "4.0.0"}
91+
"atd" {= version}
9292
"cmdliner" {>= "1.1.0"}
9393
"re"
9494
"odoc" {with-doc}

atdd.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bug-reports: "https://github.com/ahrefs/atd/issues"
8888
depends: [
8989
"dune" {>= "3.18"}
9090
"ocaml" {>= "4.14"}
91-
"atd" {>= "4.0.0"}
91+
"atd" {= version}
9292
"cmdliner" {>= "1.1.0"}
9393
"re"
9494
"odoc" {with-doc}

atdgen.opam

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ depends: [
9999
"dune" {>= "3.18"}
100100
"ocaml" {>= "4.14"}
101101
"alcotest" {with-test}
102-
"atd" {>= "4.0.0"}
103-
"atdgen-runtime" {>= "3.0.0"}
104-
"atdgen-codec-runtime" {with-test}
102+
"atd" {= version}
103+
"atdgen-runtime" {= version}
104+
"atdgen-codec-runtime" {with-test & = version}
105105
"biniou" {>= "1.0.6"}
106106
"yojson" {>= "2.0.1"}
107107
"odoc" {with-doc}

atdj.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ bug-reports: "https://github.com/ahrefs/atd/issues"
102102
depends: [
103103
"dune" {>= "3.18"}
104104
"ocaml" {>= "4.14"}
105-
"atd" {>= "4.0.0"}
105+
"atd" {= version}
106106
"re"
107107
"odoc" {with-doc}
108108
]

atdml.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ bug-reports: "https://github.com/ahrefs/atd/issues"
9292
depends: [
9393
"dune" {>= "3.18"}
9494
"ocaml" {>= "4.14"}
95-
"atd" {>= "4.0.0"}
95+
"atd" {= version}
9696
"yojson" {>= "2.0.0"}
9797
"cmdliner" {>= "1.1.0"}
9898
"testo" {>= "0.3.0" & with-test}

atdpy.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bug-reports: "https://github.com/ahrefs/atd/issues"
8888
depends: [
8989
"dune" {>= "3.18"}
9090
"ocaml" {>= "4.14"}
91-
"atd" {>= "4.0.0"}
91+
"atd" {= version}
9292
"cmdliner" {>= "1.1.0"}
9393
"re"
9494
"alcotest" {with-test}

atds.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bug-reports: "https://github.com/ahrefs/atd/issues"
8888
depends: [
8989
"dune" {>= "3.18"}
9090
"ocaml" {>= "4.14"}
91-
"atd" {>= "4.0.0"}
91+
"atd" {= version}
9292
"odoc" {with-doc}
9393
]
9494
dev-repo: "git+https://github.com/ahrefs/atd.git"

atdts.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ bug-reports: "https://github.com/ahrefs/atd/issues"
8888
depends: [
8989
"dune" {>= "3.18"}
9090
"ocaml" {>= "4.14"}
91-
"atd" {>= "4.0.0"}
91+
"atd" {= version}
9292
"cmdliner" {>= "1.1.0"}
9393
"re"
9494
"alcotest" {with-test}

dune-project

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ utilities."))
131131
(depends
132132
(ocaml (>= 4.14))
133133
(alcotest :with-test)
134-
(atd (>= 4.0.0))
135-
(atdgen-runtime (>= 3.0.0))
136-
(atdgen-codec-runtime :with-test)
134+
(atd (= :version))
135+
(atdgen-runtime (= :version))
136+
(atdgen-codec-runtime (and :with-test (= :version)))
137137
(biniou (>= 1.0.6))
138138
(yojson (>= 2.0.1))
139139
(odoc :with-doc)
@@ -183,7 +183,7 @@ specification.
183183
automatically handled")
184184
(depends
185185
(ocaml (>= 4.14))
186-
(atd (>= 4.0.0))
186+
(atd (= :version))
187187
re
188188
(odoc :with-doc)))
189189

@@ -193,7 +193,7 @@ automatically handled")
193193
(description "ATD Code generator for Scala")
194194
(depends
195195
(ocaml (>= 4.14))
196-
(atd (>= 4.0.0))
196+
(atd (= :version))
197197
(odoc :with-doc)))
198198

199199
(package
@@ -202,7 +202,7 @@ automatically handled")
202202
(description "Python/mypy code generation for ATD APIs")
203203
(depends
204204
(ocaml (>= 4.14))
205-
(atd (>= 4.0.0))
205+
(atd (= :version))
206206
(cmdliner (>= 1.1.0))
207207
re
208208
(alcotest :with-test)
@@ -225,7 +225,7 @@ Melange backend")
225225
(description "TypeScript code generation for ATD APIs")
226226
(depends
227227
(ocaml (>= 4.14))
228-
(atd (>= 4.0.0))
228+
(atd (= :version))
229229
(cmdliner (>= 1.1.0))
230230
re
231231
(alcotest :with-test)
@@ -237,7 +237,7 @@ Melange backend")
237237
(description "DLang code generation for ATD APIs")
238238
(depends
239239
(ocaml (>= 4.14))
240-
(atd (>= 4.0.0))
240+
(atd (= :version))
241241
(cmdliner (>= 1.1.0))
242242
re
243243
(odoc :with-doc)))
@@ -248,7 +248,7 @@ Melange backend")
248248
(description "C++ code generation for ATD APIs")
249249
(depends
250250
(ocaml (>= 4.14))
251-
(atd (>= 4.0.0))
251+
(atd (= :version))
252252
(cmdliner (>= 1.1.0))
253253
re
254254
(odoc :with-doc)))
@@ -264,36 +264,36 @@ instead of semi-secret streaming parser functions, making the generated code
264264
simpler and more maintainable at the cost of some performance.")
265265
(depends
266266
(ocaml (>= 4.14))
267-
(atd (>= 4.0.0))
267+
(atd (= :version))
268268
(yojson (>= 2.0.0))
269269
(cmdliner (>= 1.1.0))
270270
(testo (and (>= 0.3.0) :with-test))
271271
(odoc :with-doc)))
272272

273273
(package
274-
(name atd-yamlx)
275-
(synopsis "YAML-to-jsonlike bridge for use with ATD code generators")
274+
(name atd-jsonlike)
275+
(synopsis "Generic JSON-like AST for use with ATD code generators")
276276
(description "\
277-
atd-yamlx translates a parsed YAML value (YAMLx.value from the yamlx library)
278-
into the generic Atd_jsonlike.AST.t tree type, preserving source locations
279-
at every node so that ATD-generated reader functions can report precise
280-
file/line/column error messages.")
277+
atd-jsonlike provides a generic tree type for representing JSON-like data
278+
(JSON, YAML, TOML, etc.) for use as a target type in code generated by ATD
279+
tools such as atdml.")
281280
(depends
282281
(ocaml (>= 4.14))
283-
atd-jsonlike
284-
(yamlx (>= 0.1.0))
282+
(re (>= 1.9.0))
285283
(testo (and (>= 0.3.0) :with-test))
286284
(odoc :with-doc)))
287285

288286
(package
289-
(name atd-jsonlike)
290-
(synopsis "Generic JSON-like AST for use with ATD code generators")
287+
(name atd-yamlx)
288+
(synopsis "YAML-to-jsonlike bridge for use with ATD code generators")
291289
(description "\
292-
atd-jsonlike provides a generic tree type for representing JSON-like data
293-
(JSON, YAML, TOML, etc.) for use as a target type in code generated by ATD
294-
tools such as atdml.")
290+
atd-yamlx translates a parsed YAML value (YAMLx.value from the yamlx library)
291+
into the generic Atd_jsonlike.AST.t tree type, preserving source locations
292+
at every node so that ATD-generated reader functions can report precise
293+
file/line/column error messages.")
295294
(depends
296295
(ocaml (>= 4.14))
297-
(re (>= 1.9.0))
296+
(atd-jsonlike (= :version))
297+
(yamlx (>= 0.1.0))
298298
(testo (and (>= 0.3.0) :with-test))
299299
(odoc :with-doc)))

0 commit comments

Comments
 (0)