From 6bf59ee21eac113d87f973ee0d68b735ec57064f Mon Sep 17 00:00:00 2001 From: Elliott Cable Date: Tue, 29 Aug 2023 01:39:42 +0000 Subject: [PATCH] deps: Follow @kit-ty-kate's advice /see ocaml/opam-repository#24240 --- dune-project | 7 +++++-- opentelemetry.opam | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dune-project b/dune-project index 8040c2f8..a15d0426 100644 --- a/dune-project +++ b/dune-project @@ -34,9 +34,12 @@ :with-dev-setup (>= 0.24) (< 0.25)))) - (depopts + (depopts trace) + (conflicts (trace - (>= 0.3))) + (or + (< 0.3) + (>= 0.4)))) (tags (instrumentation tracing opentelemetry datadog jaeger))) diff --git a/opentelemetry.opam b/opentelemetry.opam index 4ebb692e..168a88e6 100644 --- a/opentelemetry.opam +++ b/opentelemetry.opam @@ -18,8 +18,9 @@ depends: [ "ocaml-lsp-server" {with-dev-setup} "ocamlformat" {with-dev-setup & >= "0.24" & < "0.25"} ] -depopts: [ - "trace" {>= "0.3"} +depopts: ["trace"] +conflicts: [ + "trace" {< "0.3" | >= "0.4"} ] build: [ ["dune" "subst"] {dev}