Merge pull request #11144 from janestreet/amqp-client

fix amqp-client constraints on async
ocaml · Jan 2, 2018 · 70ca392 · 70ca392
2 parents 38d054a + bb7d6e8
commit 70ca392
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/packages/amqp-client/amqp-client.1.0.5/opam b/packages/amqp-client/amqp-client.1.0.5/opam
@@ -22,6 +22,6 @@ depopts: [
 ]
 conflicts: [
   "lwt" {< "2.4.6"}
-  "async" {<"v0.9" & > "v0.10"}
+  "async" {<"v0.9" & >= "v0.10"}
 ]
 available: [ ocaml-version >= "4.03.0" ]
diff --git a/packages/amqp-client/amqp-client.1.0.6/opam b/packages/amqp-client/amqp-client.1.0.6/opam
@@ -22,6 +22,6 @@ depopts: [
 ]
 conflicts: [
   "lwt" {< "2.4.6"}
-  "async" {<"v0.9" & > "v0.10"}
+  "async" {<"v0.9" & >= "v0.10"}
 ]
 available: [ ocaml-version >= "4.03.0" ]
diff --git a/packages/amqp-client/amqp-client.1.1.0/opam b/packages/amqp-client/amqp-client.1.1.0/opam
@@ -12,14 +12,15 @@ depends: [
   "jbuilder" {build}
   "xml-light" {build}
   "ocplib-endian" {>= "0.6"}
-  "async" {test & < "v0.10"}
+  "async" {test}
   "lwt" {test}
 ]
 depopts: [
   "async"
   "lwt"
 ]
 conflicts: [
+  "async" {>= "v0.10" }
   "lwt" {< "2.4.6"}
 ]
 available: [ ocaml-version >= "4.03.0" ]
diff --git a/packages/amqp-client/amqp-client.1.1.1/opam b/packages/amqp-client/amqp-client.1.1.1/opam
@@ -12,14 +12,15 @@ depends: [
   "jbuilder" {build}
   "xml-light" {build}
   "ocplib-endian" {>= "0.6"}
-  "async" {test & < "v0.10"}
+  "async" {test}
   "lwt" {test}
 ]
 depopts: [
   "async"
   "lwt"
 ]
 conflicts: [
+  "async" {>= "v0.10" }
   "lwt" {< "2.4.6"}
 ]
 available: [ ocaml-version >= "4.03.0" ]
diff --git a/packages/amqp-client/amqp-client.1.1.2/opam b/packages/amqp-client/amqp-client.1.1.2/opam
@@ -12,14 +12,15 @@ depends: [
   "jbuilder" {build}
   "xml-light" {build}
   "ocplib-endian" {>= "0.6"}
-  "async" {test & < "v0.10"}
+  "async" {test}
   "lwt" {test}
 ]
 depopts: [
   "async"
   "lwt"
 ]
 conflicts: [
+  "async" {>= "v0.10" }
   "lwt" {< "2.4.6"}
 ]
 available: [ ocaml-version >= "4.03.0" ]
diff --git a/packages/amqp-client/amqp-client.1.1.3/opam b/packages/amqp-client/amqp-client.1.1.3/opam
@@ -12,14 +12,15 @@ depends: [
   "jbuilder" {build}
   "xml-light" {build}
   "ocplib-endian" {>= "0.6"}
-  "async" {test & < "v0.10" }
+  "async" {test}
   "lwt" {test}
 ]
 depopts: [
   "async"
   "lwt"
 ]
 conflicts: [
+  "async" {>= "v0.10" }
   "lwt" {< "2.4.6"}
 ]
 available: [ ocaml-version >= "4.03.0" ]
diff --git a/packages/amqp-client/amqp-client.1.1.4/opam b/packages/amqp-client/amqp-client.1.1.4/opam
@@ -11,11 +11,12 @@ depends: [
   "jbuilder" {build}
   "xml-light" {build}
   "ocplib-endian" {>= "0.6"}
-  "async" {test & < "v0.10" }
+  "async" {test}
   "lwt" {test}
 ]
 depopts: ["async" "lwt"]
 conflicts: [
+  "async" {>= "v0.10" }
   "lwt" {< "2.4.6"}
 ]
 available: [ocaml-version >= "4.03.0"]