From 77d47573edf7bdbc38c5e0aeb3ed732b0983bae6 Mon Sep 17 00:00:00 2001
From: Mathieu Barbin <mathieu.barbin@gmail.com>
Date: Sat, 6 Jan 2024 10:51:03 +0100
Subject: [PATCH] Add dependencies to fix `opam-dune-lint`

So that it is easier to avoid duplicating entries, use a canonical
order to sort the libraries.

The canonical order I used here was to put `ocaml` first, and then the
rest of dependencies alphabetically.
---
 dune-project       | 68 ++++++++++++++++++++++++++++++++--------------
 grpc-async.opam    |  4 ++-
 grpc-bench.opam    |  3 +-
 grpc-eio.opam      |  3 +-
 grpc-examples.opam | 28 +++++++++++++------
 grpc-lwt.opam      |  1 +
 grpc.opam          |  3 +-
 7 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/dune-project b/dune-project
index 5827b57..f9d23ff 100644
--- a/dune-project
+++ b/dune-project
@@ -34,11 +34,13 @@
  (depends
   (ocaml
    (>= 4.08))
-  (uri
-   (>= 4.0.0))
+  (bigstringaf
+   (>= 0.9.1))
   (h2
    (>= 0.9.0))
-  ppx_deriving))
+  ppx_deriving
+  (uri
+   (>= 4.0.0))))
 
 (package
  (name grpc-lwt)
@@ -50,6 +52,8 @@
  (depends
   (grpc
    (= :version))
+  (h2
+   (>= 0.9.0))
   (lwt
    (>= 5.3.0))
   stringext))
@@ -64,10 +68,14 @@
  (depends
   (ocaml
    (>= 4.11))
-  (grpc
-   (= :version))
   (async
    (>= v0.16))
+  (grpc
+   (= :version))
+  (h2
+   (>= 0.9.0))
+  (ppx_jane
+   (>= v0.16.0))
   stringext))
 
 (package
@@ -76,10 +84,12 @@
  (description
   "Functionality for building gRPC services and rpcs with `eio`.")
  (depends
-  (grpc
-   (= :version))
   (eio
    (>= 0.12))
+  (grpc
+   (= :version))
+  (h2
+   (>= 0.9.0))
   stringext))
 
 (package
@@ -89,27 +99,44 @@
  (tags
   (network rpc serialisation))
  (depends
-  grpc-lwt
-  h2-lwt-unix
+  (async
+   (>= v0.16.0))
+  cohttp
+  cohttp-lwt
+  cohttp-lwt-unix
+  conduit-lwt-unix
+  (core
+   (>= v0.16.2))
+  (core_unix
+   (>= v0.16.0))
+  (eio_main
+   (>= 0.12))
   grpc-async
-  h2-async
   grpc-eio
+  grpc-lwt
+  (h2
+   (>= 0.9.0))
+  h2-async
   h2-eio
-  (ocaml-protoc-plugin
-   (>= 4.5))
-  ppx_deriving_yojson
-  conduit-lwt-unix
-  cohttp-lwt-unix
-  tls-async
+  h2-lwt-unix
+  (lwt
+   (>= 5.3.0))
   (lwt_ssl
    (>= 1.2.0))
   (mdx
    (and
     (>= 2.2.1)
     :with-test))
-  (eio_main
-   (>= 0.12))
-  stringext))
+  (ocaml-protoc-plugin
+   (>= 4.5))
+  ppx_deriving
+  ppx_deriving_yojson
+  (ppx_jane
+   (>= v0.16.0))
+  stringext
+  tls-async
+  (uri
+   (>= 4.4.0))))
 
 (package
  (name grpc-bench)
@@ -118,13 +145,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))))
diff --git a/grpc-async.opam b/grpc-async.opam
index 3e060d6..fd4a3b4 100644
--- a/grpc-async.opam
+++ b/grpc-async.opam
@@ -21,8 +21,10 @@ bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
 depends: [
   "dune" {>= "3.7"}
   "ocaml" {>= "4.11"}
-  "grpc" {= version}
   "async" {>= "v0.16"}
+  "grpc" {= version}
+  "h2" {>= "0.9.0"}
+  "ppx_jane" {>= "v0.16.0"}
   "stringext"
   "odoc" {with-doc}
 ]
diff --git a/grpc-bench.opam b/grpc-bench.opam
index c562e97..010fae5 100644
--- a/grpc-bench.opam
+++ b/grpc-bench.opam
@@ -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}
 ]
diff --git a/grpc-eio.opam b/grpc-eio.opam
index 57541ef..7f00944 100644
--- a/grpc-eio.opam
+++ b/grpc-eio.opam
@@ -18,8 +18,9 @@ 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}
+  "h2" {>= "0.9.0"}
   "stringext"
   "odoc" {with-doc}
 ]
diff --git a/grpc-examples.opam b/grpc-examples.opam
index 7c8ef02..fe616e8 100644
--- a/grpc-examples.opam
+++ b/grpc-examples.opam
@@ -19,21 +19,31 @@ 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"
+  "async" {>= "v0.16.0"}
+  "cohttp"
+  "cohttp-lwt"
+  "cohttp-lwt-unix"
+  "conduit-lwt-unix"
+  "core" {>= "v0.16.2"}
+  "core_unix" {>= "v0.16.0"}
+  "eio_main" {>= "0.12"}
   "grpc-async"
-  "h2-async"
   "grpc-eio"
+  "grpc-lwt"
+  "h2" {>= "0.9.0"}
+  "h2-async"
   "h2-eio"
-  "ocaml-protoc-plugin" {>= "4.5"}
-  "ppx_deriving_yojson"
-  "conduit-lwt-unix"
-  "cohttp-lwt-unix"
-  "tls-async"
+  "h2-lwt-unix"
+  "lwt" {>= "5.3.0"}
   "lwt_ssl" {>= "1.2.0"}
   "mdx" {>= "2.2.1" & with-test}
-  "eio_main" {>= "0.12"}
+  "ocaml-protoc-plugin" {>= "4.5"}
+  "ppx_deriving"
+  "ppx_deriving_yojson"
+  "ppx_jane" {>= "v0.16.0"}
   "stringext"
+  "tls-async"
+  "uri" {>= "4.4.0"}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/grpc-lwt.opam b/grpc-lwt.opam
index 0a5d69e..e6797ef 100644
--- a/grpc-lwt.opam
+++ b/grpc-lwt.opam
@@ -20,6 +20,7 @@ bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
 depends: [
   "dune" {>= "3.7"}
   "grpc" {= version}
+  "h2" {>= "0.9.0"}
   "lwt" {>= "5.3.0"}
   "stringext"
   "odoc" {with-doc}
diff --git a/grpc.opam b/grpc.opam
index d4c9fbf..8355be4 100644
--- a/grpc.opam
+++ b/grpc.opam
@@ -21,9 +21,10 @@ bug-reports: "https://github.com/dialohq/ocaml-grpc/issues"
 depends: [
   "dune" {>= "3.7"}
   "ocaml" {>= "4.08"}
-  "uri" {>= "4.0.0"}
+  "bigstringaf" {>= "0.9.1"}
   "h2" {>= "0.9.0"}
   "ppx_deriving"
+  "uri" {>= "4.0.0"}
   "odoc" {with-doc}
 ]
 build: [