Skip to content

Commit

Permalink
Sort dependencies in dune-project
Browse files Browse the repository at this point in the history
This makes it is easier to avoid duplicated entries as well as making
it obvious were new dependencies need to be added, which makes it more
straight forward to write PRs that add new dependencies.

In the process I discovered that the notty dependency was duplicated
in `grpc-bench.opam`, which I fixed. This had no incidence on the
build.

The canonical order I used here was to put `ocaml` first, and then the
rest of dependencies alphabetically.
  • Loading branch information
mbarbin committed Jan 9, 2024
1 parent 35a45fe commit 6c82d79
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 35 deletions.
41 changes: 20 additions & 21 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
(depends
(ocaml
(>= 4.08))
(uri
(>= 4.0.0))
(h2
(>= 0.9.0))
ppx_deriving))
ppx_deriving
(uri
(>= 4.0.0))))

(package
(name grpc-lwt)
Expand All @@ -64,10 +64,10 @@
(depends
(ocaml
(>= 4.11))
(grpc
(= :version))
(async
(>= v0.16))
(grpc
(= :version))
stringext))

(package
Expand All @@ -76,10 +76,10 @@
(description
"Functionality for building gRPC services and rpcs with `eio`.")
(depends
(grpc
(= :version))
(eio
(>= 0.12))
(grpc
(= :version))
stringext))

(package
Expand All @@ -89,27 +89,27 @@
(tags
(network rpc serialisation))
(depends
grpc-lwt
h2-lwt-unix
cohttp-lwt-unix
conduit-lwt-unix
(eio_main
(>= 0.12))
grpc-async
h2-async
grpc-eio
grpc-lwt
h2-async
h2-eio
(ocaml-protoc-plugin
(>= 4.5))
ppx_deriving_yojson
conduit-lwt-unix
cohttp-lwt-unix
tls-async
h2-lwt-unix
(lwt_ssl
(>= 1.2.0))
(mdx
(and
(>= 2.2.1)
:with-test))
(eio_main
(>= 0.12))
stringext))
(ocaml-protoc-plugin
(>= 4.5))
ppx_deriving_yojson
stringext
tls-async))

(package
(name grpc-bench)
Expand All @@ -118,13 +118,12 @@
(tags
(network rpc serialisation benchmark))
(depends
grpc
(bechamel
(>= 0.4.0))
notty
(bechamel-notty
(>= 0.4.0))
(bigstringaf
(>= 0.9.1))
grpc
(notty
(>= 0.2.3))))
2 changes: 1 addition & 1 deletion grpc-async.opam
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
depends: [
"dune" {>= "3.7"}
"ocaml" {>= "4.11"}
"grpc" {= version}
"async" {>= "v0.16"}
"grpc" {= version}
"stringext"
"odoc" {with-doc}
]
Expand Down
3 changes: 1 addition & 2 deletions grpc-bench.opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ doc: "https://dialohq.github.io/ocaml-grpc"
bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
depends: [
"dune" {>= "3.7"}
"grpc"
"bechamel" {>= "0.4.0"}
"notty"
"bechamel-notty" {>= "0.4.0"}
"bigstringaf" {>= "0.9.1"}
"grpc"
"notty" {>= "0.2.3"}
"odoc" {with-doc}
]
Expand Down
2 changes: 1 addition & 1 deletion grpc-eio.opam
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ doc: "https://dialohq.github.io/ocaml-grpc"
bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
depends: [
"dune" {>= "3.7"}
"grpc" {= version}
"eio" {>= "0.12"}
"grpc" {= version}
"stringext"
"odoc" {with-doc}
]
Expand Down
18 changes: 9 additions & 9 deletions grpc-examples.opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ doc: "https://dialohq.github.io/ocaml-grpc"
bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
depends: [
"dune" {>= "3.7"}
"grpc-lwt"
"h2-lwt-unix"
"cohttp-lwt-unix"
"conduit-lwt-unix"
"eio_main" {>= "0.12"}
"grpc-async"
"h2-async"
"grpc-eio"
"grpc-lwt"
"h2-async"
"h2-eio"
"ocaml-protoc-plugin" {>= "4.5"}
"ppx_deriving_yojson"
"conduit-lwt-unix"
"cohttp-lwt-unix"
"tls-async"
"h2-lwt-unix"
"lwt_ssl" {>= "1.2.0"}
"mdx" {>= "2.2.1" & with-test}
"eio_main" {>= "0.12"}
"ocaml-protoc-plugin" {>= "4.5"}
"ppx_deriving_yojson"
"stringext"
"tls-async"
"odoc" {with-doc}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion grpc.opam
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
depends: [
"dune" {>= "3.7"}
"ocaml" {>= "4.08"}
"uri" {>= "4.0.0"}
"h2" {>= "0.9.0"}
"ppx_deriving"
"uri" {>= "4.0.0"}
"odoc" {with-doc}
]
build: [
Expand Down

0 comments on commit 6c82d79

Please sign in to comment.